From: Garming Sam <garming@catalyst.net.nz>
Date: Fri, 10 Jan 2014 01:34:43 +0000 (+1300)
Subject: param: rename and move usershare template parameter from LOADPARM_EXTRA_GLOBALS to... 
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=a416edfe3ada6b0541ae3450bcb1916ca5429d43;p=obnox%2Fsamba%2Fsamba-obnox.git

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>
---

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index f22bb552291..6bebe0d3358 100644
--- 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 159a7a6b0dc..27eacf6f80e 100644
--- 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 515e94c041c..30222a96235 100644
--- 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 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;
 		}
 	}