[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Sun Feb 9 21:57:04 MST 2014
The branch, master has been updated
via 907f49e lib/param: Mark source code generators as group build_source
via 98e8126 param: rename and move log level from LOADPARM_EXTRA_GLOBALS to param_functions.c
via a416edf param: rename and move usershare template parameter from LOADPARM_EXTRA_GLOBALS to param_functions.c
via bb0b857 docs: insert function name "wins_dns_proxy" into dns proxy parameter
via 372072f docs: insert function name "wins_server_list" into wins server parameter
via 023045f docs: insert function name "_disable_spoolss" into disable spoolss parameter
via b0ccb91 docs: insert function name "logfile" into log file parameter
via 7783514 docs: insert function name "defaultservice" into default service parameter
via 4864ac9 docs: insert function name "auto_services" into preload parameter
via d3b9d77 docs: insert function name "we_are_a_wins_server" into wins support parameter
via ca39dc8 docs: insert function name "timestamp_logs" into debug timestamp parameter
via 6e98b0f s3: increase default fudge factor for max open files from 20 to 40
from 9f2e6f5 s4:samba-tool/testparm: add a warning when acting as an AD-DC and not using UTF-8
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 907f49ef1f599397174858a4e57f9eb91e35593b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Feb 3 16:44:32 2014 +1300
lib/param: Mark source code generators as group build_source
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Mon Feb 10 05:56:58 CET 2014 on sn-devel-104
commit 98e8126b05f69646cfb035e3ebea71b3172c01e9
Author: Garming Sam <garming at catalyst.net.nz>
Date: Fri Jan 10 15:06:41 2014 +1300
param: rename and move log level from LOADPARM_EXTRA_GLOBALS to param_functions.c
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
commit a416edfe3ada6b0541ae3450bcb1916ca5429d43
Author: Garming Sam <garming at catalyst.net.nz>
Date: Fri Jan 10 14:34:43 2014 +1300
param: rename and move usershare template parameter from LOADPARM_EXTRA_GLOBALS to param_functions.c
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
commit bb0b85777b721ae209acc9a9a6f68bb8c7476c74
Author: Garming Sam <garming at catalyst.net.nz>
Date: Thu Jan 9 17:26:14 2014 +1300
docs: insert function name "wins_dns_proxy" into dns proxy parameter
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
commit 372072f1040716cdc36e9e11807fa75f7d532033
Author: Garming Sam <garming at catalyst.net.nz>
Date: Thu Jan 9 17:26:16 2014 +1300
docs: insert function name "wins_server_list" into wins server parameter
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
commit 023045ffaf993e58c7ff0529b17c20e1eb8b4180
Author: Garming Sam <garming at catalyst.net.nz>
Date: Thu Jan 9 17:26:13 2014 +1300
docs: insert function name "_disable_spoolss" into disable spoolss parameter
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
commit b0ccb916029fec0e98c7ee290966e9c0a8867af4
Author: Garming Sam <garming at catalyst.net.nz>
Date: Thu Jan 9 17:26:17 2014 +1300
docs: insert function name "logfile" into log file parameter
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
commit 77835145dfab3b832f4c336bb591b2bf13fc2100
Author: Garming Sam <garming at catalyst.net.nz>
Date: Thu Jan 9 17:26:16 2014 +1300
docs: insert function name "defaultservice" into default service parameter
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
commit 4864ac979c2d7d94ce2880cde4dd68646327759b
Author: Garming Sam <garming at catalyst.net.nz>
Date: Thu Jan 9 17:26:16 2014 +1300
docs: insert function name "auto_services" into preload parameter
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
commit d3b9d77c6f5f661a3d348382f26286b1f148cea3
Author: Garming Sam <garming at catalyst.net.nz>
Date: Thu Jan 9 17:26:14 2014 +1300
docs: insert function name "we_are_a_wins_server" into wins support parameter
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
commit ca39dc8e12a09781b0f8bd92033768e230a1e5f6
Author: Garming Sam <garming at catalyst.net.nz>
Date: Thu Jan 9 17:26:14 2014 +1300
docs: insert function name "timestamp_logs" into debug timestamp parameter
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
commit 6e98b0f9b9808654791061915948071be2abdd98
Author: Garming Sam <garming at catalyst.net.nz>
Date: Mon Jan 6 16:51:58 2014 +1300
s3: increase default fudge factor for max open files from 20 to 40
Tests show that Samba's smbd uses 38 open files at startup.
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/logging/debugtimestamp.xml | 1 +
docs-xml/smbdotconf/logging/logfile.xml | 1 +
docs-xml/smbdotconf/misc/defaultservice.xml | 1 +
docs-xml/smbdotconf/misc/preload.xml | 1 +
docs-xml/smbdotconf/printing/disablespoolss.xml | 1 +
docs-xml/smbdotconf/wins/dnsproxy.xml | 1 +
docs-xml/smbdotconf/wins/winsserver.xml | 1 +
docs-xml/smbdotconf/wins/winssupport.xml | 1 +
lib/param/loadparm.c | 4 +---
lib/param/param_functions.c | 2 ++
lib/param/param_table.c | 6 +++---
lib/param/wscript_build | 3 +++
source3/include/local.h | 2 +-
source3/param/loadparm.c | 18 ++++++++----------
source3/param/wscript_build | 3 +++
15 files changed, 29 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/logging/debugtimestamp.xml b/docs-xml/smbdotconf/logging/debugtimestamp.xml
index b335eba..b50f429 100644
--- a/docs-xml/smbdotconf/logging/debugtimestamp.xml
+++ b/docs-xml/smbdotconf/logging/debugtimestamp.xml
@@ -2,6 +2,7 @@
context="G"
type="boolean"
developer="1"
+ function="timestamp_logs"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>timestamp logs</synonym>
<description>
diff --git a/docs-xml/smbdotconf/logging/logfile.xml b/docs-xml/smbdotconf/logging/logfile.xml
index 838d302..a117454 100644
--- a/docs-xml/smbdotconf/logging/logfile.xml
+++ b/docs-xml/smbdotconf/logging/logfile.xml
@@ -2,6 +2,7 @@
context="G"
type="string"
developer="1" advanced="1"
+ function="logfile"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
diff --git a/docs-xml/smbdotconf/misc/defaultservice.xml b/docs-xml/smbdotconf/misc/defaultservice.xml
index ca986d4..0150163 100644
--- a/docs-xml/smbdotconf/misc/defaultservice.xml
+++ b/docs-xml/smbdotconf/misc/defaultservice.xml
@@ -2,6 +2,7 @@
context="G"
advanced="1" developer="1"
type="string"
+ function="defaultservice"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>default</synonym>
<description>
diff --git a/docs-xml/smbdotconf/misc/preload.xml b/docs-xml/smbdotconf/misc/preload.xml
index 94905a6..54f5999 100644
--- a/docs-xml/smbdotconf/misc/preload.xml
+++ b/docs-xml/smbdotconf/misc/preload.xml
@@ -2,6 +2,7 @@
context="G"
advanced="1" developer="1"
type="string"
+ function="auto_services"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>auto services</synonym>
<description>
diff --git a/docs-xml/smbdotconf/printing/disablespoolss.xml b/docs-xml/smbdotconf/printing/disablespoolss.xml
index 9367eae..883e1a8 100644
--- a/docs-xml/smbdotconf/printing/disablespoolss.xml
+++ b/docs-xml/smbdotconf/printing/disablespoolss.xml
@@ -2,6 +2,7 @@
context="G"
type="boolean"
print="1"
+ function="_disable_spoolss"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Enabling this parameter will disable Samba's support
diff --git a/docs-xml/smbdotconf/wins/dnsproxy.xml b/docs-xml/smbdotconf/wins/dnsproxy.xml
index 018c7d9..b367c44 100644
--- a/docs-xml/smbdotconf/wins/dnsproxy.xml
+++ b/docs-xml/smbdotconf/wins/dnsproxy.xml
@@ -2,6 +2,7 @@
context="G"
type="boolean"
advanced="1" developer="1"
+ function="wins_dns_proxy"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Specifies that <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/docs-xml/smbdotconf/wins/winsserver.xml b/docs-xml/smbdotconf/wins/winsserver.xml
index 2808f19..40e668f 100644
--- a/docs-xml/smbdotconf/wins/winsserver.xml
+++ b/docs-xml/smbdotconf/wins/winsserver.xml
@@ -2,6 +2,7 @@
context="G"
type="list"
basic="1" advanced="1" wizard="1" developer="1"
+ function="wins_server_list"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This specifies the IP address (or DNS name: IP
diff --git a/docs-xml/smbdotconf/wins/winssupport.xml b/docs-xml/smbdotconf/wins/winssupport.xml
index b4f8952..6bc3765 100644
--- a/docs-xml/smbdotconf/wins/winssupport.xml
+++ b/docs-xml/smbdotconf/wins/winssupport.xml
@@ -2,6 +2,7 @@
type="boolean"
context="G"
basic="1" advanced="1" wizard="1" developer="1"
+ function="we_are_a_wins_server"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This boolean controls if the <citerefentry><refentrytitle>nmbd</refentrytitle>
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index f22bb55..d3bd85c 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -84,7 +84,6 @@ static bool defaults_saved = false;
char *szLdapUserSuffix; \
char *szLdapIdmapSuffix; \
char *szLdapGroupSuffix; \
- char *szUsershareTemplateShare; \
char *szIdmapUID; \
char *szIdmapGID; \
char *szIdmapBackend; \
@@ -94,8 +93,7 @@ static bool defaults_saved = false;
char *tls_certfile; \
char *tls_cafile; \
char *tls_crlfile; \
- char *tls_dhpfile; \
- char *loglevel;
+ char *tls_dhpfile;
#include "lib/param/param_global.h"
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 159a7a6..5c94114 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -412,3 +412,5 @@ FN_GLOBAL_STRING(username_map_script, username_map_script)
FN_GLOBAL_STRING(username_map, username_map)
FN_GLOBAL_STRING(usershare_path, usershare_path)
FN_GLOBAL_STRING(wins_hook, wins_hook)
+FN_GLOBAL_STRING(usershare_template_share, usershare_template_share)
+FN_GLOBAL_STRING(log_level, log_level)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 515e94c..09e041b 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1139,7 +1139,7 @@ static struct parm_struct parm_table[] = {
.label = "log level",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(loglevel),
+ .offset = GLOBAL_VAR(log_level),
.special = handle_debug_list,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
@@ -1148,7 +1148,7 @@ static struct parm_struct parm_table[] = {
.label = "debuglevel",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(loglevel),
+ .offset = GLOBAL_VAR(log_level),
.special = handle_debug_list,
.enum_list = NULL,
.flags = FLAG_HIDE,
@@ -3697,7 +3697,7 @@ static struct parm_struct parm_table[] = {
.label = "usershare template share",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(szUsershareTemplateShare),
+ .offset = GLOBAL_VAR(usershare_template_share),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
diff --git a/lib/param/wscript_build b/lib/param/wscript_build
index 0e1a2e0..8674f5f 100644
--- a/lib/param/wscript_build
+++ b/lib/param/wscript_build
@@ -3,18 +3,21 @@
bld.SAMBA_GENERATOR('param_local_h',
source= '../../script/mkparamdefs.pl param_functions.c ',
target='param_local.h',
+ group='build_source',
rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} --file ${TGT} --generate-scope=LOCAL')
bld.SAMBA_GENERATOR('s3_param_h',
source= ' ../../script/mks3param.pl loadparm.c param_functions.c',
target='s3_param.h',
+ group='build_source',
rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT}')
bld.SAMBA_GENERATOR('param_global_h',
source= '../../script/mkparamdefs.pl loadparm.c param_functions.c',
target='param_global.h',
+ group='build_source',
rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
bld.SAMBA_LIBRARY('server-role',
diff --git a/source3/include/local.h b/source3/include/local.h
index c494d90..d72c084 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -27,7 +27,7 @@
*/
#ifndef MAX_OPEN_FUDGEFACTOR
-#define MAX_OPEN_FUDGEFACTOR 20
+#define MAX_OPEN_FUDGEFACTOR 40
#endif
/*
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d332154..cf37348 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -111,7 +111,6 @@ static bool defaults_saved = false;
#define LOADPARM_EXTRA_GLOBALS \
struct parmlist_entry *param_opt; \
char *realm_original; \
- char *loglevel; \
int iminreceivefile; \
char *szPrintcapname; \
int CupsEncrypt; \
@@ -122,7 +121,6 @@ static bool defaults_saved = false;
char *szLdapGroupSuffix; \
char *szStateDir; \
char *szCacheDir; \
- char *szUsershareTemplateShare; \
char *szIdmapUID; \
char *szIdmapGID; \
char *szIdmapBackend; \
@@ -836,7 +834,7 @@ static void init_globals(bool reinit_globals)
Globals.syslog = 1;
Globals.syslog_only = false;
Globals.timestamp_logs = true;
- string_set(&Globals.loglevel, "0");
+ string_set(&Globals.log_level, "0");
Globals.debug_prefix_timestamp = false;
Globals.debug_hires_timestamp = true;
Globals.debug_pid = false;
@@ -1010,7 +1008,7 @@ static void init_globals(bool reinit_globals)
}
string_set(&Globals.usershare_path, s);
SAFE_FREE(s);
- string_set(&Globals.szUsershareTemplateShare, "");
+ string_set(&Globals.usershare_template_share, "");
Globals.usershare_max_shares = 0;
/* By default disallow sharing of directories not owned by the sharer. */
Globals.usershare_owner_only = true;
@@ -4370,13 +4368,13 @@ int load_usershare_service(const char *servicename)
}
/* Ensure the template share exists if it's set. */
- if (Globals.szUsershareTemplateShare[0]) {
+ if (Globals.usershare_template_share[0]) {
/* We can't use lp_servicenumber here as we are recommending that
template shares have -valid=false set. */
for (snum_template = iNumServices - 1; snum_template >= 0; snum_template--) {
if (ServicePtrs[snum_template]->szService &&
strequal(ServicePtrs[snum_template]->szService,
- Globals.szUsershareTemplateShare)) {
+ Globals.usershare_template_share)) {
break;
}
}
@@ -4384,7 +4382,7 @@ int load_usershare_service(const char *servicename)
if (snum_template == -1) {
DEBUG(0,("load_usershare_service: usershare template share %s "
"does not exist.\n",
- Globals.szUsershareTemplateShare ));
+ Globals.usershare_template_share ));
return -1;
}
}
@@ -4443,13 +4441,13 @@ int load_usershare_shares(struct smbd_server_connection *sconn,
}
/* Ensure the template share exists if it's set. */
- if (Globals.szUsershareTemplateShare[0]) {
+ if (Globals.usershare_template_share[0]) {
/* We can't use lp_servicenumber here as we are recommending that
template shares have -valid=false set. */
for (snum_template = iNumServices - 1; snum_template >= 0; snum_template--) {
if (ServicePtrs[snum_template]->szService &&
strequal(ServicePtrs[snum_template]->szService,
- Globals.szUsershareTemplateShare)) {
+ Globals.usershare_template_share)) {
break;
}
}
@@ -4457,7 +4455,7 @@ int load_usershare_shares(struct smbd_server_connection *sconn,
if (snum_template == -1) {
DEBUG(0,("load_usershare_shares: usershare template share %s "
"does not exist.\n",
- Globals.szUsershareTemplateShare ));
+ Globals.usershare_template_share ));
return ret;
}
}
diff --git a/source3/param/wscript_build b/source3/param/wscript_build
index 673cb4d..420dc45 100644
--- a/source3/param/wscript_build
+++ b/source3/param/wscript_build
@@ -11,16 +11,19 @@ bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX',
bld.SAMBA_GENERATOR('s3_param_global_h',
source= '../../script/mkparamdefs.pl loadparm.c ../../lib/param/param_functions.c',
target='param_global.h',
+ group='build_source',
rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
bld.SAMBA_GENERATOR('s3_param_proto_h',
source= '../../script/mks3param_proto.pl loadparm.c ../../lib/param/param_functions.c',
target='param_proto.h',
+ group='build_source',
rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT}')
bld.SAMBA_GENERATOR('s3_loadparm_ctx_table_c',
source= ' ../../script/mks3param_ctx_table.pl ../../lib/param/loadparm.c ../../lib/param/param_functions.c',
target='loadparm_ctx_table.c',
+ group='build_source',
rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT}')
bld.SAMBA3_PYTHON('pys3param',
--
Samba Shared Repository
More information about the samba-cvs
mailing list