diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-01-16 13:32:42 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-12 13:17:14 +1300 |
| commit | 6e954a560521a459ef4a72faeca39b16ca0fed36 (patch) | |
| tree | 5cfd080c5b6da137e0f575d8651cf36f8f3bc0ab /lib/param | |
| parent | 89ff7b0d851a971a8bdca7f9ff2200db61be4e03 (diff) | |
| download | samba-6e954a560521a459ef4a72faeca39b16ca0fed36.tar.gz samba-6e954a560521a459ef4a72faeca39b16ca0fed36.tar.xz samba-6e954a560521a459ef4a72faeca39b16ca0fed36.zip | |
param: move SMB2 defaults to lib/param and use in loadparm_init
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'lib/param')
| -rw-r--r-- | lib/param/loadparm.c | 8 | ||||
| -rw-r--r-- | lib/param/loadparm.h | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 9795614affd..038f5dc2850 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -2206,7 +2206,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter(lp_ctx, "enable privileges", "True"); - lpcfg_do_global_parameter(lp_ctx, "smb2 max write", "1048576"); + lpcfg_do_global_parameter_var(lp_ctx, "smb2 max write", "%u", DEFAULT_SMB2_MAX_WRITE); lpcfg_do_global_parameter(lp_ctx, "passdb backend", "tdbsam"); @@ -2216,7 +2216,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter(lp_ctx, "mangled names", "True"); - lpcfg_do_global_parameter(lp_ctx, "smb2 max credits", "8192"); + lpcfg_do_global_parameter_var(lp_ctx, "smb2 max credits", "%u", DEFAULT_SMB2_MAX_CREDITS); lpcfg_do_global_parameter(lp_ctx, "ldap ssl", "start tls"); @@ -2304,9 +2304,9 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter(lp_ctx, "lpq cache time", "30"); - lpcfg_do_global_parameter(lp_ctx, "smb2 max trans", "1048576"); + lpcfg_do_global_parameter_var(lp_ctx, "smb2 max trans", "%u", DEFAULT_SMB2_MAX_TRANSACT); - lpcfg_do_global_parameter(lp_ctx, "smb2 max read", "1048576"); + lpcfg_do_global_parameter_var(lp_ctx, "smb2 max read", "%u", DEFAULT_SMB2_MAX_READ); lpcfg_do_global_parameter(lp_ctx, "durable handles", "yes"); diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index fffdee23b78..56ffec524db 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -208,6 +208,12 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; #define GUEST_ACCOUNT "nobody" #endif +/* SMB2 defaults */ +#define DEFAULT_SMB2_MAX_READ (1024*1024) +#define DEFAULT_SMB2_MAX_WRITE (1024*1024) +#define DEFAULT_SMB2_MAX_TRANSACT (1024*1024) +#define DEFAULT_SMB2_MAX_CREDITS 8192 + #define LOADPARM_EXTRA_LOCALS \ bool valid; \ int usershare; \ |