diff options
| author |  Karl Ramm <kcr@1ts.org> | 2009-08-27 15:19:01 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@1ts.org> | 2009-08-27 15:19:01 +0000 |
| commit | 2c38dedc307447ad37ef94d22b711513b853569a (patch) | |
| tree | a8f7ab819aabcbc34874819921806214c43da171 /server/bdump.c | |
| parent | 6e566509d4a3d88c662c959e5eba03dc9933ede5 (diff) | |
Refactor error handling slightly in get_tgt
(which coincidentally keeps us from reporting the wrong function with an
error code)
Diffstat (limited to 'server/bdump.c')
| -rw-r--r-- | server/bdump.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/server/bdump.c b/server/bdump.c index 6eca352..c815809 100644 --- a/server/bdump.c +++ b/server/bdump.c @@ -1058,7 +1058,6 @@ get_tgt(void) 0, NULL, &opt); -#ifndef HAVE_KRB4 if (retval) { syslog(LOG_ERR, "get_tgt: krb5_get_init_creds_keytab: %s", error_message(retval)); @@ -1067,6 +1066,7 @@ get_tgt(void) return 1; } +#ifndef HAVE_KRB4 for (i = 0; enctypes[i]; i++) { retval = krb5_kt_get_entry(Z_krb5_ctx, kt, principal, 0, enctypes[i], &kt_ent); @@ -1090,16 +1090,9 @@ get_tgt(void) got_des = 1; } -#endif +#endif /* HAVE_KRB4 */ krb5_free_principal(Z_krb5_ctx, principal); krb5_kt_close(Z_krb5_ctx, kt); -#ifdef HAVE_KRB4 - if (retval) { - syslog(LOG_ERR, "get_tgt: krb5_kt_get_entry: %s", - error_message(retval)); - return 1; - } -#endif retval = krb5_cc_initialize (Z_krb5_ctx, Z_krb5_ccache, cred.client); if (retval) { |