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

[jerry at samba.org]

Author: jerry
Date: 2005-09-27 19:39:13 +0000 (Tue, 27 Sep 2005)
New Revision: 10556

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

Log:
BUG 3083: patch from Alex Deiter <tiamat at komi.mts.ru> to fix checking trusted account for winbindd running on a Samba PDC
Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
   trunk/source/nsswitch/winbindd_cm.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2005-09-27 19:34:19 UTC (rev 10555)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2005-09-27 19:39:13 UTC (rev 10556)
@@ -1175,7 +1175,10 @@
 	/* if we are a DC and this is a trusted domain, then we need to use our
 	   domain name in the net_req_auth2() request */
 
-	if ( IS_DC ) {
+	if ( IS_DC 
+		&& !strequal(domain->name, lp_workgroup())
+		&& lp_allow_trusted_domains() ) 
+	{
 		account_name = talloc_asprintf( mem_ctx, "%s$", lp_workgroup() );
 	}
 	else {

Modified: trunk/source/nsswitch/winbindd_cm.c
===================================================================
--- trunk/source/nsswitch/winbindd_cm.c	2005-09-27 19:34:19 UTC (rev 10555)
+++ trunk/source/nsswitch/winbindd_cm.c	2005-09-27 19:39:13 UTC (rev 10556)
@@ -1294,7 +1294,10 @@
 	/* if we are a DC and this is a trusted domain, then we need to use our
 	   domain name in the net_req_auth2() request */
 
-	if ( IS_DC ) {
+	if ( IS_DC
+		&& !strequal(domain->name, lp_workgroup())
+		&& lp_allow_trusted_domains() ) 
+	{
 		account_name = lp_workgroup();
 	} else {
 		account_name = domain->primary ? global_myname() : domain->name;