Add a new function to retrieve the current verbosity level

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

diff --git a/utils/gssd/context_heimdal.c b/utils/gssd/context_heimdal.c
index edd4dfcb4649544cf85d66965602fa8fd8e5817f..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>


@@ -46,8 +47,6 @@
 #include "gss_oids.h"
 #include "write_bytes.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;


@@ -73,14 +72,14 @@ 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;
        }
 
                goto out_err_free_context;
        }
 


@@ -98,7 +97,7 @@ int write_heimdal_enc_key(char **p, char *end, gss_ctx_id_t ctx)
                                calloc(1, enc_key.keyvalue.length)) == NULL) {
 
                printerr(0, "ERROR: allocating memory for enc key: %s\n",
                                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;


@@ -131,14 +130,14 @@ 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;
        }
 


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

+#endif /* HAVE_LUCID_CONTEXT_SUPPORT */