diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-01-10 14:34:43 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-10 15:26:44 +1300 |
| commit | a416edfe3ada6b0541ae3450bcb1916ca5429d43 (patch) | |
| tree | ab90a262fbb35cc2ed283a6cd98ebfb7d44d21e1 /source3/param | |
| parent | bb0b85777b721ae209acc9a9a6f68bb8c7476c74 (diff) | |
| download | samba-a416edfe3ada6b0541ae3450bcb1916ca5429d43.tar.gz samba-a416edfe3ada6b0541ae3450bcb1916ca5429d43.tar.xz samba-a416edfe3ada6b0541ae3450bcb1916ca5429d43.zip | |
param: rename and move usershare template parameter from LOADPARM_EXTRA_GLOBALS to param_functions.c
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim@samba.org>
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index d3321549614..918eb7e9afa 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -122,7 +122,6 @@ static bool defaults_saved = false; char *szLdapGroupSuffix; \ char *szStateDir; \ char *szCacheDir; \ - char *szUsershareTemplateShare; \ char *szIdmapUID; \ char *szIdmapGID; \ char *szIdmapBackend; \ @@ -1010,7 +1009,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 +4369,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 +4383,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 +4442,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 +4456,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; } } |