svn commit: samba r23650 - in branches: SAMBA_3_0/source/libads SAMBA_3_0/source/libsmb SAMBA_3_0_26/source/libads SAMBA_3_0_26/source/libsmb

[gd at samba.org]

Author: gd
Date: 2007-06-29 09:54:39 +0000 (Fri, 29 Jun 2007)
New Revision: 23650

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

Log:
Fix remaining callers of krb5_kt_default().

Guenther

Modified:
   branches/SAMBA_3_0/source/libads/kerberos_keytab.c
   branches/SAMBA_3_0/source/libsmb/clikrb5.c
   branches/SAMBA_3_0_26/source/libads/kerberos_keytab.c
   branches/SAMBA_3_0_26/source/libsmb/clikrb5.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/kerberos_keytab.c
===================================================================
--- branches/SAMBA_3_0/source/libads/kerberos_keytab.c	2007-06-29 09:42:14 UTC (rev 23649)
+++ branches/SAMBA_3_0/source/libads/kerberos_keytab.c	2007-06-29 09:54:39 UTC (rev 23650)
@@ -546,10 +546,11 @@
 		DEBUG(1,("ads_keytab_create_default: could not krb5_init_context: %s\n",error_message(ret)));
 		return ret;
 	}
-	ret = krb5_kt_default(context, &keytab);
+
+	ret = smb_krb5_open_keytab(context, NULL, True, &keytab);
 	if (ret) {
-		DEBUG(1,("ads_keytab_create_default: krb5_kt_default failed (%s)\n",error_message(ret)));
-		goto done;
+		DEBUG(1,("ads_keytab_create_default: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
+		goto out;
 	}
 
 	ret = krb5_kt_start_seq_get(context, keytab, &cursor);

Modified: branches/SAMBA_3_0/source/libsmb/clikrb5.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clikrb5.c	2007-06-29 09:42:14 UTC (rev 23649)
+++ branches/SAMBA_3_0/source/libsmb/clikrb5.c	2007-06-29 09:54:39 UTC (rev 23650)
@@ -951,10 +951,10 @@
 	   may be in the middle of a keytab enumeration when this is
 	   called. JRA. */
 
-	ret = krb5_kt_default(context, &keytab);
+	ret = smb_krb5_open_keytab(context, NULL, False, &keytab);
 	if (ret) {
-		DEBUG(0,("get_key_from_keytab: failed to open keytab: %s\n", error_message(ret)));
-		return ret;
+		DEBUG(1,("get_key_from_keytab: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
+		goto out;
 	}
 
 	if ( DEBUGLEVEL >= 10 ) {

Modified: branches/SAMBA_3_0_26/source/libads/kerberos_keytab.c
===================================================================
--- branches/SAMBA_3_0_26/source/libads/kerberos_keytab.c	2007-06-29 09:42:14 UTC (rev 23649)
+++ branches/SAMBA_3_0_26/source/libads/kerberos_keytab.c	2007-06-29 09:54:39 UTC (rev 23650)
@@ -546,10 +546,11 @@
 		DEBUG(1,("ads_keytab_create_default: could not krb5_init_context: %s\n",error_message(ret)));
 		return ret;
 	}
-	ret = krb5_kt_default(context, &keytab);
+
+	ret = smb_krb5_open_keytab(context, NULL, True, &keytab);
 	if (ret) {
-		DEBUG(1,("ads_keytab_create_default: krb5_kt_default failed (%s)\n",error_message(ret)));
-		goto done;
+		DEBUG(1,("ads_keytab_create_default: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
+		goto out;
 	}
 
 	ret = krb5_kt_start_seq_get(context, keytab, &cursor);

Modified: branches/SAMBA_3_0_26/source/libsmb/clikrb5.c
===================================================================
--- branches/SAMBA_3_0_26/source/libsmb/clikrb5.c	2007-06-29 09:42:14 UTC (rev 23649)
+++ branches/SAMBA_3_0_26/source/libsmb/clikrb5.c	2007-06-29 09:54:39 UTC (rev 23650)
@@ -951,10 +951,10 @@
 	   may be in the middle of a keytab enumeration when this is
 	   called. JRA. */
 
-	ret = krb5_kt_default(context, &keytab);
+	ret = smb_krb5_open_keytab(context, NULL, False, &keytab);
 	if (ret) {
-		DEBUG(0,("get_key_from_keytab: failed to open keytab: %s\n", error_message(ret)));
-		return ret;
+		DEBUG(1,("get_key_from_keytab: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
+		goto out;
 	}
 
 	if ( DEBUGLEVEL >= 10 ) {