svn commit: samba r17972 - in branches/SAMBA_3_0/source/libads: .
jerry at samba.org
jerry at samba.org
Thu Aug 31 18:33:51 GMT 2006
Author: jerry
Date: 2006-08-31 18:33:50 +0000 (Thu, 31 Aug 2006)
New Revision: 17972
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17972
Log:
revert accidental commit to ads_verify_ticket()
Modified:
branches/SAMBA_3_0/source/libads/kerberos_verify.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/kerberos_verify.c
===================================================================
--- branches/SAMBA_3_0/source/libads/kerberos_verify.c 2006-08-31 18:32:23 UTC (rev 17971)
+++ branches/SAMBA_3_0/source/libads/kerberos_verify.c 2006-08-31 18:33:50 UTC (rev 17972)
@@ -376,15 +376,13 @@
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;
More information about the samba-cvs
mailing list