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

vlendec at samba.org vlendec at samba.org
Fri Mar 17 11:53:33 GMT 2006


Author: vlendec
Date: 2006-03-17 11:53:33 +0000 (Fri, 17 Mar 2006)
New Revision: 14509

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

Log:
Attempt to fix the build on "sun1"
Modified:
   branches/SAMBA_3_0/source/nsswitch/wbinfo.c
   trunk/source/nsswitch/wbinfo.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/wbinfo.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/wbinfo.c	2006-03-17 10:43:33 UTC (rev 14508)
+++ branches/SAMBA_3_0/source/nsswitch/wbinfo.c	2006-03-17 11:53:33 UTC (rev 14509)
@@ -1293,7 +1293,7 @@
 						WBFLAG_PAM_INFO3_TEXT;
 				fstring tok;
 				int i;
-				const char *arg[] = { string_arg, NULL };
+				const char *arg[] = { NULL, NULL };
 				const char *cctypes[] = { "FILE", 
 							  "KCM", 
 							  "KCM:0", 
@@ -1301,6 +1301,8 @@
 							  NULL, 
 							  "0"};
 
+				arg[0] = string_arg;
+
 				while (next_token(arg, tok, LIST_SEP, sizeof(tok))) {
 
 					for (i=0; i < ARRAY_SIZE(cctypes); i++) {

Modified: trunk/source/nsswitch/wbinfo.c
===================================================================
--- trunk/source/nsswitch/wbinfo.c	2006-03-17 10:43:33 UTC (rev 14508)
+++ trunk/source/nsswitch/wbinfo.c	2006-03-17 11:53:33 UTC (rev 14509)
@@ -1293,7 +1293,7 @@
 						WBFLAG_PAM_INFO3_TEXT;
 				fstring tok;
 				int i;
-				const char *arg[] = { string_arg, NULL };
+				const char *arg[] = { NULL, NULL };
 				const char *cctypes[] = { "FILE", 
 							  "KCM", 
 							  "KCM:0", 
@@ -1301,6 +1301,8 @@
 							  NULL, 
 							  "0"};
 
+				arg[0] = string_arg;
+
 				while (next_token(arg, tok, LIST_SEP, sizeof(tok))) {
 
 					for (i=0; i < ARRAY_SIZE(cctypes); i++) {



More information about the samba-cvs mailing list