diff options
| author | Kevin Coffman <kwc@citi.umich.edu> | 2007-04-19 14:45:19 -0400 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2007-04-20 14:39:01 +1000 |
| commit | 5995fb8081f92acf39e5126e09d7db8fe6a02364 (patch) | |
| tree | f04661d53f48619e926cb338385726f019e5fbd3 /utils/gssd/context_heimdal.c | |
| parent | 77458652703ab94da18e40728607e323dd2b65b1 (diff) | |
| download | nfs-utils-5995fb8081f92acf39e5126e09d7db8fe6a02364.tar.gz nfs-utils-5995fb8081f92acf39e5126e09d7db8fe6a02364.tar.xz nfs-utils-5995fb8081f92acf39e5126e09d7db8fe6a02364.zip | |
Factor out error message printing differences between MIT and Heimdal
Use a common function that factors out differences between MIT
and Heimdal in getting the right error message printed.
Add an autoconf check to see if the newer error message function
is available.
Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Diffstat (limited to 'utils/gssd/context_heimdal.c')
| -rw-r--r-- | utils/gssd/context_heimdal.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/gssd/context_heimdal.c b/utils/gssd/context_heimdal.c index 5520cbc..6fb8fbd 100644 --- a/utils/gssd/context_heimdal.c +++ b/utils/gssd/context_heimdal.c @@ -72,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", - 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", - error_message(ret)); + gssd_k5_err_msg(context, ret)); goto out_err_free_context; } @@ -97,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", - error_message(ENOMEM)); + gssd_k5_err_msg(context, ENOMEM)); goto out_err_free_key; } skd = (char *) key->keyvalue.data; @@ -130,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", - 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", - error_message(ret)); + gssd_k5_err_msg(context, ret)); goto out_err_free_context; } |