diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:11 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:16 -0800 |
| commit | 7cdcf131e8da6d750d103ded2fee009fe84d07fb (patch) | |
| tree | 99af57fcf8ccfab66ae4a28ed9caaaddc15d337e | |
| parent | 73bac10cae03494bc046e1cd3b7cb9ce82121480 (diff) | |
| download | samba-7cdcf131e8da6d750d103ded2fee009fe84d07fb.tar.gz samba-7cdcf131e8da6d750d103ded2fee009fe84d07fb.tar.xz samba-7cdcf131e8da6d750d103ded2fee009fe84d07fb.zip | |
param: rename lp function and variable from "usernamelevel" to "username_level"
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
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/lib/username.c | 6 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index e028b20738..99393fed62 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -337,7 +337,7 @@ FN_GLOBAL_INTEGER(smb2_max_write, smb2_max_write) FN_GLOBAL_INTEGER(server_max_protocol, server_max_protocol) FN_GLOBAL_INTEGER(server_min_protocol, server_min_protocol) FN_GLOBAL_INTEGER(syslog, syslog) -FN_GLOBAL_INTEGER(usernamelevel, usernamelevel) +FN_GLOBAL_INTEGER(username_level, username_level) FN_GLOBAL_INTEGER(username_map_cache_time, username_map_cache_time) FN_GLOBAL_INTEGER(usershare_max_shares, usershare_max_shares) FN_GLOBAL_INTEGER(web_port, web_port) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index d5ef200e4c..7517f195a4 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -665,7 +665,7 @@ static struct parm_struct parm_table[] = { .label = "username level", .type = P_INTEGER, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(usernamelevel), + .offset = GLOBAL_VAR(username_level), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, diff --git a/source3/lib/username.c b/source3/lib/username.c index 665fbb4253..847aa33eab 100644 --- a/source3/lib/username.c +++ b/source3/lib/username.c @@ -96,7 +96,7 @@ char *get_user_home_dir(TALLOC_CTX *mem_ctx, const char *user) * - as transmitted * - in all lower case if this differs from transmitted * - in all upper case if this differs from transmitted - * - using lp_usernamelevel() for permutations. + * - using lp_username_level() for permutations. ****************************************************************************/ static struct passwd *Get_Pwnam_internals(TALLOC_CTX *mem_ctx, @@ -150,9 +150,9 @@ static struct passwd *Get_Pwnam_internals(TALLOC_CTX *mem_ctx, goto done; } DEBUG(5,("Checking combinations of %d uppercase letters in %s\n", - lp_usernamelevel(), user2)); + lp_username_level(), user2)); ret = uname_string_combinations(user2, mem_ctx, getpwnam_alloc_cached, - lp_usernamelevel()); + lp_username_level()); done: DEBUG(5,("Get_Pwnam_internals %s find user [%s]!\n",ret ? diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 9df05b6879..364773060e 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -813,7 +813,7 @@ static void init_globals(bool reinit_globals) Globals.lpq_cache_time = 30; /* changed to handle large print servers better -- jerry */ Globals._disable_spoolss = false; Globals.max_smbd_processes = 0;/* no limit specified */ - Globals.usernamelevel = 0; + Globals.username_level = 0; Globals.deadtime = 0; Globals.getwd_cache = true; Globals.large_readwrite = true; |