r6395: Fix for Bug 2137, from Jay Fenlason <fenlason@redhat.com>

Encode quotes for display in HTML.

deryck
(This used to be commit b9b18a09ea3bf3edba15dc073dd20b195bc6082b)

diff --git a/source3/web/swat.c b/source3/web/swat.c
index e7402e0a0f6e76f14e5fee5e7c690ad53824e898..1d6241fdd659dc30d2c53780e9a43528db4d0a8d 100644 (file)
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -215,11 +215,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++) {
-                               /* enclose in quotes if the string contains a space */
+                               /* enclose in HTML encoded quotes if the string contains a space */
                                if ( strchr_m(*list, ' ') ) {
                                        push_utf8_allocate(&utf8_s1, *list);
                                        push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""));
-                                       printf("\'%s\'%s", utf8_s1, utf8_s2);
+                                       printf(""%s"%s", utf8_s1, utf8_s2);
                                } else {
                                        push_utf8_allocate(&utf8_s1, *list);
                                        push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""));
@@ -235,9 +235,9 @@ static void show_parameter(int snum, struct parm_struct *parm)
                if (parm->def.lvalue) {
                        char **list = (char **)(parm->def.lvalue);
                        for (; *list; list++) {
-                               /* enclose in quotes if the string contains a space */
+                               /* enclose in HTML encoded quotes if the string contains a space */
                                if ( strchr_m(*list, ' ') ) 
-                                       printf("\'%s\'%s", *list, ((*(list+1))?", ":""));
+                                       printf(""%s"%s", *list, ((*(list+1))?", ":""));
                                else
                                        printf("%s%s", *list, ((*(list+1))?", ":""));
                        }