sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

- Update 'preload modules' documention (bug #304)

Browse Source 
- Fix WINS Server List in SWAT (bug #197)
- Don't segfault SWAT when adding shares (bug #254)
This commit is contained in:
Jelmer Vernooij -
parent f98f937ec9
commit dd43a29504
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/docbook/smbdotconf/security/preloadmodules.xml
View File

@ -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>

3
source/param/loadparm.c
View File

@ -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));
}
}

11
source/web/swat.c
View File

@ -737,7 +737,16 @@ 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><td></td><td></td><td></td><td>Remote WINS Server&nbsp;<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&nbsp;<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>");