svn commit: samba r20489 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_24/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2007-01-02 22:14:26 +0000 (Tue, 02 Jan 2007)
New Revision: 20489

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

Log:
Missed patch ofthe forest_name patch for lookupname


Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
   branches/SAMBA_3_0_24/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	2007-01-02 21:48:47 UTC (rev 20488)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2007-01-02 22:14:26 UTC (rev 20489)
@@ -1480,7 +1480,8 @@
 
 	char *domain_name = NULL;
 	char *dns_name = NULL;
-	DOM_SID *dom_sid = NULL;
+	char *forest_name = NULL;	
+	DOM_SID *dom_sid = NULL;	
 
 	ZERO_STRUCT( ctr );
 	
@@ -1545,7 +1546,7 @@
 		   to determine that the DC is active directory */
 		result = rpccli_lsa_query_info_policy2(cli, mem_ctx, &pol,
 						       12, &domain_name,
-						       &dns_name, NULL,
+						       &dns_name, &forest_name,
 						       NULL, &dom_sid);
 	}
 
@@ -1558,6 +1559,9 @@
 		if (dns_name)
 			fstrcpy(domain->alt_name, dns_name);
 
+		if ( forest_name )
+			fstrcpy(domain->forest_name, forest_name);		
+
 		if (dom_sid) 
 			sid_copy(&domain->sid, dom_sid);
 	} else {
@@ -1584,10 +1588,10 @@
 	}
 done:
 
-	DEBUG(5, ("set_dc_type_and_flags: domain %s is %snative mode.\n",
+	DEBUG(5, ("set_dc_type_and_flags: domain %s is %sin native mode.\n",
 		  domain->name, domain->native_mode ? "" : "NOT "));
 
-	DEBUG(5,("set_dc_type_and_flags: domain %s is %sactive directory.\n",
+	DEBUG(5,("set_dc_type_and_flags: domain %s is %srunning active directory.\n",
 		  domain->name, domain->active_directory ? "" : "NOT "));
 
 	cli_rpc_pipe_close(cli);

Modified: branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c	2007-01-02 21:48:47 UTC (rev 20488)
+++ branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c	2007-01-02 22:14:26 UTC (rev 20489)
@@ -1480,7 +1480,8 @@
 
 	char *domain_name = NULL;
 	char *dns_name = NULL;
-	DOM_SID *dom_sid = NULL;
+	char *forest_name = NULL;	
+	DOM_SID *dom_sid = NULL;	
 
 	ZERO_STRUCT( ctr );
 	
@@ -1545,7 +1546,7 @@
 		   to determine that the DC is active directory */
 		result = rpccli_lsa_query_info_policy2(cli, mem_ctx, &pol,
 						       12, &domain_name,
-						       &dns_name, NULL,
+						       &dns_name, &forest_name,
 						       NULL, &dom_sid);
 	}
 
@@ -1558,6 +1559,9 @@
 		if (dns_name)
 			fstrcpy(domain->alt_name, dns_name);
 
+		if ( forest_name )
+			fstrcpy(domain->forest_name, forest_name);		
+
 		if (dom_sid) 
 			sid_copy(&domain->sid, dom_sid);
 	} else {
@@ -1584,10 +1588,10 @@
 	}
 done:
 
-	DEBUG(5, ("set_dc_type_and_flags: domain %s is %snative mode.\n",
+	DEBUG(5, ("set_dc_type_and_flags: domain %s is %sin native mode.\n",
 		  domain->name, domain->native_mode ? "" : "NOT "));
 
-	DEBUG(5,("set_dc_type_and_flags: domain %s is %sactive directory.\n",
+	DEBUG(5,("set_dc_type_and_flags: domain %s is %srunning active directory.\n",
 		  domain->name, domain->active_directory ? "" : "NOT "));
 
 	cli_rpc_pipe_close(cli);