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

[vlendec at samba.org]

Author: vlendec
Date: 2005-11-13 11:53:18 +0000 (Sun, 13 Nov 2005)
New Revision: 11707

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

Log:
alt_names[i] might be NULL for i>0 also...

Volker

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


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_misc.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_misc.c	2005-11-13 11:38:17 UTC (rev 11706)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_misc.c	2005-11-13 11:53:18 UTC (rev 11707)
@@ -134,7 +134,8 @@
 	for (i=1; i<num_domains; i++)
 		extra_data = talloc_asprintf(state->mem_ctx, "%s\n%s\\%s\\%s",
 					     extra_data,
-					     names[i], alt_names[i],
+					     names[i],
+					     alt_names[i] ? alt_names[i] : names[i],
 					     sid_string_static(&sids[i]));
 
 	/* This is a bit excessive, but the extra data sooner or later will be

Modified: trunk/source/nsswitch/winbindd_misc.c
===================================================================
--- trunk/source/nsswitch/winbindd_misc.c	2005-11-13 11:38:17 UTC (rev 11706)
+++ trunk/source/nsswitch/winbindd_misc.c	2005-11-13 11:53:18 UTC (rev 11707)
@@ -134,7 +134,8 @@
 	for (i=1; i<num_domains; i++)
 		extra_data = talloc_asprintf(state->mem_ctx, "%s\n%s\\%s\\%s",
 					     extra_data,
-					     names[i], alt_names[i],
+					     names[i],
+					     alt_names[i] ? alt_names[i] : names[i],
 					     sid_string_static(&sids[i]));
 
 	/* This is a bit excessive, but the extra data sooner or later will be