svn commit: samba r21308 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch

gd at samba.org gd at samba.org
Tue Feb 13 10:42:54 GMT 2007


Author: gd
Date: 2007-02-13 10:42:53 +0000 (Tue, 13 Feb 2007)
New Revision: 21308

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

Log:
Fix some typos and ensure to null terminate the correct strings.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_async.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
   branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c
   branches/SAMBA_3_0_25/source/nsswitch/winbindd_rpc.c
   branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_async.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_async.c	2007-02-13 09:27:56 UTC (rev 21307)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_async.c	2007-02-13 10:42:53 UTC (rev 21308)
@@ -837,7 +837,7 @@
 		char *name_domain, *name_account;
 		
 		if ( !root_domain ) {
-			DEBUG(5,("lookupname_recv: unable determine forest root\n"));
+			DEBUG(5,("lookupname_recv: unable to determine forest root\n"));
 			cont(private_data, False, NULL, SID_NAME_UNKNOWN);
 			return;
 		}
@@ -907,10 +907,10 @@
 	char *p;
 
 	/* Ensure null termination */
-	state->request.data.sid[sizeof(state->request.data.name.dom_name)-1]='\0';
+	state->request.data.name.dom_name[sizeof(state->request.data.name.dom_name)-1]='\0';
 
 	/* Ensure null termination */
-	state->request.data.sid[sizeof(state->request.data.name.name)-1]='\0';
+	state->request.data.name.name[sizeof(state->request.data.name.name)-1]='\0';
 
 	/* cope with the name being a fully qualified name */
 	p = strstr(state->request.data.name.name, lp_winbind_separator());
@@ -926,7 +926,7 @@
 	DEBUG(3, ("[%5lu]: lookupname %s%s%s\n", (unsigned long)state->pid,
 		  name_domain, lp_winbind_separator(), name_user));
 
-	/* Lookup name from PDC using lsa_lookup_names() */
+	/* Lookup name from DC using lsa_lookup_names() */
 	if (!winbindd_lookup_sid_by_name(state->mem_ctx, domain, name_domain,
 					 name_user, &sid, &type)) {
 		return WINBINDD_ERROR;

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c	2007-02-13 09:27:56 UTC (rev 21307)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c	2007-02-13 10:42:53 UTC (rev 21308)
@@ -262,7 +262,7 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	ws_name_return( full_name, '_' );	
+	ws_name_return( full_name, '_' );
 
 	DEBUG(3,("name_to_sid [rpc] %s for domain %s\n", full_name?full_name:"", domain_name ));
 

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2007-02-13 09:27:56 UTC (rev 21307)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2007-02-13 10:42:53 UTC (rev 21308)
@@ -716,7 +716,7 @@
 	/* Lookup name */
 	result = domain->methods->name_to_sid(domain, mem_ctx, domain_name, name, sid, type);
 
-	/* Return rid and type if lookup successful */
+	/* Return sid and type if lookup successful */
 	if (!NT_STATUS_IS_OK(result)) {
 		*type = SID_NAME_UNKNOWN;
 	}

Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c	2007-02-13 09:27:56 UTC (rev 21307)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c	2007-02-13 10:42:53 UTC (rev 21308)
@@ -837,7 +837,7 @@
 		char *name_domain, *name_account;
 		
 		if ( !root_domain ) {
-			DEBUG(5,("lookupname_recv: unable determine forest root\n"));
+			DEBUG(5,("lookupname_recv: unable to determine forest root\n"));
 			cont(private_data, False, NULL, SID_NAME_UNKNOWN);
 			return;
 		}
@@ -907,10 +907,10 @@
 	char *p;
 
 	/* Ensure null termination */
-	state->request.data.sid[sizeof(state->request.data.name.dom_name)-1]='\0';
+	state->request.data.name.dom_name[sizeof(state->request.data.name.dom_name)-1]='\0';
 
 	/* Ensure null termination */
-	state->request.data.sid[sizeof(state->request.data.name.name)-1]='\0';
+	state->request.data.name.name[sizeof(state->request.data.name.name)-1]='\0';
 
 	/* cope with the name being a fully qualified name */
 	p = strstr(state->request.data.name.name, lp_winbind_separator());
@@ -926,7 +926,7 @@
 	DEBUG(3, ("[%5lu]: lookupname %s%s%s\n", (unsigned long)state->pid,
 		  name_domain, lp_winbind_separator(), name_user));
 
-	/* Lookup name from PDC using lsa_lookup_names() */
+	/* Lookup name from DC using lsa_lookup_names() */
 	if (!winbindd_lookup_sid_by_name(state->mem_ctx, domain, name_domain,
 					 name_user, &sid, &type)) {
 		return WINBINDD_ERROR;

Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_rpc.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_rpc.c	2007-02-13 09:27:56 UTC (rev 21307)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_rpc.c	2007-02-13 10:42:53 UTC (rev 21308)
@@ -262,7 +262,7 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	ws_name_return( full_name, '_' );	
+	ws_name_return( full_name, '_' );
 
 	DEBUG(3,("name_to_sid [rpc] %s for domain %s\n", full_name?full_name:"", domain_name ));
 

Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c	2007-02-13 09:27:56 UTC (rev 21307)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c	2007-02-13 10:42:53 UTC (rev 21308)
@@ -716,7 +716,7 @@
 	/* Lookup name */
 	result = domain->methods->name_to_sid(domain, mem_ctx, domain_name, name, sid, type);
 
-	/* Return rid and type if lookup successful */
+	/* Return sid and type if lookup successful */
 	if (!NT_STATUS_IS_OK(result)) {
 		*type = SID_NAME_UNKNOWN;
 	}



More information about the samba-cvs mailing list