diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2003-08-19 15:18:27 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2003-08-19 15:18:27 +0000 |
| commit | f3404f3e4acb004281f1609a0088c1eb16e6ba94 (patch) | |
| tree | 25e87a16d8c2ab16ce96065028f65bbe194ffc2e | |
| parent | 506330d72e9cdf3d3b4c40964a54c8c23833b6cf (diff) | |
| download | samba-f3404f3e4acb004281f1609a0088c1eb16e6ba94.tar.gz samba-f3404f3e4acb004281f1609a0088c1eb16e6ba94.tar.bz2 samba-f3404f3e4acb004281f1609a0088c1eb16e6ba94.zip | |
- Update 'preload modules' documention (bug #304)
- Fix WINS Server List in SWAT (bug #197)
- Don't segfault SWAT when adding shares (bug #254)
(This used to be commit dd43a29504fe2b6f9d13cdb9431347927548fc10)
| -rw-r--r-- | docs/docbook/smbdotconf/security/preloadmodules.xml | 3 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 3 | ||||
| -rw-r--r-- | source3/web/swat.c | 11 |
3 files changed, 11 insertions, 6 deletions
diff --git a/docs/docbook/smbdotconf/security/preloadmodules.xml b/docs/docbook/smbdotconf/security/preloadmodules.xml index 7b4e57cff1..101d9606fa 100644 --- a/docs/docbook/smbdotconf/security/preloadmodules.xml +++ b/docs/docbook/smbdotconf/security/preloadmodules.xml @@ -7,9 +7,6 @@ be loaded into smbd before a client connects. This improves the speed of smbd when reacting to new connections somewhat. </para> - <para>It is recommended to only use this option on heavy-performance - servers.</para> - <para>Default: <command>preload modules = </command></para> <para>Example: <command>preload modules = /usr/lib/samba/passdb/mysql.so+++ </command></para> diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 7982b87ffc..4a2fffc757 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -4163,12 +4163,11 @@ void lp_remove_service(int snum) void lp_copy_service(int snum, const char *new_name) { - char *oldname = lp_servicename(snum); do_section(new_name); if (snum >= 0) { snum = lp_servicenumber(new_name); if (snum >= 0) - lp_do_parameter(snum, "copy", oldname); + lp_do_parameter(snum, "copy", lp_servicename(snum)); } } 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>"); |