diff options
| author | Gerald Carter <jerry@samba.org> | 2003-09-09 04:07:32 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-09-09 04:07:32 +0000 |
| commit | 4093bf7ff8c8861cf7b941945ede53a8ec5bb6c8 (patch) | |
| tree | dd0a9f32d9933e1f75d919b5083e007d7453f9c4 /source3/web | |
| parent | 3d7cb49747a9a7f5cdec0ee05c6270ec3604202f (diff) | |
| download | samba-4093bf7ff8c8861cf7b941945ede53a8ec5bb6c8.tar.gz samba-4093bf7ff8c8861cf7b941945ede53a8ec5bb6c8.tar.bz2 samba-4093bf7ff8c8861cf7b941945ede53a8ec5bb6c8.zip | |
sync 3.0 into HEAD for the last time
(This used to be commit c17a7dc9a190156a069da3e861c18fd3f81224ad)
Diffstat (limited to 'source3/web')
| -rw-r--r-- | source3/web/statuspage.c | 2 | ||||
| -rw-r--r-- | source3/web/swat.c | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c index c579e8f112..21d7e45738 100644 --- a/source3/web/statuspage.c +++ b/source3/web/statuspage.c @@ -327,7 +327,7 @@ void status_page(void) d_printf("<table>\n"); - d_printf("<tr><td>%s</td><td>%s</td></tr>", _("version:"), VERSION); + d_printf("<tr><td>%s</td><td>%s</td></tr>", _("version:"), SAMBA_VERSION_STRING); fflush(stdout); d_printf("<tr><td>%s</td><td>%s</td>\n", _("smbd:"), smbd_running()?_("running"):_("not running")); diff --git a/source3/web/swat.c b/source3/web/swat.c index a1c132a088..1c892559dd 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -737,7 +737,16 @@ static void wizard_page(void) d_printf("<td><input type=radio name=\"WINSType\" value=0 %s> Not Used </td>", (winstype == 0) ? "checked" : ""); d_printf("<td><input type=radio name=\"WINSType\" value=1 %s> Server for client use </td>", (winstype == 1) ? "checked" : ""); d_printf("<td><input type=radio name=\"WINSType\" value=2 %s> Client of another WINS server </td>", (winstype == 2) ? "checked" : ""); - d_printf("<tr><td></td><td></td><td></td><td>Remote WINS Server <input type=text size=\"16\" name=\"WINSAddr\" value=\"%s\"></td></tr>",lp_wins_server_list()); + d_printf("<tr><td></td><td></td><td></td><td>Remote WINS Server <input type=text size=\"16\" name=\"WINSAddr\" value=\""); + + /* 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++) d_printf("%s ", wins_servers[i]); + } + + d_printf("\"></td></tr>"); if (winstype == 3) { 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>"); |