diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-11-01 15:19:00 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-11-01 15:19:00 +0000 |
| commit | 7143f3daeaebca9839771ee36bf7b4ee1d11a3ac (patch) | |
| tree | 62273c9b21b81b0f44340d4e450f03f5816f81df /src/kdc | |
| parent | 5abcb10f99de5c732e63679286fa49f1f5766205 (diff) | |
krb5_get_error_message cannot return NULL, and returns "Success" on
error code 0. Simplify some overly paranoid code accordingly.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24489 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kdc')
| -rw-r--r-- | src/kdc/kdc_authdata.c | 20 | ||||
| -rw-r--r-- | src/kdc/kdc_preauth.c | 10 |
2 files changed, 12 insertions, 18 deletions
diff --git a/src/kdc/kdc_authdata.c b/src/kdc/kdc_authdata.c index a4f81a60a..5861e7048 100644 --- a/src/kdc/kdc_authdata.c +++ b/src/kdc/kdc_authdata.c @@ -291,12 +291,10 @@ load_authdata_plugins(krb5_context context) ((initerr = (*server_init_proc)(context, &pctx)) != 0)) { const char *emsg; emsg = krb5_get_error_message(context, initerr); - if (emsg) { - krb5_klog_syslog(LOG_ERR, - "authdata %s failed to initialize: %s", - ftable->name, emsg); - krb5_free_error_message(context, emsg); - } + krb5_klog_syslog(LOG_ERR, + "authdata %s failed to initialize: %s", + ftable->name, emsg); + krb5_free_error_message(context, emsg); memset(&authdata_systems[k], 0, sizeof(authdata_systems[k])); continue; @@ -329,12 +327,10 @@ load_authdata_plugins(krb5_context context) ((initerr = (*server_init_proc)(context, &pctx)) != 0)) { const char *emsg; emsg = krb5_get_error_message(context, initerr); - if (emsg) { - krb5_klog_syslog(LOG_ERR, - "authdata %s failed to initialize: %s", - ftable->name, emsg); - krb5_free_error_message(context, emsg); - } + krb5_klog_syslog(LOG_ERR, + "authdata %s failed to initialize: %s", + ftable->name, emsg); + krb5_free_error_message(context, emsg); memset(&authdata_systems[k], 0, sizeof(authdata_systems[k])); continue; diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c index 52fb51a0c..397155542 100644 --- a/src/kdc/kdc_preauth.c +++ b/src/kdc/kdc_preauth.c @@ -471,12 +471,10 @@ load_preauth_plugins(krb5_context context) if (initerr) { const char *emsg; emsg = krb5_get_error_message(context, initerr); - if (emsg) { - krb5_klog_syslog(LOG_ERR, - "preauth %s failed to initialize: %s", - ftable->name, emsg); - krb5_free_error_message(context, emsg); - } + krb5_klog_syslog(LOG_ERR, + "preauth %s failed to initialize: %s", + ftable->name, emsg); + krb5_free_error_message(context, emsg); memset(&preauth_systems[k], 0, sizeof(preauth_systems[k])); |