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

[gd at samba.org]

Author: gd
Date: 2007-02-27 14:24:49 +0000 (Tue, 27 Feb 2007)
New Revision: 21561

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

Log:
It makes absolutely no sense to call krb5_kt_resolve() two times
directly after another.

Guenther

Modified:
   branches/SAMBA_3_0/source/libads/kerberos_keytab.c
   branches/SAMBA_3_0_25/source/libads/kerberos_keytab.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/kerberos_keytab.c
===================================================================
--- branches/SAMBA_3_0/source/libads/kerberos_keytab.c	2007-02-27 13:42:15 UTC (rev 21560)
+++ branches/SAMBA_3_0/source/libads/kerberos_keytab.c	2007-02-27 14:24:49 UTC (rev 21561)
@@ -408,14 +408,9 @@
 	DEBUG(3,("ads_keytab_flush: Using default keytab: %s\n", (char *) &keytab_name));
 	ret = krb5_kt_resolve(context, (char *) &keytab_name, &keytab);
 	if (ret) {
-		DEBUG(1,("ads_keytab_flush: krb5_kt_default failed (%s)\n", error_message(ret)));
+		DEBUG(1,("ads_keytab_flush: krb5_kt_resolve failed (%s)\n", error_message(ret)));
 		goto out;
 	}
-	ret = krb5_kt_resolve(context, (char *) &keytab_name, &keytab);
-	if (ret) {
-		DEBUG(1,("ads_keytab_flush: krb5_kt_default failed (%s)\n", error_message(ret)));
-		goto out;
-	}
 
 	kvno = (krb5_kvno) ads_get_kvno(ads, global_myname());
 	if (kvno == -1) {       /* -1 indicates a failure */

Modified: branches/SAMBA_3_0_25/source/libads/kerberos_keytab.c
===================================================================
--- branches/SAMBA_3_0_25/source/libads/kerberos_keytab.c	2007-02-27 13:42:15 UTC (rev 21560)
+++ branches/SAMBA_3_0_25/source/libads/kerberos_keytab.c	2007-02-27 14:24:49 UTC (rev 21561)
@@ -408,14 +408,9 @@
 	DEBUG(3,("ads_keytab_flush: Using default keytab: %s\n", (char *) &keytab_name));
 	ret = krb5_kt_resolve(context, (char *) &keytab_name, &keytab);
 	if (ret) {
-		DEBUG(1,("ads_keytab_flush: krb5_kt_default failed (%s)\n", error_message(ret)));
+		DEBUG(1,("ads_keytab_flush: krb5_kt_resolve failed (%s)\n", error_message(ret)));
 		goto out;
 	}
-	ret = krb5_kt_resolve(context, (char *) &keytab_name, &keytab);
-	if (ret) {
-		DEBUG(1,("ads_keytab_flush: krb5_kt_default failed (%s)\n", error_message(ret)));
-		goto out;
-	}
 
 	kvno = (krb5_kvno) ads_get_kvno(ads, global_myname());
 	if (kvno == -1) {       /* -1 indicates a failure */