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

[gd at samba.org]

Author: gd
Date: 2007-06-29 08:58:03 +0000 (Fri, 29 Jun 2007)
New Revision: 23647

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

Log:
Use smb_krb5_open_keytab() in smbd as well.

Guenther

Modified:
   branches/SAMBA_3_0/source/libads/kerberos_verify.c
   branches/SAMBA_3_0_26/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-06-29 08:56:35 UTC (rev 23646)
+++ branches/SAMBA_3_0/source/libads/kerberos_verify.c	2007-06-29 08:58:03 UTC (rev 23647)
@@ -81,9 +81,9 @@
 	ZERO_STRUCT(kt_entry);
 	ZERO_STRUCT(kt_cursor);
 
-	ret = krb5_kt_default(context, &keytab);
+	ret = smb_krb5_open_keytab(context, NULL, False, &keytab);
 	if (ret) {
-		DEBUG(1, ("ads_keytab_verify_ticket: krb5_kt_default failed (%s)\n", error_message(ret)));
+		DEBUG(1, ("ads_keytab_verify_ticket: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
 		goto out;
 	}
 

Modified: branches/SAMBA_3_0_26/source/libads/kerberos_verify.c
===================================================================
--- branches/SAMBA_3_0_26/source/libads/kerberos_verify.c	2007-06-29 08:56:35 UTC (rev 23646)
+++ branches/SAMBA_3_0_26/source/libads/kerberos_verify.c	2007-06-29 08:58:03 UTC (rev 23647)
@@ -81,9 +81,9 @@
 	ZERO_STRUCT(kt_entry);
 	ZERO_STRUCT(kt_cursor);
 
-	ret = krb5_kt_default(context, &keytab);
+	ret = smb_krb5_open_keytab(context, NULL, False, &keytab);
 	if (ret) {
-		DEBUG(1, ("ads_keytab_verify_ticket: krb5_kt_default failed (%s)\n", error_message(ret)));
+		DEBUG(1, ("ads_keytab_verify_ticket: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
 		goto out;
 	}