param: rename and move usershare template parameter from LOADPARM_EXTRA_GLOBALS to...

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>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index f22bb5522919188e69ba91ab9d0dedda18688c03..6bebe0d33581c960dba301040e40de6fac0499b6 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -84,7 +84,6 @@ static bool defaults_saved = false;
        char *szLdapUserSuffix;                                         \
        char *szLdapIdmapSuffix;                                        \
        char *szLdapGroupSuffix;                                        \
-       char *szUsershareTemplateShare;                                 \
        char *szIdmapUID;                                               \
        char *szIdmapGID;                                               \
        char *szIdmapBackend;                                           \

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 159a7a6b0dc507b75f58c6bcddf70a82897ba959..27eacf6f80e366722f1c23e73b27f0711201d634 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -412,3 +412,4 @@ FN_GLOBAL_STRING(username_map_script, username_map_script)
 FN_GLOBAL_STRING(username_map, username_map)
 FN_GLOBAL_STRING(usershare_path, usershare_path)
 FN_GLOBAL_STRING(wins_hook, wins_hook)
+FN_GLOBAL_STRING(usershare_template_share, usershare_template_share)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 515e94c041c7d1a34d45f7cf2ce20b7cffb91084..30222a96235fb182f2f187c3f844b90566daddbe 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -3697,7 +3697,7 @@ static struct parm_struct parm_table[] = {
                .label          = "usershare template share",
                .type           = P_STRING,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(szUsershareTemplateShare),
+               .offset         = GLOBAL_VAR(usershare_template_share),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d3321549614196232f54a469cb6be2eca200ef76..918eb7e9afa2a8ea6b701560a0d6bcfcafbde9db 100644 (file)
--- 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;
                }
        }