From ac25c32322d69cf3e125c5d84766d9a3f70a4e89 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 31 Aug 2006 18:33:50 +0000
Subject: r17972: revert accidental commit to ads_verify_ticket() (This used to
 be commit 95f6b22e5179e1fb738c07112de2e06024fc9a83)

---
 source3/libads/kerberos_verify.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'source3/libads')

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;
-- 
cgit