diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-12-24 16:04:35 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-01-24 16:19:04 -0800 |
| commit | af296acdc4910ffa4646d8d98d9b6ee024f29df3 (patch) | |
| tree | a793b13adac75ea63aca943336e9a870c71574e9 | |
| parent | 8639ac7338f80d2a3619edd60009e110ec74eb48 (diff) | |
param: Rename variable used for lp_usershare_path szUsersharePath
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 | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 33d2cb2d4b..256f3391da 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -411,5 +411,5 @@ FN_GLOBAL_STRING(share_backend, share_backend) FN_GLOBAL_STRING(shutdown_script, shutdown_script) FN_GLOBAL_STRING(username_map_script, usernameMapScript) FN_GLOBAL_STRING(username_map, usernameMap) -FN_GLOBAL_STRING(usershare_path, szUsersharePath) +FN_GLOBAL_STRING(usershare_path, usershare_path) FN_GLOBAL_STRING(wins_hook, szWINSHook) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index e5d47ae2ef..c2ecffe64b 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -3670,7 +3670,7 @@ static struct parm_struct parm_table[] = { .label = "usershare path", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(szUsersharePath), + .offset = GLOBAL_VAR(usershare_path), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 6c17b40c83..487fe3fb6c 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1014,7 +1014,7 @@ static void init_globals(bool reinit_globals) if (asprintf(&s, "%s/usershares", get_dyn_STATEDIR()) < 0) { smb_panic("init_globals: ENOMEM"); } - string_set(&Globals.szUsersharePath, s); + string_set(&Globals.usershare_path, s); SAFE_FREE(s); string_set(&Globals.szUsershareTemplateShare, ""); Globals.usershare_max_shares = 0; @@ -4493,7 +4493,7 @@ static int process_usershare_file(const char *dir_name, const char *file_name, i static bool usershare_exists(int iService, struct timespec *last_mod) { SMB_STRUCT_STAT lsbuf; - const char *usersharepath = Globals.szUsersharePath; + const char *usersharepath = Globals.usershare_path; char *fname; if (asprintf(&fname, "%s/%s", @@ -4524,7 +4524,7 @@ static bool usershare_exists(int iService, struct timespec *last_mod) int load_usershare_service(const char *servicename) { SMB_STRUCT_STAT sbuf; - const char *usersharepath = Globals.szUsersharePath; + const char *usersharepath = Globals.usershare_path; int max_user_shares = Globals.usershare_max_shares; int snum_template = -1; @@ -4603,7 +4603,7 @@ int load_usershare_shares(struct smbd_server_connection *sconn, unsigned int allowed_tmp_entries = ((2*max_user_shares)/10); int iService; int snum_template = -1; - const char *usersharepath = Globals.szUsersharePath; + const char *usersharepath = Globals.usershare_path; int ret = lp_numservices(); TALLOC_CTX *tmp_ctx; |