From 3c101594ddb9b8be9378ddd00c175a1fcf04a577 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Sat, 22 Nov 2003 04:35:36 +0000
Subject: Ensure that items in a list of strings containing whitespace are
 written out surrounded by single quotes.  This means that both double and
 single quotes are now used to surround strings in smb.conf.  This is a slight
 change from the previous behavior but needed or else things like

    printer admin = +ntadmin, 'VALE\Domain, Admin'

get written to smb.conf by SWAT.
(This used to be commit 59e9d6e301c752e99fb6a50204d7941f7f84566a)
---
 source3/lib/util_str.c   |  2 +-
 source3/param/loadparm.c | 10 +++++++---
 source3/web/swat.c       | 12 ++++++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index aa50b07f61..1aa33a1a4b 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -62,7 +62,7 @@ BOOL next_token(const char **ptr,char *buff, const char *sep, size_t bufsize)
 	/* copy over the token */
 	pbuf = buff;
 	for (quoted = False; len < bufsize && *s && (quoted || !strchr_m(sep,*s)); s++) {
-		if (*s == '\"') {
+		if (*s == '\"' || *s == '\'') {
 			quoted = !quoted;
 		} else {
 			len++;
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 8e6064ab59..b124c6fd3b 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3310,9 +3310,13 @@ static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
 			if ((char ***)ptr && *(char ***)ptr) {
 				char **list = *(char ***)ptr;
 				
-				for (; *list; list++)
-					fprintf(f, "%s%s", *list,
-						((*(list+1))?", ":""));
+				for (; *list; list++) {
+					/* surround strings with whitespace in single quotes */
+					if ( strchr_m( *list, ' ' ) )
+						fprintf(f, "\'%s\'%s", *list, ((*(list+1))?", ":""));
+					else
+						fprintf(f, "%s%s", *list, ((*(list+1))?", ":""));
+				}
 			}
 			break;
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index f4046b46a2..1faef46e25 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -212,7 +212,11 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) {
 			char **list = *(char ***)ptr;
 			for (;*list;list++) {
-				d_printf("%s%s", *list, ((*(list+1))?" ":""));
+				/* enclose in quotes if the string contains a space */
+				if ( strchr_m(*list, ' ') ) 
+					d_printf("\'%s\'%s", *list, ((*(list+1))?", ":""));
+				else
+					d_printf("%s%s", *list, ((*(list+1))?", ":""));
 			}
 		}
 		d_printf("\">");
@@ -221,7 +225,11 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		if (parm->def.lvalue) {
 			char **list = (char **)(parm->def.lvalue);
 			for (; *list; list++) {
-				d_printf("%s%s", *list, ((*(list+1))?" ":""));
+				/* enclose in quotes if the string contains a space */
+				if ( strchr_m(*list, ' ') ) 
+					d_printf("\'%s\'%s", *list, ((*(list+1))?", ":""));
+				else
+					d_printf("%s%s", *list, ((*(list+1))?", ":""));
 			}
 		}
 		d_printf("\'\">");
-- 
cgit