summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-09-29 06:20:11 +0000
committerTim Potter <tpot@samba.org>2003-09-29 06:20:11 +0000
commit4663c471a35079cdea8b97559c02f865ec6dffd8 (patch)
treee0e47e55b983e9215133aa3d672d54b96c3e5f20
parenta21e1f781f0bbf783cda6237fa4103deb8a43474 (diff)
downloadsamba-4663c471a35079cdea8b97559c02f865ec6dffd8.tar.gz
samba-4663c471a35079cdea8b97559c02f865ec6dffd8.tar.bz2
samba-4663c471a35079cdea8b97559c02f865ec6dffd8.zip
Merge from 3.0:
>More bug #413. Fix bad html table row termination in SWAT wizard code found by >Monyo. Also remove debugging d_printf() which snuck in the last commit. >Change title of SWAT globals page from 'Global Variables' to 'Global >Parameters' to be more consistent with the other pages. (This used to be commit 1ab70b41a9eba59272c0af5a8036c32366734177)
-rw-r--r--source3/web/swat.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 1c892559dd..2b2686cc5a 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -737,8 +737,10 @@ static void wizard_page(void)
d_printf("<td><input type=radio name=\"WINSType\" value=0 %s> Not Used&nbsp;</td>", (winstype == 0) ? "checked" : "");
d_printf("<td><input type=radio name=\"WINSType\" value=1 %s> Server for client use&nbsp;</td>", (winstype == 1) ? "checked" : "");
d_printf("<td><input type=radio name=\"WINSType\" value=2 %s> Client of another WINS server&nbsp;</td>", (winstype == 2) ? "checked" : "");
+ d_printf("</tr>\n");
+
d_printf("<tr><td></td><td></td><td></td><td>Remote WINS Server&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"");
-
+
/* Print out the list of wins servers */
if(lp_wins_server_list()) {
int i;
@@ -751,7 +753,6 @@ static void wizard_page(void)
d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Error: WINS Server Mode and WINS Support both set in smb.conf</font></td></tr>");
d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Please Select desired WINS mode above.</font></td></tr>");
}
- d_printf("</tr>");
d_printf("<tr><td><b>%s</b></td>\n","Expose Home Directories:&nbsp;");
d_printf("<td><input type=radio name=\"HomeExpo\" value=1 %s> Yes</td>", (have_home == -1) ? "" : "checked ");
d_printf("<td><input type=radio name=\"HomeExpo\" value=0 %s> No</td>", (have_home == -1 ) ? "checked" : "");
@@ -780,7 +781,7 @@ static void globals_page(void)
unsigned int parm_filter = FLAG_BASIC;
int mode = 0;
- d_printf("<H2>%s</H2>\n", _("Global Variables"));
+ d_printf("<H2>%s</H2>\n", _("Global Parameters"));
if (cgi_variable("Commit")) {
commit_parameters(GLOBAL_SECTION_SNUM);