summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-08-31 18:33:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:39:44 -0500
commitac25c32322d69cf3e125c5d84766d9a3f70a4e89 (patch)
tree49ce6b78b111a27ecc5134dd6ad53ec9c489d644
parente53dfa1f4a1162b814ea7dc23c7c603d1c6c4908 (diff)
downloadsamba-ac25c32322d69cf3e125c5d84766d9a3f70a4e89.tar.gz
samba-ac25c32322d69cf3e125c5d84766d9a3f70a4e89.tar.bz2
samba-ac25c32322d69cf3e125c5d84766d9a3f70a4e89.zip
r17972: revert accidental commit to ads_verify_ticket()
(This used to be commit 95f6b22e5179e1fb738c07112de2e06024fc9a83)
-rw-r--r--source3/libads/kerberos_verify.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c
index cff007db47..3aa0860809 100644
--- a/source3/libads/kerberos_verify.c
+++ b/source3/libads/kerberos_verify.c
@@ -376,15 +376,13 @@ NTSTATUS ads_verify_ticket(TALLOC_CTX *mem_ctx,
goto out;
}
- /* always check secrets first in order to prevent hitting the
- keytab until really necessary */
-
- auth_ok = ads_secrets_verify_ticket(context, auth_context, host_princ,
- ticket, &packet, &tkt, &keyblock);
-
- if (!auth_ok && lp_use_kerberos_keytab()) {
+ if (lp_use_kerberos_keytab()) {
auth_ok = ads_keytab_verify_ticket(context, auth_context, ticket, &packet, &tkt, &keyblock);
}
+ if (!auth_ok) {
+ auth_ok = ads_secrets_verify_ticket(context, auth_context, host_princ,
+ ticket, &packet, &tkt, &keyblock);
+ }
release_server_mutex();
got_replay_mutex = False;