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/lib | |
| parent | 5abcb10f99de5c732e63679286fa49f1f5766205 (diff) | |
| download | krb5-7143f3daeaebca9839771ee36bf7b4ee1d11a3ac.tar.gz krb5-7143f3daeaebca9839771ee36bf7b4ee1d11a3ac.tar.xz krb5-7143f3daeaebca9839771ee36bf7b4ee1d11a3ac.zip | |
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/lib')
| -rw-r--r-- | src/lib/kadm5/srv/kadm5_hook.c | 6 | ||||
| -rw-r--r-- | src/lib/krb5/krb/fast.c | 8 | ||||
| -rw-r--r-- | src/lib/krb5/os/trace.c | 3 |
3 files changed, 6 insertions, 11 deletions
diff --git a/src/lib/kadm5/srv/kadm5_hook.c b/src/lib/kadm5/srv/kadm5_hook.c index 386715d729..73016c8bdd 100644 --- a/src/lib/kadm5/srv/kadm5_hook.c +++ b/src/lib/kadm5/srv/kadm5_hook.c @@ -117,10 +117,8 @@ log_failure(krb5_context context, { const char *e = krb5_get_error_message(context, ret); - if (e) { - krb5_klog_syslog(LOG_ERR, "kadm5_hook %s failed postcommit %s: %s", - name, function, e); - } + krb5_klog_syslog(LOG_ERR, "kadm5_hook %s failed postcommit %s: %s", + name, function, e); krb5_free_error_message(context, e); } diff --git a/src/lib/krb5/krb/fast.c b/src/lib/krb5/krb/fast.c index 50321cc86c..cc9f899a7d 100644 --- a/src/lib/krb5/krb/fast.c +++ b/src/lib/krb5/krb/fast.c @@ -182,11 +182,9 @@ krb5int_fast_as_armor(krb5_context context, if (retval != 0) { const char * errmsg; errmsg = krb5_get_error_message(context, retval); - if (errmsg) { - krb5_set_error_message(context, retval, - "%s constructing AP-REQ armor", errmsg); - krb5_free_error_message(context, errmsg); - } + krb5_set_error_message(context, retval, + "%s constructing AP-REQ armor", errmsg); + krb5_free_error_message(context, errmsg); } } if (ccache) diff --git a/src/lib/krb5/os/trace.c b/src/lib/krb5/os/trace.c index 3f31ea920d..30942cd975 100644 --- a/src/lib/krb5/os/trace.c +++ b/src/lib/krb5/os/trace.c @@ -179,8 +179,7 @@ trace_format(krb5_context context, const char *fmt, va_list ap) } else if (strcmp(tmpbuf, "kerr") == 0) { kerr = va_arg(ap, krb5_error_code); p = krb5_get_error_message(context, kerr); - krb5int_buf_add_fmt(&buf, "%ld/%s", (long) kerr, - (kerr == 0) ? "success" : p); + krb5int_buf_add_fmt(&buf, "%ld/%s", (long) kerr, p); krb5_free_error_message(context, p); } else if (strcmp(tmpbuf, "keyblock") == 0) { keyblock = va_arg(ap, const krb5_keyblock *); |