svn commit: samba r21556 - in branches: SAMBA_3_0/source/libads SAMBA_3_0_25/source/libads

gd at samba.org gd at samba.org
Tue Feb 27 13:25:43 GMT 2007


Author: gd
Date: 2007-02-27 13:25:42 +0000 (Tue, 27 Feb 2007)
New Revision: 21556

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21556

Log:
Remove superfluos return check in ads_keytab_verify_ticket().

Guenther

Modified:
   branches/SAMBA_3_0/source/libads/kerberos_verify.c
   branches/SAMBA_3_0_25/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	2007-02-27 12:46:19 UTC (rev 21555)
+++ branches/SAMBA_3_0/source/libads/kerberos_verify.c	2007-02-27 13:25:42 UTC (rev 21556)
@@ -88,7 +88,6 @@
 		goto out;
 	}
   
-	if (ret != KRB5_KT_END && ret != ENOENT ) {
 		while (!auth_ok && (krb5_kt_next_entry(context, keytab, &kt_entry, &kt_cursor) == 0)) {
 			ret = smb_krb5_unparse_name(context, kt_entry.principal, &entry_princ_s);
 			if (ret) {
@@ -146,7 +145,6 @@
 			ZERO_STRUCT(kt_entry);
 		}
 		krb5_kt_end_seq_get(context, keytab, &kt_cursor);
-	}
 
 	ZERO_STRUCT(kt_cursor);
 

Modified: branches/SAMBA_3_0_25/source/libads/kerberos_verify.c
===================================================================
--- branches/SAMBA_3_0_25/source/libads/kerberos_verify.c	2007-02-27 12:46:19 UTC (rev 21555)
+++ branches/SAMBA_3_0_25/source/libads/kerberos_verify.c	2007-02-27 13:25:42 UTC (rev 21556)
@@ -88,7 +88,6 @@
 		goto out;
 	}
   
-	if (ret != KRB5_KT_END && ret != ENOENT ) {
 		while (!auth_ok && (krb5_kt_next_entry(context, keytab, &kt_entry, &kt_cursor) == 0)) {
 			ret = smb_krb5_unparse_name(context, kt_entry.principal, &entry_princ_s);
 			if (ret) {
@@ -146,7 +145,6 @@
 			ZERO_STRUCT(kt_entry);
 		}
 		krb5_kt_end_seq_get(context, keytab, &kt_cursor);
-	}
 
 	ZERO_STRUCT(kt_cursor);
 



More information about the samba-cvs mailing list