Factor out error message printing differences between MIT and Heimdal

[nfs-utils.git] / utils / gssd / context_heimdal.c

diff --git a/utils/gssd/context_heimdal.c b/utils/gssd/context_heimdal.c
index 27c44a32c50b758f73a38943228f8e7344e2ff78..6fb8fbdb35da550e3a562f4d66e2268d006f25ab 100644 (file)
--- a/utils/gssd/context_heimdal.c
+++ b/utils/gssd/context_heimdal.c
@@ -1,5 +1,5 @@
 /*
 /*

-  Copyright (c) 2004 The Regents of the University of Michigan.
+  Copyright (c) 2004-2006 The Regents of the University of Michigan.

   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without


@@ -30,6 +30,7 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

+#ifndef HAVE_LUCID_CONTEXT_SUPPORT

 #ifdef HAVE_HEIMDAL
 
 #include <stdio.h>
 #ifdef HAVE_HEIMDAL
 
 #include <stdio.h>


@@ -37,15 +38,15 @@
 #include <syslog.h>
 #include <string.h>
 #include <errno.h>
 #include <syslog.h>
 #include <string.h>
 #include <errno.h>

-#include <gssapi.h>

 #include <krb5.h>
 #include <krb5.h>

+#include <gssapi.h>    /* Must use the heimdal copy! */
+#ifdef HAVE_COM_ERR_H

 #include <com_err.h>
 #include <com_err.h>

+#endif

 #include "err_util.h"
 #include "gss_oids.h"
 #include "write_bytes.h"
 
 #include "err_util.h"
 #include "gss_oids.h"
 #include "write_bytes.h"
 

-#define MAX_CTX_LEN 4096
-

 int write_heimdal_keyblock(char **p, char *end, krb5_keyblock *key)
 {
        gss_buffer_desc tmp;
 int write_heimdal_keyblock(char **p, char *end, krb5_keyblock *key)
 {
        gss_buffer_desc tmp;


@@ -71,27 +72,32 @@ int write_heimdal_enc_key(char **p, char *end, gss_ctx_id_t ctx)
 
        if ((ret = krb5_init_context(&context))) {
                printerr(0, "ERROR: initializing krb5_context: %s\n",
 
        if ((ret = krb5_init_context(&context))) {
                printerr(0, "ERROR: initializing krb5_context: %s\n",

-                       error_message(ret));
+                       gssd_k5_err_msg(NULL, ret));

                goto out_err;
        }
 
        if ((ret = krb5_auth_con_getlocalsubkey(context,
                                                ctx->auth_context, &key))){
                printerr(0, "ERROR: getting auth_context key: %s\n",
                goto out_err;
        }
 
        if ((ret = krb5_auth_con_getlocalsubkey(context,
                                                ctx->auth_context, &key))){
                printerr(0, "ERROR: getting auth_context key: %s\n",

-                       error_message(ret));
+                       gssd_k5_err_msg(context, ret));

                goto out_err_free_context;
        }
 
        memset(&enc_key, 0, sizeof(enc_key));
                goto out_err_free_context;
        }
 
        memset(&enc_key, 0, sizeof(enc_key));

-       printerr(1, "WARN: write_heimdal_enc_key: "
-                   "overriding heimdal keytype\n");
-       enc_key.keytype = 4 /* XXX XXX XXX XXX key->keytype */;
+       enc_key.keytype = key->keytype;
+       /* XXX current kernel code only handles des-cbc-raw  (4) */
+       if (enc_key.keytype != 4) {
+               printerr(1, "WARN: write_heimdal_enc_key: "
+                           "overriding heimdal keytype (%d => %d)\n",
+                        enc_key.keytype, 4);
+               enc_key.keytype = 4;
+       }

        enc_key.keyvalue.length = key->keyvalue.length;
        if ((enc_key.keyvalue.data =
                                calloc(1, enc_key.keyvalue.length)) == NULL) {
 
                printerr(0, "ERROR: allocating memory for enc key: %s\n",
        enc_key.keyvalue.length = key->keyvalue.length;
        if ((enc_key.keyvalue.data =
                                calloc(1, enc_key.keyvalue.length)) == NULL) {
 
                printerr(0, "ERROR: allocating memory for enc key: %s\n",

-                       error_message(ENOMEM));
+                       gssd_k5_err_msg(context, ENOMEM));

                goto out_err_free_key;
        }
        skd = (char *) key->keyvalue.data;
                goto out_err_free_key;
        }
        skd = (char *) key->keyvalue.data;


@@ -124,20 +130,24 @@ int write_heimdal_seq_key(char **p, char *end, gss_ctx_id_t ctx)
 
        if ((ret = krb5_init_context(&context))) {
                printerr(0, "ERROR: initializing krb5_context: %s\n",
 
        if ((ret = krb5_init_context(&context))) {
                printerr(0, "ERROR: initializing krb5_context: %s\n",

-                       error_message(ret));
+                       gssd_k5_err_msg(NULL, ret));

                goto out_err;
        }
 
        if ((ret = krb5_auth_con_getlocalsubkey(context,
                                                ctx->auth_context, &key))){
                printerr(0, "ERROR: getting auth_context key: %s\n",
                goto out_err;
        }
 
        if ((ret = krb5_auth_con_getlocalsubkey(context,
                                                ctx->auth_context, &key))){
                printerr(0, "ERROR: getting auth_context key: %s\n",

-                       error_message(ret));
+                       gssd_k5_err_msg(context, ret));

                goto out_err_free_context;
        }
 
                goto out_err_free_context;
        }
 

-       printerr(1, "WARN: write_heimdal_seq_key: "
-                   "overriding heimdal keytype\n");
-       key->keytype = 4;       /* XXX XXX XXX XXX XXX */
+       /* XXX current kernel code only handles des-cbc-raw  (4) */
+       if (key->keytype != 4) {
+               printerr(1, "WARN: write_heimdal_seq_key: "
+                           "overriding heimdal keytype (%d => %d)\n",
+                        key->keytype, 4);
+               key->keytype = 4;
+       }

 
        if (write_heimdal_keyblock(p, end, key)) {
                goto out_err_free_key;
 
        if (write_heimdal_keyblock(p, end, key)) {
                goto out_err_free_key;


@@ -254,3 +264,4 @@ out_err:
 }
 
 #endif /* HAVE_HEIMDAL */
 }
 
 #endif /* HAVE_HEIMDAL */

+#endif /* HAVE_LUCID_CONTEXT_SUPPORT */