r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text
[ira/wip.git] / source3 / web / swat.c
index ad91033f4cbf957261c16fbb6460d08cc7f20a9b..25dc9306ea63ce8ff54b2b716a2970753b12e3a0 100644 (file)
@@ -1,11 +1,13 @@
 /* 
    Unix SMB/CIFS implementation.
    Samba Web Administration Tool
-   Copyright (C) Andrew Tridgell 1997-1998
+   Version 3.0.0
+   Copyright (C) Andrew Tridgell 1997-2002
+   Copyright (C) John H Terpstra 2002
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /**
- * @group swat SWAT
+ * @defgroup swat SWAT - Samba Web Administration Tool
  * @{ 
  * @file swat.c
  *
  **/
 
 #include "includes.h"
-
-#define GLOBALS_SNUM -1
+#include "web/swat_proto.h"
 
 static BOOL demo_mode = False;
+static BOOL passwd_only = False;
 static BOOL have_write_access = False;
 static BOOL have_read_access = False;
 static int iNumNonAutoPrintServices = 0;
@@ -50,13 +51,10 @@ static int iNumNonAutoPrintServices = 0;
 #define ENABLE_USER_FLAG "enable_user_flag"
 #define RHOST "remote_host"
 
-/* we need these because we link to locking*.o */
- void become_root(void) {}
- void unbecome_root(void) {}
 
 /****************************************************************************
 ****************************************************************************/
-static int enum_index(int value, struct enum_list *enumlist)
+static int enum_index(int value, const struct enum_list *enumlist)
 {
        int i;
        for (i=0;enumlist[i].name;i++)
@@ -64,7 +62,7 @@ static int enum_index(int value, struct enum_list *enumlist)
        return(i);
 }
 
-static char *fix_backslash(char *str)
+static char *fix_backslash(const char *str)
 {
        static char newstring[1024];
        char *p = newstring;
@@ -78,20 +76,40 @@ static char *fix_backslash(char *str)
        return newstring;
 }
 
-static char *stripspace(char *str)
+static char *fix_quotes(const char *str)
 {
-static char newstring[1024];
-char *p = newstring;
+       static pstring newstring;
+       char *p = newstring;
+       size_t newstring_len = sizeof(newstring);
+       int quote_len = strlen("&quot;");
 
-        while (*str) {
-                if (*str != ' ') *p++ = *str;
-                ++str;
-        }
+       while (*str) {
+               if ( *str == '\"' && (newstring_len - PTR_DIFF(p, newstring) - 1) > quote_len ) {
+                       strncpy( p, "&quot;", quote_len); 
+                       p += quote_len;
+               } else {
+                       *p++ = *str;
+               }
+               ++str;
+       }
        *p = '\0';
        return newstring;
 }
 
-static char *make_parm_name(char *label)
+static char *stripspaceupper(const char *str)
+{
+       static char newstring[1024];
+       char *p = newstring;
+
+       while (*str) {
+               if (*str != ' ') *p++ = toupper_ascii(*str);
+               ++str;
+       }
+       *p = '\0';
+       return newstring;
+}
+
+static char *make_parm_name(const char *label)
 {
        static char parmname[1024];
        char *p = parmname;
@@ -108,7 +126,7 @@ static char *make_parm_name(char *label)
 /****************************************************************************
   include a lump of html in a page 
 ****************************************************************************/
-static int include_html(char *fname)
+static int include_html(const char *fname)
 {
        int fd;
        char buf[1024];
@@ -117,7 +135,8 @@ static int include_html(char *fname)
        fd = web_open(fname, O_RDONLY, 0);
 
        if (fd == -1) {
-               d_printf("ERROR: Can't open %s\n", fname);
+               printf(_("ERROR: Can't open %s"), fname);
+               printf("\n");
                return 0;
        }
 
@@ -135,13 +154,13 @@ static int include_html(char *fname)
 static void print_header(void)
 {
        if (!cgi_waspost()) {
-               d_printf("Expires: 0\r\n");
+               printf("Expires: 0\r\n");
        }
-       d_printf("Content-type: text/html\r\n\r\n");
+       printf("Content-type: text/html\r\n\r\n");
 
        if (!include_html("include/header.html")) {
-               d_printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
-               d_printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"/swat/images/background.jpg\">\n\n");
+               printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
+               printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"/swat/images/background.jpg\">\n\n");
        }
 }
 
@@ -167,13 +186,13 @@ static const char* get_parm_translated(
        static pstring output;
        if(strcmp(pLabel, pTranslated) != 0)
        {
-               snprintf(output, sizeof(output),
-                 "<A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
+               pstr_sprintf(output,
+                 "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
                   pAnchor, pHelp, pLabel, pTranslated);
                return output;
        }
-       snprintf(output, sizeof(output)
-         "<A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
+       pstr_sprintf(output
+         "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
          pAnchor, pHelp, pLabel);
        return output;
 }
@@ -183,7 +202,7 @@ static const char* get_parm_translated(
 static void print_footer(void)
 {
        if (!include_html("include/footer.html")) {
-               d_printf("\n</BODY>\n</HTML>\n");
+               printf("\n</BODY>\n</HTML>\n");
        }
 }
 
@@ -194,119 +213,139 @@ static void show_parameter(int snum, struct parm_struct *parm)
 {
        int i;
        void *ptr = parm->ptr;
+       char *utf8_s1, *utf8_s2;
 
-       if (parm->class == P_LOCAL && snum >= 0) {
+       if (parm->p_class == P_LOCAL && snum >= 0) {
                ptr = lp_local_ptr(snum, ptr);
        }
 
-       printf("<tr><td>%s</td><td>", get_parm_translated(stripspace(parm->label), _("Help"), parm->label));
+       printf("<tr><td>%s</td><td>", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label));
        switch (parm->type) {
        case P_CHAR:
-               d_printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
+               printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
                       make_parm_name(parm->label), *(char *)ptr);
-               d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%c\'\">",
+               printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%c\'\">",
                        _("Set Default"), make_parm_name(parm->label),(char)(parm->def.cvalue));
                break;
 
        case P_LIST:
-               d_printf("<input type=text size=40 name=\"parm_%s\" value=\"",
+               printf("<input type=text size=40 name=\"parm_%s\" value=\"",
                        make_parm_name(parm->label));
                if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) {
                        char **list = *(char ***)ptr;
                        for (;*list;list++) {
-                               d_printf("%s%s", *list, ((*(list+1))?" ":""));
+                               /* 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("&quot;%s&quot;%s", utf8_s1, utf8_s2);
+                               } else {
+                                       push_utf8_allocate(&utf8_s1, *list);
+                                       push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""));
+                                       printf("%s%s", utf8_s1, utf8_s2);
+                               }
+                               SAFE_FREE(utf8_s1);
+                               SAFE_FREE(utf8_s2);
                        }
                }
-               d_printf("\">");
-               d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'",
+               printf("\">");
+               printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'",
                        _("Set Default"), make_parm_name(parm->label));
                if (parm->def.lvalue) {
                        char **list = (char **)(parm->def.lvalue);
                        for (; *list; list++) {
-                               d_printf("%s%s", *list, ((*(list+1))?" ":""));
+                               /* enclose in HTML encoded quotes if the string contains a space */
+                               if ( strchr_m(*list, ' ') ) 
+                                       printf("&quot;%s&quot;%s", *list, ((*(list+1))?", ":""));
+                               else
+                                       printf("%s%s", *list, ((*(list+1))?", ":""));
                        }
                }
-               d_printf("\'\">");
+               printf("\'\">");
                break;
 
        case P_STRING:
        case P_USTRING:
-               d_printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-                      make_parm_name(parm->label), *(char **)ptr);
-               d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+               push_utf8_allocate(&utf8_s1, *(char **)ptr);
+               printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
+                      make_parm_name(parm->label), fix_quotes(utf8_s1));
+               SAFE_FREE(utf8_s1);
+               printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
                        _("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
                break;
 
        case P_GSTRING:
        case P_UGSTRING:
-               d_printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-                      make_parm_name(parm->label), (char *)ptr);
-               d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+               push_utf8_allocate(&utf8_s1, (char *)ptr);
+               printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
+                      make_parm_name(parm->label), fix_quotes(utf8_s1));
+               SAFE_FREE(utf8_s1);
+               printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
                        _("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
                break;
 
        case P_BOOL:
-               d_printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-               d_printf("<option %s>Yes", (*(BOOL *)ptr)?"selected":"");
-               d_printf("<option %s>No", (*(BOOL *)ptr)?"":"selected");
-               d_printf("</select>");
-               d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+               printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
+               printf("<option %s>Yes", (*(BOOL *)ptr)?"selected":"");
+               printf("<option %s>No", (*(BOOL *)ptr)?"":"selected");
+               printf("</select>");
+               printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
                        _("Set Default"), make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?0:1);
                break;
 
        case P_BOOLREV:
-               d_printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-               d_printf("<option %s>Yes", (*(BOOL *)ptr)?"":"selected");
-               d_printf("<option %s>No", (*(BOOL *)ptr)?"selected":"");
-               d_printf("</select>");
-               d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+               printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
+               printf("<option %s>Yes", (*(BOOL *)ptr)?"":"selected");
+               printf("<option %s>No", (*(BOOL *)ptr)?"selected":"");
+               printf("</select>");
+               printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
                        _("Set Default"), make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?1:0);
                break;
 
        case P_INTEGER:
-               d_printf("<input type=text size=8 name=\"parm_%s\" value=%d>", make_parm_name(parm->label), *(int *)ptr);
-               d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
+               printf("<input type=text size=8 name=\"parm_%s\" value=\"%d\">", make_parm_name(parm->label), *(int *)ptr);
+               printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
                        _("Set Default"), make_parm_name(parm->label),(int)(parm->def.ivalue));
                break;
 
        case P_OCTAL:
-               d_printf("<input type=text size=8 name=\"parm_%s\" value=%s>", make_parm_name(parm->label), octal_string(*(int *)ptr));
-               d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+               printf("<input type=text size=8 name=\"parm_%s\" value=%s>", make_parm_name(parm->label), octal_string(*(int *)ptr));
+               printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
                       _("Set Default"), make_parm_name(parm->label),
                       octal_string((int)(parm->def.ivalue)));
                break;
 
        case P_ENUM:
-               d_printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
+               printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
                for (i=0;parm->enum_list[i].name;i++) {
                        if (i == 0 || parm->enum_list[i].value != parm->enum_list[i-1].value) {
-                               d_printf("<option %s>%s",(*(int *)ptr)==parm->enum_list[i].value?"selected":"",parm->enum_list[i].name);
+                               printf("<option %s>%s",(*(int *)ptr)==parm->enum_list[i].value?"selected":"",parm->enum_list[i].name);
                        }
                }
-               d_printf("</select>");
-               d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+               printf("</select>");
+               printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
                        _("Set Default"), make_parm_name(parm->label),enum_index((int)(parm->def.ivalue),parm->enum_list));
                break;
        case P_SEP:
                break;
        }
-       d_printf("</td></tr>\n");
+       printf("</td></tr>\n");
 }
 
 /****************************************************************************
   display a set of parameters for a service 
 ****************************************************************************/
-static void show_parameters(int snum, int allparameters, int advanced, int printers)
+static void show_parameters(int snum, int allparameters, unsigned int parm_filter, int printers)
 {
        int i = 0;
        struct parm_struct *parm;
-       char *heading = NULL;
-       char *last_heading = NULL;
+       const char *heading = NULL;
+       const char *last_heading = NULL;
 
        while ((parm = lp_next_parameter(snum, &i, allparameters))) {
-               if (snum < 0 && parm->class == P_LOCAL && !(parm->flags & FLAG_GLOBAL))
+               if (snum < 0 && parm->p_class == P_LOCAL && !(parm->flags & FLAG_GLOBAL))
                        continue;
-               if (parm->class == P_SEPARATOR) {
+               if (parm->p_class == P_SEPARATOR) {
                        heading = parm->label;
                        continue;
                }
@@ -315,11 +354,12 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
                        if (printers & !(parm->flags & FLAG_PRINT)) continue;
                        if (!printers & !(parm->flags & FLAG_SHARE)) continue;
                }
-               if (!advanced) {
+
+               if (!( parm_filter & FLAG_ADVANCED )) {
                        if (!(parm->flags & FLAG_BASIC)) {
-                               void *ptr = parm->ptr;
+                                       void *ptr = parm->ptr;
 
-                               if (parm->class == P_LOCAL && snum >= 0) {
+                               if (parm->p_class == P_LOCAL && snum >= 0) {
                                        ptr = lp_local_ptr(snum, ptr);
                                }
 
@@ -358,12 +398,17 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
                                        break;
                                case P_SEP:
                                        continue;
-                               }
+                                       }
                        }
                        if (printers && !(parm->flags & FLAG_PRINT)) continue;
                }
+
+               if ((parm_filter & FLAG_WIZARD) && !(parm->flags & FLAG_WIZARD)) continue;
+               
+               if ((parm_filter & FLAG_ADVANCED) && !(parm->flags & FLAG_ADVANCED)) continue;
+               
                if (heading && heading != last_heading) {
-                       d_printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", _(heading));
+                       printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", _(heading));
                        last_heading = heading;
                }
                show_parameter(snum, parm);
@@ -376,7 +421,7 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 static BOOL load_config(BOOL save_def)
 {
        lp_resetnumservices();
-       return lp_load(dyn_CONFIGFILE,False,save_def,False);
+       return lp_load(dyn_CONFIGFILE,False,save_def,False,True);
 }
 
 /****************************************************************************
@@ -386,13 +431,13 @@ static void write_config(FILE *f, BOOL show_defaults)
 {
        fprintf(f, "# Samba config file created using SWAT\n");
        fprintf(f, "# from %s (%s)\n", cgi_remote_host(), cgi_remote_addr());
-       fprintf(f, "# Date: %s\n\n", timestring(False));
+       fprintf(f, "# Date: %s\n\n", current_timestring(False));
        
        lp_dump(f, show_defaults, iNumNonAutoPrintServices);
 }
 
 /****************************************************************************
-  save and reoad the smb.conf config file 
+  save and reload the smb.conf config file 
 ****************************************************************************/
 static int save_reload(int snum)
 {
@@ -401,14 +446,19 @@ static int save_reload(int snum)
 
        f = sys_fopen(dyn_CONFIGFILE,"w");
        if (!f) {
-               d_printf("failed to open %s for writing\n", dyn_CONFIGFILE);
+               printf(_("failed to open %s for writing"), dyn_CONFIGFILE);
+               printf("\n");
                return 0;
        }
 
        /* just in case they have used the buggy xinetd to create the file */
        if (fstat(fileno(f), &st) == 0 &&
            (st.st_mode & S_IWOTH)) {
+#if defined HAVE_FCHMOD
                fchmod(fileno(f), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
+#else
+               chmod(dyn_CONFIGFILE, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
+#endif
        }
 
        write_config(f, False);
@@ -419,7 +469,8 @@ static int save_reload(int snum)
        lp_killunused(NULL);
 
        if (!load_config(False)) {
-                d_printf("Can't reload %s\n", dyn_CONFIGFILE);
+                printf(_("Can't reload %s"), dyn_CONFIGFILE);
+               printf("\n");
                 return 0;
         }
        iNumNonAutoPrintServices = lp_numservices();
@@ -431,12 +482,12 @@ static int save_reload(int snum)
 /****************************************************************************
   commit one parameter 
 ****************************************************************************/
-static void commit_parameter(int snum, struct parm_struct *parm, char *v)
+static void commit_parameter(int snum, struct parm_struct *parm, const char *v)
 {
        int i;
        char *s;
 
-       if (snum < 0 && parm->class == P_LOCAL) {
+       if (snum < 0 && parm->p_class == P_LOCAL) {
                /* this handles the case where we are changing a local
                   variable globally. We need to change the parameter in 
                   all shares where it is currently set to the default */
@@ -459,11 +510,11 @@ static void commit_parameters(int snum)
        int i = 0;
        struct parm_struct *parm;
        pstring label;
-       char *v;
+       const char *v;
 
        while ((parm = lp_next_parameter(snum, &i, 1))) {
                slprintf(label, sizeof(label)-1, "parm_%s", make_parm_name(parm->label));
-               if ((v = cgi_variable(label))) {
+               if ((v = cgi_variable(label)) != NULL) {
                        if (parm->flags & FLAG_HIDE) continue;
                        commit_parameter(snum, parm, v); 
                }
@@ -475,7 +526,7 @@ static void commit_parameters(int snum)
 ****************************************************************************/
 static void image_link(const char *name, const char *hlink, const char *src)
 {
-       d_printf("<A HREF=\"%s/%s\"><img border=\"0\" src=\"/swat/%s\" alt=\"%s\"></A>\n", 
+       printf("<A HREF=\"%s/%s\"><img border=\"0\" src=\"/swat/%s\" alt=\"%s\"></A>\n", 
               cgi_baseurl(), hlink, src, name);
 }
 
@@ -488,7 +539,8 @@ static void show_main_buttons(void)
        char *p;
        
        if ((p = cgi_user_name()) && strcmp(p, "root")) {
-               d_printf(_("Logged in as <b>%s</b><p>\n"), p);
+               printf(_("Logged in as <b>%s</b>"), p);
+               printf("<p>\n");
        }
 
        image_link(_("Home"), "", "images/home.gif");
@@ -496,14 +548,30 @@ static void show_main_buttons(void)
                image_link(_("Globals"), "globals", "images/globals.gif");
                image_link(_("Shares"), "shares", "images/shares.gif");
                image_link(_("Printers"), "printers", "images/printers.gif");
+               image_link(_("Wizard"), "wizard", "images/wizard.gif");
        }
-       if (have_read_access) {
+   /* root always gets all buttons, otherwise look for -P */
+       if ( have_write_access || (!passwd_only && have_read_access) ) {
                image_link(_("Status"), "status", "images/status.gif");
                image_link(_("View Config"), "viewconfig", "images/viewconfig.gif");
        }
        image_link(_("Password Management"), "passwd", "images/passwd.gif");
 
-       d_printf("<HR>\n");
+       printf("<HR>\n");
+}
+
+/****************************************************************************
+ * Handle Display/Edit Mode CGI
+ ****************************************************************************/
+static void ViewModeBoxes(int mode)
+{
+       printf("<p>%s:&nbsp;\n", _("Current View Is"));
+       printf("<input type=radio name=\"ViewMode\" value=0 %s>%s\n", ((mode == 0) ? "checked" : ""), _("Basic"));
+       printf("<input type=radio name=\"ViewMode\" value=1 %s>%s\n", ((mode == 1) ? "checked" : ""), _("Advanced"));
+       printf("<br>%s:&nbsp;\n", _("Change View To"));
+       printf("<input type=submit name=\"BasicMode\" value=\"%s\">\n", _("Basic"));
+       printf("<input type=submit name=\"AdvMode\" value=\"%s\">\n", _("Advanced"));
+       printf("</p><br>\n");
 }
 
 /****************************************************************************
@@ -511,7 +579,11 @@ static void show_main_buttons(void)
 ****************************************************************************/
 static void welcome_page(void)
 {
-       include_html("help/welcome.html");
+       if (file_exist("help/welcome.html", NULL)) {
+               include_html("help/welcome.html");
+       } else {
+               include_html("help/welcome-no-samba-doc.html");
+       }
 }
 
 /****************************************************************************
@@ -525,84 +597,297 @@ static void viewconfig_page(void)
                full_view = 1;
        }
 
-       d_printf("<H2>%s</H2>\n", _("Current Config"));
-       d_printf("<form method=post>\n");
+       printf("<H2>%s</H2>\n", _("Current Config"));
+       printf("<form method=post>\n");
 
        if (full_view) {
-               d_printf("<input type=submit name=\"normal_view\" value=\"%s\">\n", _("Normal View"));
+               printf("<input type=submit name=\"normal_view\" value=\"%s\">\n", _("Normal View"));
        } else {
-               d_printf("<input type=submit name=\"full_view\" value=\"%s\">\n", _("Full View"));
+               printf("<input type=submit name=\"full_view\" value=\"%s\">\n", _("Full View"));
        }
 
-       d_printf("<p><pre>");
+       printf("<p><pre>");
        write_config(stdout, full_view);
-       d_printf("</pre>");
-       d_printf("</form>\n");
+       printf("</pre>");
+       printf("</form>\n");
 }
 
 /****************************************************************************
-  display a globals editing page  
+  second screen of the wizard ... Fetch Configuration Parameters
 ****************************************************************************/
-static void globals_page(void)
+static void wizard_params_page(void)
 {
-       int advanced = 0;
+       unsigned int parm_filter = FLAG_WIZARD;
 
-       d_printf("<H2>%s</H2>\n", _("Global Variables"));
+       /* Here we first set and commit all the parameters that were selected
+          in the previous screen. */
 
-       if (cgi_variable("Advanced") && !cgi_variable("Basic"))
-               advanced = 1;
+       printf("<H2>%s</H2>\n", _("Wizard Parameter Edit Page"));
 
        if (cgi_variable("Commit")) {
-               commit_parameters(GLOBALS_SNUM);
+               commit_parameters(GLOBAL_SECTION_SNUM);
                save_reload(0);
        }
 
-       d_printf("<FORM name=\"swatform\" method=post>\n");
+       printf("<form name=\"swatform\" method=post action=wizard_params>\n");
 
        if (have_write_access) {
-               d_printf("<input type=submit name=\"Commit\" value=\"%s\">\n",
-                       _("Commit Changes"));
+               printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
        }
 
-       d_printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", 
-                _("Reset Values"));
-       if (advanced == 0) {
-               d_printf("<input type=submit name=\"Advanced\" value=\"%s\">\n", _("Advanced View"));
-       } else {
-               d_printf("<input type=submit name=\"Basic\" value=\"%s\">\n", _("Basic View"));
+       printf("<input type=reset name=\"Reset Values\" value=\"Reset\">\n");
+       printf("<p>\n");
+       
+       printf("<table>\n");
+       show_parameters(GLOBAL_SECTION_SNUM, 1, parm_filter, 0);
+       printf("</table>\n");
+       printf("</form>\n");
+}
+
+/****************************************************************************
+  Utility to just rewrite the smb.conf file - effectively just cleans it up
+****************************************************************************/
+static void rewritecfg_file(void)
+{
+       commit_parameters(GLOBAL_SECTION_SNUM);
+       save_reload(0);
+       printf("<H2>%s</H2>\n", _("Note: smb.conf file has been read and rewritten"));
+}
+
+/****************************************************************************
+  wizard to create/modify the smb.conf file
+****************************************************************************/
+static void wizard_page(void)
+{
+       /* Set some variables to collect data from smb.conf */
+       int role = 0;
+       int winstype = 0;
+       int have_home = -1;
+       int HomeExpo = 0;
+       int SerType = 0;
+
+       if (cgi_variable("Rewrite")) {
+               (void) rewritecfg_file();
+               return;
+       }
+
+       if (cgi_variable("GetWizardParams")){
+               (void) wizard_params_page();
+               return;
+       }
+
+       if (cgi_variable("Commit")){
+               SerType = atoi(cgi_variable_nonull("ServerType"));
+               winstype = atoi(cgi_variable_nonull("WINSType"));
+               have_home = lp_servicenumber(HOMES_NAME);
+               HomeExpo = atoi(cgi_variable_nonull("HomeExpo"));
+
+               /* Plain text passwords are too badly broken - use encrypted passwords only */
+               lp_do_parameter( GLOBAL_SECTION_SNUM, "encrypt passwords", "Yes");
+               
+               switch ( SerType ){
+                       case 0:
+                               /* Stand-alone Server */
+                               lp_do_parameter( GLOBAL_SECTION_SNUM, "security", "USER" );
+                               lp_do_parameter( GLOBAL_SECTION_SNUM, "domain logons", "No" );
+                               break;
+                       case 1:
+                               /* Domain Member */
+                               lp_do_parameter( GLOBAL_SECTION_SNUM, "security", "DOMAIN" );
+                               lp_do_parameter( GLOBAL_SECTION_SNUM, "domain logons", "No" );
+                               break;
+                       case 2:
+                               /* Domain Controller */
+                               lp_do_parameter( GLOBAL_SECTION_SNUM, "security", "USER" );
+                               lp_do_parameter( GLOBAL_SECTION_SNUM, "domain logons", "Yes" );
+                               break;
+               }
+               switch ( winstype ) {
+                       case 0:
+                               lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "No" );
+                               lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", "" );
+                               break;
+                       case 1:
+                               lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "Yes" );
+                               lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", "" );
+                               break;
+                       case 2:
+                               lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "No" );
+                               lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", cgi_variable_nonull("WINSAddr"));
+                               break;
+               }
+
+               /* Have to create Homes share? */
+               if ((HomeExpo == 1) && (have_home == -1)) {
+                       pstring unix_share;
+                       
+                       pstrcpy(unix_share,HOMES_NAME);
+                       load_config(False);
+                       lp_copy_service(GLOBAL_SECTION_SNUM, unix_share);
+                       iNumNonAutoPrintServices = lp_numservices();
+                       have_home = lp_servicenumber(HOMES_NAME);
+                       lp_do_parameter( have_home, "read only", "No");
+                       lp_do_parameter( have_home, "valid users", "%S");
+                       lp_do_parameter( have_home, "browseable", "No");
+                       commit_parameters(have_home);
+               }
+
+               /* Need to Delete Homes share? */
+               if ((HomeExpo == 0) && (have_home != -1)) {
+                       lp_remove_service(have_home);
+                       have_home = -1;
+               }
+
+               commit_parameters(GLOBAL_SECTION_SNUM);
+               save_reload(0);
        }
-       d_printf("<p>\n");
+       else
+       {
+               /* Now determine smb.conf WINS settings */
+               if (lp_wins_support())
+                       winstype = 1;
+               if (lp_wins_server_list() && strlen(*lp_wins_server_list()))
+                       winstype = 2;
+               
+
+               /* Do we have a homes share? */
+               have_home = lp_servicenumber(HOMES_NAME);
+       }
+       if ((winstype == 2) && lp_wins_support())
+               winstype = 3;
+
+       role = lp_server_role();
+       
+       /* Here we go ... */
+       printf("<H2>%s</H2>\n", _("Samba Configuration Wizard"));
+       printf("<form method=post action=wizard>\n");
+
+       if (have_write_access) {
+               printf("%s\n", _("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."));
+               printf("%s", _("The same will happen if you press the commit button."));
+               printf("<br><br>\n");
+               printf("<center>");
+               printf("<input type=submit name=\"Rewrite\" value=\"%s\"> &nbsp;&nbsp;",_("Rewrite smb.conf file"));
+               printf("<input type=submit name=\"Commit\" value=\"%s\"> &nbsp;&nbsp;",_("Commit"));
+               printf("<input type=submit name=\"GetWizardParams\" value=\"%s\">", _("Edit Parameter Values"));
+               printf("</center>\n");
+       }
+
+       printf("<hr>");
+       printf("<center><table border=0>");
+       printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Server Type"));
+       printf("<td><input type=radio name=\"ServerType\" value=\"0\" %s> %s&nbsp;</td>", ((role == ROLE_STANDALONE) ? "checked" : ""), _("Stand Alone"));
+       printf("<td><input type=radio name=\"ServerType\" value=\"1\" %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_MEMBER) ? "checked" : ""), _("Domain Member")); 
+       printf("<td><input type=radio name=\"ServerType\" value=\"2\" %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_PDC) ? "checked" : ""), _("Domain Controller"));
+       printf("</tr>\n");
+       if (role == ROLE_DOMAIN_BDC) {
+               printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Unusual Type in smb.conf - Please Select New Mode"));
+       }
+       printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Configure WINS As"));
+       printf("<td><input type=radio name=\"WINSType\" value=\"0\" %s> %s&nbsp;</td>", ((winstype == 0) ? "checked" : ""), _("Not Used"));
+       printf("<td><input type=radio name=\"WINSType\" value=\"1\" %s> %s&nbsp;</td>", ((winstype == 1) ? "checked" : ""), _("Server for client use"));
+       printf("<td><input type=radio name=\"WINSType\" value=\"2\" %s> %s&nbsp;</td>", ((winstype == 2) ? "checked" : ""), _("Client of another WINS server"));
+       printf("</tr>\n");
+       printf("<tr><td></td><td></td><td></td><td>%s&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"", _("Remote WINS Server"));
+
+       /* Print out the list of wins servers */
+       if(lp_wins_server_list()) {
+               int i;
+               const char **wins_servers = lp_wins_server_list();
+               for(i = 0; wins_servers[i]; i++) printf("%s ", wins_servers[i]);
+       }
+       
+       printf("\"></td></tr>\n");
+       if (winstype == 3) {
+               printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Error: WINS Server Mode and WINS Support both set in smb.conf"));
+               printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Please Select desired WINS mode above."));
+       }
+       printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Expose Home Directories"));
+       printf("<td><input type=radio name=\"HomeExpo\" value=\"1\" %s> Yes</td>", (have_home == -1) ? "" : "checked ");
+       printf("<td><input type=radio name=\"HomeExpo\" value=\"0\" %s> No</td>", (have_home == -1 ) ? "checked" : "");
+       printf("<td></td></tr>\n");
+       
+       /* Enable this when we are ready ....
+        * printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Is Print Server"));
+        * printf("<td><input type=radio name=\"PtrSvr\" value=\"1\" %s> Yes</td>");
+        * printf("<td><input type=radio name=\"PtrSvr\" value=\"0\" %s> No</td>");
+        * printf("<td></td></tr>\n");
+        */
        
-       d_printf("<table>\n");
-       show_parameters(GLOBALS_SNUM, 1, advanced, 0);
-       d_printf("</table>\n");
+       printf("</table></center>");
+       printf("<hr>");
+
+       printf("%s\n", _("The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."));
+       printf("</form>\n");
+}
+
+
+/****************************************************************************
+  display a globals editing page  
+****************************************************************************/
+static void globals_page(void)
+{
+       unsigned int parm_filter = FLAG_BASIC;
+       int mode = 0;
+
+       printf("<H2>%s</H2>\n", _("Global Parameters"));
+
+       if (cgi_variable("Commit")) {
+               commit_parameters(GLOBAL_SECTION_SNUM);
+               save_reload(0);
+       }
 
-       if (advanced) {
-               d_printf("<input type=hidden name=\"Advanced\" value=1>\n");
+       if ( cgi_variable("ViewMode") )
+               mode = atoi(cgi_variable_nonull("ViewMode"));
+       if ( cgi_variable("BasicMode"))
+               mode = 0;
+       if ( cgi_variable("AdvMode"))
+               mode = 1;
+
+       printf("<form name=\"swatform\" method=post action=globals>\n");
+
+       ViewModeBoxes( mode );
+       switch ( mode ) {
+               case 0:
+                       parm_filter = FLAG_BASIC;
+                       break;
+               case 1:
+                       parm_filter = FLAG_ADVANCED;
+                       break;
+       }
+       printf("<br>\n");
+       if (have_write_access) {
+               printf("<input type=submit name=\"Commit\" value=\"%s\">\n",
+                       _("Commit Changes"));
        }
 
-       d_printf("</FORM>\n");
+       printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", 
+                _("Reset Values"));
+
+       printf("<p>\n");
+       printf("<table>\n");
+       show_parameters(GLOBAL_SECTION_SNUM, 1, parm_filter, 0);
+       printf("</table>\n");
+       printf("</form>\n");
 }
 
 /****************************************************************************
-  display a shares editing page. share is in unix codepage, and must be in
-  dos codepage. FIXME !!! JRA.
+  display a shares editing page. share is in unix codepage, 
 ****************************************************************************/
 static void shares_page(void)
 {
-       char *share = cgi_variable("share");
+       const char *share = cgi_variable("share");
        char *s;
+       char *utf8_s;
        int snum = -1;
        int i;
-       int advanced = 0;
+       int mode = 0;
+       unsigned int parm_filter = FLAG_BASIC;
 
        if (share)
                snum = lp_servicenumber(share);
 
-       d_printf("<H2>%s</H2>\n", _("Share Parameters"));
-
-       if (cgi_variable("Advanced") && !cgi_variable("Basic"))
-               advanced = 1;
+       printf("<H2>%s</H2>\n", _("Share Parameters"));
 
        if (cgi_variable("Commit") && snum >= 0) {
                commit_parameters(snum);
@@ -618,83 +903,94 @@ static void shares_page(void)
 
        if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
                load_config(False);
-               lp_copy_service(GLOBALS_SNUM, share);
+               lp_copy_service(GLOBAL_SECTION_SNUM, share);
                iNumNonAutoPrintServices = lp_numservices();
                save_reload(0);
                snum = lp_servicenumber(share);
        }
 
-       d_printf("<FORM name=\"swatform\" method=post>\n");
-
-       d_printf("<table>\n");
-       d_printf("<tr>\n");
-       d_printf("<td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Share"));
-       d_printf("<td><select name=share>\n");
+       printf("<FORM name=\"swatform\" method=post>\n");
+
+       printf("<table>\n");
+
+       if ( cgi_variable("ViewMode") )
+               mode = atoi(cgi_variable_nonull("ViewMode"));
+       if ( cgi_variable("BasicMode"))
+               mode = 0;
+       if ( cgi_variable("AdvMode"))
+               mode = 1;
+
+       ViewModeBoxes( mode );
+       switch ( mode ) {
+               case 0:
+                       parm_filter = FLAG_BASIC;
+                       break;
+               case 1:
+                       parm_filter = FLAG_ADVANCED;
+                       break;
+       }
+       printf("<br><tr>\n");
+       printf("<td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Share"));
+       printf("<td><select name=share>\n");
        if (snum < 0)
-               d_printf("<option value=\" \"> \n");
+               printf("<option value=\" \"> \n");
        for (i=0;i<lp_numservices();i++) {
                s = lp_servicename(i);
                if (s && (*s) && strcmp(s,"IPC$") && !lp_print_ok(i)) {
-                       d_printf("<option %s value=\"%s\">%s\n", 
+                       push_utf8_allocate(&utf8_s, s);
+                       printf("<option %s value=\"%s\">%s\n", 
                               (share && strcmp(share,s)==0)?"SELECTED":"",
-                              s, s);
+                              utf8_s, utf8_s);
+                       SAFE_FREE(utf8_s);
+                       
                }
        }
-       d_printf("</select></td>\n");
+       printf("</select></td>\n");
        if (have_write_access) {
-               d_printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Share"));
+               printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Share"));
        }
-       d_printf("</tr>\n");
-       d_printf("</table>");
-       d_printf("<table>");
+       printf("</tr>\n");
+       printf("</table>");
+       printf("<table>");
        if (have_write_access) {
-               d_printf("<tr>\n");
-               d_printf("<td><input type=submit name=createshare value=\"%s\"></td>\n", _("Create Share"));
-               d_printf("<td><input type=text size=30 name=newshare></td></tr>\n");
+               printf("<tr>\n");
+               printf("<td><input type=submit name=createshare value=\"%s\"></td>\n", _("Create Share"));
+               printf("<td><input type=text size=30 name=newshare></td></tr>\n");
        }
-       d_printf("</table>");
+       printf("</table>");
 
 
        if (snum >= 0) {
                if (have_write_access) {
-                       d_printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
+                       printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
                }
 
-               d_printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
-               if (advanced == 0) {
-                       d_printf("<input type=submit name=\"Advanced\" value=\"%s\">\n", _("Advanced View"));
-               } else {
-                       d_printf("<input type=submit name=\"Basic\" value=\"%s\">\n", _("Basic View"));
-               }
-               d_printf("<p>\n");
+               printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
+               printf("<p>\n");
        }
 
        if (snum >= 0) {
-               d_printf("<table>\n");
-               show_parameters(snum, 1, advanced, 0);
-               d_printf("</table>\n");
+               printf("<table>\n");
+               show_parameters(snum, 1, parm_filter, 0);
+               printf("</table>\n");
        }
 
-       if (advanced) {
-               d_printf("<input type=hidden name=\"Advanced\" value=1>\n");
-       }
-
-       d_printf("</FORM>\n");
+       printf("</FORM>\n");
 }
 
 /*************************************************************
 change a password either locally or remotely
 *************************************************************/
-static BOOL change_password(const char *remote_machine, char *user_name, 
-                           char *old_passwd, char *new_passwd, 
+static BOOL change_password(const char *remote_machine, const char *user_name, 
+                           const char *old_passwd, const char *new_passwd, 
                                int local_flags)
 {
-       BOOL ret = False;
+       NTSTATUS ret;
        pstring err_str;
        pstring msg_str;
 
        if (demo_mode) {
-               d_printf("%s<p>", _("password change in demo mode rejected\n"));
+               printf("%s\n<p>", _("password change in demo mode rejected"));
                return False;
        }
        
@@ -702,12 +998,12 @@ static BOOL change_password(const char *remote_machine, char *user_name,
                ret = remote_password_change(remote_machine, user_name, old_passwd, 
                                                                         new_passwd, err_str, sizeof(err_str));
                if(*err_str)
-                       d_printf("%s\n<p>", err_str);
-               return ret;
+                       printf("%s\n<p>", err_str);
+               return NT_STATUS_IS_OK(ret);
        }
 
-       if(!initialize_password_db(True)) {
-               d_printf("Can't setup password database vectors.\n<p>");
+       if(!initialize_password_db(True, NULL)) {
+               printf("%s\n<p>", _("Can't setup password database vectors."));
                return False;
        }
        
@@ -715,11 +1011,11 @@ static BOOL change_password(const char *remote_machine, char *user_name,
                                         msg_str, sizeof(msg_str));
 
        if(*msg_str)
-               d_printf("%s\n<p>", msg_str);
+               printf("%s\n<p>", msg_str);
        if(*err_str)
-               d_printf("%s\n<p>", err_str);
+               printf("%s\n<p>", err_str);
 
-       return ret;
+       return NT_STATUS_IS_OK(ret);
 }
 
 /****************************************************************************
@@ -727,13 +1023,13 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 ****************************************************************************/
 static void chg_passwd(void)
 {
-       char *host;
+       const char *host;
        BOOL rslt;
        int local_flags = 0;
 
        /* Make sure users name has been specified */
-       if (strlen(cgi_variable(SWAT_USER)) == 0) {
-               d_printf("<p>%s", _(" Must specify \"User Name\" \n"));
+       if (strlen(cgi_variable_nonull(SWAT_USER)) == 0) {
+               printf("<p>%s\n", _(" Must specify \"User Name\" "));
                return;
        }
 
@@ -747,28 +1043,28 @@ static void chg_passwd(void)
                 * If current user is not root, make sure old password has been specified 
                 * If REMOTE change, even root must provide old password 
                 */
-               if (((!am_root()) && (strlen( cgi_variable(OLD_PSWD)) <= 0)) ||
-                   ((cgi_variable(CHG_R_PASSWD_FLAG)) &&  (strlen( cgi_variable(OLD_PSWD)) <= 0))) {
-                       d_printf("<p>%s", _(" Must specify \"Old Password\" \n"));
+               if (((!am_root()) && (strlen( cgi_variable_nonull(OLD_PSWD)) <= 0)) ||
+                   ((cgi_variable(CHG_R_PASSWD_FLAG)) &&  (strlen( cgi_variable_nonull(OLD_PSWD)) <= 0))) {
+                       printf("<p>%s\n", _(" Must specify \"Old Password\" "));
                        return;
                }
 
                /* If changing a users password on a remote hosts we have to know what host */
-               if ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable(RHOST)) <= 0)) {
-                       d_printf("<p>%s", _(" Must specify \"Remote Machine\" \n"));
+               if ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable_nonull(RHOST)) <= 0)) {
+                       printf("<p>%s\n", _(" Must specify \"Remote Machine\" "));
                        return;
                }
 
                /* Make sure new passwords have been specified */
-               if ((strlen( cgi_variable(NEW_PSWD)) <= 0) ||
-                   (strlen( cgi_variable(NEW2_PSWD)) <= 0)) {
-                       d_printf("<p>%s", _(" Must specify \"New, and Re-typed Passwords\" \n"));
+               if ((strlen( cgi_variable_nonull(NEW_PSWD)) <= 0) ||
+                   (strlen( cgi_variable_nonull(NEW2_PSWD)) <= 0)) {
+                       printf("<p>%s\n", _(" Must specify \"New, and Re-typed Passwords\" "));
                        return;
                }
 
                /* Make sure new passwords was typed correctly twice */
-               if (strcmp(cgi_variable(NEW_PSWD), cgi_variable(NEW2_PSWD)) != 0) {
-                       d_printf("<p>%s", _(" Re-typed password didn't match new password\n"));
+               if (strcmp(cgi_variable_nonull(NEW_PSWD), cgi_variable_nonull(NEW2_PSWD)) != 0) {
+                       printf("<p>%s\n", _(" Re-typed password didn't match new password "));
                        return;
                }
        }
@@ -786,21 +1082,26 @@ static void chg_passwd(void)
         */
 
        local_flags |= (cgi_variable(ADD_USER_FLAG) ? LOCAL_ADD_USER : 0);
+       local_flags |= (cgi_variable(ADD_USER_FLAG) ?  LOCAL_SET_PASSWORD : 0);
+       local_flags |= (cgi_variable(CHG_S_PASSWD_FLAG) ? LOCAL_SET_PASSWORD : 0);
        local_flags |= (cgi_variable(DELETE_USER_FLAG) ? LOCAL_DELETE_USER : 0);
        local_flags |= (cgi_variable(ENABLE_USER_FLAG) ? LOCAL_ENABLE_USER : 0);
        local_flags |= (cgi_variable(DISABLE_USER_FLAG) ? LOCAL_DISABLE_USER : 0);
+       
 
        rslt = change_password(host,
-                              cgi_variable(SWAT_USER),
-                              cgi_variable(OLD_PSWD), cgi_variable(NEW_PSWD),
+                              cgi_variable_nonull(SWAT_USER),
+                              cgi_variable_nonull(OLD_PSWD), cgi_variable_nonull(NEW_PSWD),
                                   local_flags);
 
-       if(local_flags == 0) {
-               d_printf("<p>");
+       if(cgi_variable(CHG_S_PASSWD_FLAG)) {
+               printf("<p>");
                if (rslt == True) {
-                       d_printf(_(" The passwd for '%s' has been changed. \n"), cgi_variable(SWAT_USER));
+                       printf(_(" The passwd for '%s' has been changed."), cgi_variable_nonull(SWAT_USER));
+                       printf("\n");
                } else {
-                       d_printf(_(" The passwd for '%s' has NOT been changed. \n"), cgi_variable(SWAT_USER));
+                       printf(_(" The passwd for '%s' has NOT been changed."), cgi_variable_nonull(SWAT_USER));
+                       printf("\n");
                }
        }
        
@@ -812,55 +1113,55 @@ static void chg_passwd(void)
 ****************************************************************************/
 static void passwd_page(void)
 {
-       char *new_name = cgi_user_name();
+       const char *new_name = cgi_user_name();
 
        /* 
         * After the first time through here be nice. If the user
         * changed the User box text to another users name, remember it.
         */
        if (cgi_variable(SWAT_USER)) {
-               new_name = cgi_variable(SWAT_USER);
+               new_name = cgi_variable_nonull(SWAT_USER);
        } 
 
        if (!new_name) new_name = "";
 
-       d_printf("<H2>%s</H2>\n", _("Server Password Management"));
+       printf("<H2>%s</H2>\n", _("Server Password Management"));
 
-       d_printf("<FORM name=\"swatform\" method=post>\n");
+       printf("<FORM name=\"swatform\" method=post>\n");
 
-       d_printf("<table>\n");
+       printf("<table>\n");
 
        /* 
         * Create all the dialog boxes for data collection
         */
-       d_printf("<tr><td>%s</td>\n", _(" User Name : "));
-       d_printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", SWAT_USER, new_name);
+       printf("<tr><td> %s : </td>\n", _("User Name"));
+       printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", SWAT_USER, new_name);
        if (!am_root()) {
-               d_printf("<tr><td>%s</td>\n", _(" Old Password : "));
-               d_printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
+               printf("<tr><td> %s : </td>\n", _("Old Password"));
+               printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
        }
-       d_printf("<tr><td>%s</td>\n", _(" New Password : "));
-       d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
-       d_printf("<tr><td>%s</td>\n", _(" Re-type New Password : "));
-       d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
-       d_printf("</table>\n");
+       printf("<tr><td> %s : </td>\n", _("New Password"));
+       printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
+       printf("<tr><td> %s : </td>\n", _("Re-type New Password"));
+       printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
+       printf("</table>\n");
 
        /*
         * Create all the control buttons for requesting action
         */
-       d_printf("<input type=submit name=%s value=\"%s\">\n", 
+       printf("<input type=submit name=%s value=\"%s\">\n", 
               CHG_S_PASSWD_FLAG, _("Change Password"));
        if (demo_mode || am_root()) {
-               d_printf("<input type=submit name=%s value=\"%s\">\n",
+               printf("<input type=submit name=%s value=\"%s\">\n",
                       ADD_USER_FLAG, _("Add New User"));
-               d_printf("<input type=submit name=%s value=\"%s\">\n",
+               printf("<input type=submit name=%s value=\"%s\">\n",
                       DELETE_USER_FLAG, _("Delete User"));
-               d_printf("<input type=submit name=%s value=\"%s\">\n", 
+               printf("<input type=submit name=%s value=\"%s\">\n", 
                       DISABLE_USER_FLAG, _("Disable User"));
-               d_printf("<input type=submit name=%s value=\"%s\">\n", 
+               printf("<input type=submit name=%s value=\"%s\">\n", 
                       ENABLE_USER_FLAG, _("Enable User"));
        }
-       d_printf("<p></FORM>\n");
+       printf("<p></FORM>\n");
 
        /*
         * Do some work if change, add, disable or enable was
@@ -871,35 +1172,35 @@ static void passwd_page(void)
                chg_passwd();           
        }
 
-       d_printf("<H2>%s</H2>\n", _("Client/Server Password Management"));
+       printf("<H2>%s</H2>\n", _("Client/Server Password Management"));
 
-       d_printf("<FORM name=\"swatform\" method=post>\n");
+       printf("<FORM name=\"swatform\" method=post>\n");
 
-       d_printf("<table>\n");
+       printf("<table>\n");
 
        /* 
         * Create all the dialog boxes for data collection
         */
-       d_printf("<tr><td>%s</td>\n", _(" User Name : "));
-       d_printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",SWAT_USER, new_name);
-       d_printf("<tr><td>%s</td>\n", _(" Old Password : "));
-       d_printf("<td><input type=password size=30 name=%s></td></tr>\n",OLD_PSWD);
-       d_printf("<tr><td>%s</td>\n", _(" New Password : "));
-       d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
-       d_printf("<tr><td>%s</td>\n", _(" Re-type New Password : "));
-       d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
-       d_printf("<tr><td>%s</td>\n", _(" Remote Machine : "));
-       d_printf("<td><input type=text size=30 name=%s></td></tr>\n",RHOST);
-
-       d_printf("</table>");
+       printf("<tr><td> %s : </td>\n", _("User Name"));
+       printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",SWAT_USER, new_name);
+       printf("<tr><td> %s : </td>\n", _("Old Password"));
+       printf("<td><input type=password size=30 name=%s></td></tr>\n",OLD_PSWD);
+       printf("<tr><td> %s : </td>\n", _("New Password"));
+       printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
+       printf("<tr><td> %s : </td>\n", _("Re-type New Password"));
+       printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
+       printf("<tr><td> %s : </td>\n", _("Remote Machine"));
+       printf("<td><input type=text size=30 name=%s></td></tr>\n",RHOST);
+
+       printf("</table>");
 
        /*
         * Create all the control buttons for requesting action
         */
-       d_printf("<input type=submit name=%s value=\"%s\">", 
+       printf("<input type=submit name=%s value=\"%s\">", 
               CHG_R_PASSWD_FLAG, _("Change Password"));
 
-       d_printf("<p></FORM>\n");
+       printf("<p></FORM>\n");
 
        /*
         * Do some work if a request has been made to change the
@@ -917,25 +1218,23 @@ static void passwd_page(void)
 ****************************************************************************/
 static void printers_page(void)
 {
-       char *share = cgi_variable("share");
+       const char *share = cgi_variable("share");
        char *s;
        int snum=-1;
        int i;
-       int advanced = 0;
+       int mode = 0;
+       unsigned int parm_filter = FLAG_BASIC;
 
        if (share)
                snum = lp_servicenumber(share);
 
-        d_printf("<H2>%s</H2>\n", _("Printer Parameters"));
+        printf("<H2>%s</H2>\n", _("Printer Parameters"));
  
-        d_printf("<H3>%s</H3>\n", _("Important Note:"));
-        d_printf(_("Printer names marked with [*] in the Choose Printer drop-down box "));
-        d_printf(_("are autoloaded printers from "));
-        d_printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
-        d_printf(_("Attempting to delete these printers from SWAT will have no effect.\n"));
-
-       if (cgi_variable("Advanced") && !cgi_variable("Basic"))
-               advanced = 1;
+        printf("<H3>%s</H3>\n", _("Important Note:"));
+        printf(_("Printer names marked with [*] in the Choose Printer drop-down box "));
+        printf(_("are autoloaded printers from "));
+        printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
+        printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
 
        if (cgi_variable("Commit") && snum >= 0) {
                commit_parameters(snum);
@@ -954,7 +1253,7 @@ static void printers_page(void)
 
        if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
                load_config(False);
-               lp_copy_service(GLOBALS_SNUM, share);
+               lp_copy_service(GLOBAL_SECTION_SNUM, share);
                iNumNonAutoPrintServices = lp_numservices();
                snum = lp_servicenumber(share);
                lp_do_parameter(snum, "print ok", "Yes");
@@ -962,65 +1261,71 @@ static void printers_page(void)
                snum = lp_servicenumber(share);
        }
 
-       d_printf("<FORM name=\"swatform\" method=post>\n");
-
-       d_printf("<table>\n");
-       d_printf("<tr><td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Printer"));
-       d_printf("<td><select name=share>\n");
+       printf("<FORM name=\"swatform\" method=post>\n");
+
+       if ( cgi_variable("ViewMode") )
+               mode = atoi(cgi_variable_nonull("ViewMode"));
+        if ( cgi_variable("BasicMode"))
+                mode = 0;
+        if ( cgi_variable("AdvMode"))
+                mode = 1;
+
+       ViewModeBoxes( mode );
+       switch ( mode ) {
+               case 0:
+                       parm_filter = FLAG_BASIC;
+                       break;
+               case 1:
+                       parm_filter = FLAG_ADVANCED;
+                       break;
+       }
+       printf("<table>\n");
+       printf("<tr><td><input type=submit name=\"selectshare\" value=\"%s\"></td>\n", _("Choose Printer"));
+       printf("<td><select name=\"share\">\n");
        if (snum < 0 || !lp_print_ok(snum))
-               d_printf("<option value=\" \"> \n");
+               printf("<option value=\" \"> \n");
        for (i=0;i<lp_numservices();i++) {
                s = lp_servicename(i);
                if (s && (*s) && strcmp(s,"IPC$") && lp_print_ok(i)) {
                     if (i >= iNumNonAutoPrintServices)
-                        d_printf("<option %s value=\"%s\">[*]%s\n",
+                        printf("<option %s value=\"%s\">[*]%s\n",
                                (share && strcmp(share,s)==0)?"SELECTED":"",
                                s, s);
                     else
-                       d_printf("<option %s value=\"%s\">%s\n", 
+                       printf("<option %s value=\"%s\">%s\n", 
                               (share && strcmp(share,s)==0)?"SELECTED":"",
                               s, s);
                }
        }
-       d_printf("</select></td>");
+       printf("</select></td>");
        if (have_write_access) {
-               d_printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Printer"));
+               printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Printer"));
        }
-       d_printf("</tr>");
-       d_printf("</table>\n");
+       printf("</tr>");
+       printf("</table>\n");
 
        if (have_write_access) {
-               d_printf("<table>\n");
-               d_printf("<tr><td><input type=submit name=createshare value=\"%s\"></td>\n", _("Create Printer"));
-               d_printf("<td><input type=text size=30 name=newshare></td></tr>\n");
-               d_printf("</table>");
+               printf("<table>\n");
+               printf("<tr><td><input type=submit name=\"createshare\" value=\"%s\"></td>\n", _("Create Printer"));
+               printf("<td><input type=text size=30 name=\"newshare\"></td></tr>\n");
+               printf("</table>");
        }
 
 
        if (snum >= 0) {
                if (have_write_access) {
-                       d_printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
+                       printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
                }
-               d_printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
-               if (advanced == 0) {
-                       d_printf("<input type=submit name=\"Advanced\" value=\"%s\">\n", _("Advanced View"));
-               } else {
-                       d_printf("<input type=submit name=\"Basic\" value=\"%s\">\n", _("Basic View"));
-               }
-               d_printf("<p>\n");
+               printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
+               printf("<p>\n");
        }
 
        if (snum >= 0) {
-               d_printf("<table>\n");
-               show_parameters(snum, 1, advanced, 1);
-               d_printf("</table>\n");
-       }
-
-       if (advanced) {
-               d_printf("<input type=hidden name=\"Advanced\" value=1>\n");
+               printf("<table>\n");
+               show_parameters(snum, 1, parm_filter, 1);
+               printf("</table>\n");
        }
-
-       d_printf("</FORM>\n");
+       printf("</FORM>\n");
 }
 
 
@@ -1029,10 +1334,15 @@ static void printers_page(void)
  **/
  int main(int argc, char *argv[])
 {
-       extern char *optarg;
-       extern int optind;
-       int opt;
-       char *page;
+       const char *page;
+       poptContext pc;
+       struct poptOption long_options[] = {
+               POPT_AUTOHELP
+               { "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, True, "Disable authentication (demo mode)" },
+               { "password-menu-only", 'P', POPT_ARG_VAL, &passwd_only, True, "Show only change password menu" }, 
+               POPT_COMMON_SAMBA
+               POPT_TABLEEND
+       };
 
        fault_setup(NULL);
        umask(S_IWGRP | S_IWOTH);
@@ -1056,19 +1366,19 @@ static void printers_page(void)
        close(2);
        open("/dev/null", O_WRONLY);
 
-       while ((opt = getopt(argc, argv,"s:a")) != EOF) {
-               switch (opt) {
-               case 's':
-                       pstrcpy(dyn_CONFIGFILE,optarg);
-                       break;    
-               case 'a':
-                       demo_mode = True;
-                       break;    
-               }
-       }
+       pc = poptGetContext("swat", argc, (const char **) argv, long_options, 0);
+
+       /* Parse command line options */
+
+       while(poptGetNextOpt(pc) != -1) { }
+
+       poptFreeContext(pc);
+
+       load_case_tables();
 
        setup_logging(argv[0],False);
        load_config(True);
+       load_interfaces();
        iNumNonAutoPrintServices = lp_numservices();
        load_printers();
 
@@ -1108,6 +1418,12 @@ static void printers_page(void)
                viewconfig_page();
        } else if (strcmp(page,"passwd")==0) {
                passwd_page();
+       } else if (have_read_access && strcmp(page,"wizard")==0) {
+               wizard_page();
+       } else if (have_read_access && strcmp(page,"wizard_params")==0) {
+               wizard_params_page();
+       } else if (have_read_access && strcmp(page,"rewritecfg")==0) {
+               rewritecfg_file();
        } else {
                welcome_page();
        }