svn commit: samba r15983 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2006-05-31 15:41:54 +0000 (Wed, 31 May 2006)
New Revision: 15983

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

Log:
Honour the krb5 principal name change (of the new ads join code) in the
kerberized winbind pam_auth.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
   trunk/source/nsswitch/winbindd_pam.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2006-05-31 15:39:12 UTC (rev 15982)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c	2006-05-31 15:41:54 UTC (rev 15983)
@@ -512,7 +512,7 @@
 	}
 	strlower_m(client_princ);
 
-	local_service = talloc_asprintf(state->mem_ctx, "HOST/%s@%s", client_princ, lp_realm());
+	local_service = talloc_asprintf(state->mem_ctx, "%s$@%s", client_princ, lp_realm());
 	if (local_service == NULL) {
 		DEBUG(0,("winbindd_raw_kerberos_login: out of memory\n"));
 		result = NT_STATUS_NO_MEMORY;

Modified: trunk/source/nsswitch/winbindd_pam.c
===================================================================
--- trunk/source/nsswitch/winbindd_pam.c	2006-05-31 15:39:12 UTC (rev 15982)
+++ trunk/source/nsswitch/winbindd_pam.c	2006-05-31 15:41:54 UTC (rev 15983)
@@ -512,7 +512,7 @@
 	}
 	strlower_m(client_princ);
 
-	local_service = talloc_asprintf(state->mem_ctx, "HOST/%s@%s", client_princ, lp_realm());
+	local_service = talloc_asprintf(state->mem_ctx, "%s$@%s", client_princ, lp_realm());
 	if (local_service == NULL) {
 		DEBUG(0,("winbindd_raw_kerberos_login: out of memory\n"));
 		result = NT_STATUS_NO_MEMORY;