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/kadmin | |
| 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/kadmin')
| -rw-r--r-- | src/kadmin/dbutil/dump.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c index caff137a4..0e1b60959 100644 --- a/src/kadmin/dbutil/dump.c +++ b/src/kadmin/dbutil/dump.c @@ -2514,18 +2514,8 @@ load_db(argc, argv) if((kret = krb5_db_create(kcontext, db5util_db_args))) { const char *emsg = krb5_get_error_message(kcontext, kret); - /* - * See if something (like DAL KDB plugin) has set a specific error - * message and use that otherwise use default. - */ - - if (emsg != NULL) { - fprintf(stderr, "%s: %s\n", progname, emsg); - krb5_free_error_message (kcontext, emsg); - } else { - fprintf(stderr, dbcreaterr_fmt, - progname, dbname, error_message(kret)); - } + fprintf(stderr, "%s: %s\n", progname, emsg); + krb5_free_error_message (kcontext, emsg); exit_status++; if (dumpfile) fclose(f); return; @@ -2538,18 +2528,8 @@ load_db(argc, argv) if ((kret = krb5_db_open(kcontext, db5util_db_args, KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_ADMIN))) { const char *emsg = krb5_get_error_message(kcontext, kret); - /* - * See if something (like DAL KDB plugin) has set a specific - * error message and use that otherwise use default. - */ - - if (emsg != NULL) { - fprintf(stderr, "%s: %s\n", progname, emsg); - krb5_free_error_message (kcontext, emsg); - } else { - fprintf(stderr, dbinit_err_fmt, - progname, error_message(kret)); - } + fprintf(stderr, "%s: %s\n", progname, emsg); + krb5_free_error_message (kcontext, emsg); exit_status++; goto error; } |