diff options
| author |  Karl Ramm <kcr@mit.edu> | 2008-01-20 19:50:23 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@mit.edu> | 2008-01-20 19:50:23 +0000 |
| commit | 938001f468fd4b17efa90c423720b950c7d9d05a (patch) | |
| tree | 7102edaf9ccf3ff65960273199efbcf4be13f241 /lib/ZMkAuth.c | |
| parent | 3017fb3605d59cb41c4def4ffd0b7f967f99315d (diff) | |
factor out #if 0s and #if 1s
Diffstat (limited to 'lib/ZMkAuth.c')
| -rw-r--r-- | lib/ZMkAuth.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/lib/ZMkAuth.c b/lib/ZMkAuth.c index 468bc05..7ed6d61 100644 --- a/lib/ZMkAuth.c +++ b/lib/ZMkAuth.c @@ -36,10 +36,10 @@ ZMakeAuthentication(register ZNotice_t *notice, int buffer_len, int *len) { -#if 1 +#ifdef HAVE_KRB5 return ZMakeZcodeAuthentication(notice, buffer, buffer_len, len/*?XXX*/); #else -#if defined(HAVE_KRB4) || defined(HAVE_KRB5) +#ifdef HAVE_KRB4 int result; time_t now; KTEXT_ST authent; @@ -47,28 +47,7 @@ ZMakeAuthentication(register ZNotice_t *notice, ZChecksum_t checksum; CREDENTIALS cred; C_Block *session; -#ifdef HAVE_KRB5 - krb5_creds *creds_out; - result = ZGetCreds(&creds_out); - if (result) - return result; - - result = krb5_524_convert_creds(Z_krb5_ctx, creds_out, &cred); - /* krb5_free_creds(Z_krb5_ctx, creds_out);*/ - if (result) - return result; - /* HOLDING: creds_out */ - - if (creds_out->keyblock.enctype != ENCTYPE_DES_CBC_CRC) - return (KRB5_BAD_ENCTYPE); - session = (C_Block *)creds_out->keyblock.contents; - - result = krb_mk_req_creds(&authent, &cred, 0); - if (result != MK_AP_OK) - return result + krb_err_base; -#endif -#ifndef HAVE_KRB5 result = krb_mk_req(&authent, SERVER_SERVICE, SERVER_INSTANCE, __Zephyr_realm, 0); if (result != MK_AP_OK) @@ -79,7 +58,6 @@ ZMakeAuthentication(register ZNotice_t *notice, return (result+krb_err_base); session = (C_Block *)cred.session; -#endif notice->z_auth = 1; notice->z_authent_len = authent.length; |