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

jerry at samba.org jerry at samba.org
Wed Dec 20 16:57:10 GMT 2006


Author: jerry
Date: 2006-12-20 16:57:10 +0000 (Wed, 20 Dec 2006)
New Revision: 20287

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

Log:
Allow a NULL sid when setting up the list of trusted domains.


Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
   branches/SAMBA_3_0_24/source/nsswitch/winbindd_util.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2006-12-20 16:53:29 UTC (rev 20286)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2006-12-20 16:57:10 UTC (rev 20287)
@@ -268,8 +268,13 @@
 			*q = '\0';
 
 		if (!string_to_sid(&sid, sidstr)) {
-			DEBUG(0, ("Got invalid trustdom response\n"));
-			break;
+			/* Allow NULL sid for sibling domains */
+			if ( strcmp(sidstr,"S-0-0") == 0) {
+				sid_copy( &sid, &global_sid_NULL);				
+			} else {				
+				DEBUG(0, ("Got invalid trustdom response\n"));
+				break;
+			}			
 		}
 
 		if (find_domain_from_name_noinit(p) == NULL) {

Modified: branches/SAMBA_3_0_24/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0_24/source/nsswitch/winbindd_util.c	2006-12-20 16:53:29 UTC (rev 20286)
+++ branches/SAMBA_3_0_24/source/nsswitch/winbindd_util.c	2006-12-20 16:57:10 UTC (rev 20287)
@@ -268,8 +268,13 @@
 			*q = '\0';
 
 		if (!string_to_sid(&sid, sidstr)) {
-			DEBUG(0, ("Got invalid trustdom response\n"));
-			break;
+			/* Allow NULL sid for sibling domains */
+			if ( strcmp(sidstr,"S-0-0") == 0) {
+				sid_copy( &sid, &global_sid_NULL);				
+			} else {				
+				DEBUG(0, ("Got invalid trustdom response\n"));
+				break;
+			}			
 		}
 
 		if (find_domain_from_name_noinit(p) == NULL) {



More information about the samba-cvs mailing list