diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2009-01-13 21:54:45 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2009-01-13 21:54:45 +0000 |
| commit | 671ceced3b5fec90cd2ad894a083d1b8b3d89997 (patch) | |
| tree | b3e5294e2c32daffd427c339c3fe0b19407f3346 /src/kdc/do_as_req.c | |
| parent | 774ad4ae871e70c2e8d683c695029f535c8b1dba (diff) | |
| download | krb5-671ceced3b5fec90cd2ad894a083d1b8b3d89997.tar.gz krb5-671ceced3b5fec90cd2ad894a083d1b8b3d89997.tar.xz krb5-671ceced3b5fec90cd2ad894a083d1b8b3d89997.zip | |
/tmp/3
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21741 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kdc/do_as_req.c')
| -rw-r--r-- | src/kdc/do_as_req.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c index 12d645980..9571fb212 100644 --- a/src/kdc/do_as_req.c +++ b/src/kdc/do_as_req.c @@ -2,7 +2,7 @@ * kdc/do_as_req.c * * Portions Copyright (C) 2007 Apple Inc. - * Copyright 1990,1991,2007,2008 by the Massachusetts Institute of Technology. + * Copyright 1990,1991,2007,2008,2009 by the Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may @@ -99,7 +99,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt, krb5_error_code errcode; int c_nprincs = 0, s_nprincs = 0; krb5_boolean more; - krb5_timestamp kdc_time, authtime; + krb5_timestamp kdc_time, authtime = 0; krb5_keyblock session_key; const char *status; krb5_key_data *server_key, *client_key; @@ -550,9 +550,6 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt, memset(reply.enc_part.ciphertext.data, 0, reply.enc_part.ciphertext.length); free(reply.enc_part.ciphertext.data); - log_as_req(from, request, &reply, cname, sname, authtime, 0, 0, 0); - did_log = 1; - #ifdef KRBCONF_KDC_MODIFIES_KDB /* * If we get this far, we successfully did the AS_REQ. @@ -562,6 +559,10 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt, #endif /* KRBCONF_KDC_MODIFIES_KDB */ update_client = 1; + log_as_req(from, request, &reply, &client, cname, &server, sname, + authtime, 0, 0, 0); + did_log = 1; + goto egress; errout: @@ -569,10 +570,6 @@ errout: /* fall through */ egress: - if (update_client) { - audit_as_request(request, &client, &server, authtime, errcode); - } - if (pa_context) free_padata_context(kdc_context, &pa_context); @@ -580,7 +577,7 @@ egress: emsg = krb5_get_error_message(kdc_context, errcode); if (status) { - log_as_req(from, request, &reply, cname, sname, 0, + log_as_req(from, request, &reply, &client, cname, &server, sname, 0, status, errcode, emsg); did_log = 1; } |