diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-12-24 16:04:20 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-01-24 16:19:00 -0800 |
| commit | 13a6310f827797bc1619b7740ef64928f4fa17d4 (patch) | |
| tree | 07f3b79795a3ebe986811a6d0880ccd9ce8c577d | |
| parent | aaa8e438f253bf2b3286a79cfd091d5375e259d8 (diff) | |
| download | samba-13a6310f827797bc1619b7740ef64928f4fa17d4.tar.gz samba-13a6310f827797bc1619b7740ef64928f4fa17d4.tar.xz samba-13a6310f827797bc1619b7740ef64928f4fa17d4.zip | |
param: Rename variable used for lp_usershare_max_shares iUsershareMaxShares
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 01fd4061aa..e3ffc78eb7 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -340,7 +340,7 @@ FN_GLOBAL_INTEGER(srv_minprotocol, srv_minprotocol) FN_GLOBAL_INTEGER(syslog, syslog) FN_GLOBAL_INTEGER(usernamelevel, usernamelevel) FN_GLOBAL_INTEGER(username_map_cache_time, username_map_cache_time) -FN_GLOBAL_INTEGER(usershare_max_shares, iUsershareMaxShares) +FN_GLOBAL_INTEGER(usershare_max_shares, usershare_max_shares) FN_GLOBAL_INTEGER(web_port, web_port) FN_GLOBAL_INTEGER(winbind_cache_time, winbind_cache_time) FN_GLOBAL_INTEGER(winbind_expand_groups, winbind_expand_groups) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 5bc87b53a8..73504fc19a 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -3652,7 +3652,7 @@ static struct parm_struct parm_table[] = { .label = "usershare max shares", .type = P_INTEGER, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(iUsershareMaxShares), + .offset = GLOBAL_VAR(usershare_max_shares), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index eaf8266b4b..aa7208ced9 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1017,7 +1017,7 @@ static void init_globals(bool reinit_globals) string_set(&Globals.szUsersharePath, s); SAFE_FREE(s); string_set(&Globals.szUsershareTemplateShare, ""); - Globals.iUsershareMaxShares = 0; + Globals.usershare_max_shares = 0; /* By default disallow sharing of directories not owned by the sharer. */ Globals.usershare_owner_only = true; /* By default disallow guest access to usershares. */ @@ -4525,7 +4525,7 @@ int load_usershare_service(const char *servicename) { SMB_STRUCT_STAT sbuf; const char *usersharepath = Globals.szUsersharePath; - int max_user_shares = Globals.iUsershareMaxShares; + int max_user_shares = Globals.usershare_max_shares; int snum_template = -1; if (*usersharepath == 0 || max_user_shares == 0) { @@ -4597,7 +4597,7 @@ int load_usershare_shares(struct smbd_server_connection *sconn, SMB_STRUCT_STAT sbuf; struct dirent *de; int num_usershares = 0; - int max_user_shares = Globals.iUsershareMaxShares; + int max_user_shares = Globals.usershare_max_shares; unsigned int num_dir_entries, num_bad_dir_entries, num_tmp_dir_entries; unsigned int allowed_bad_entries = ((2*max_user_shares)/10); unsigned int allowed_tmp_entries = ((2*max_user_shares)/10); |