summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-08-20 11:14:06 +0200
committerMichael Adam <obnox@samba.org>2010-08-20 11:14:06 +0200
commit34092c11b49a8bb16838be414cb71b0b5c2136bf (patch)
treeae5341842549b6f073eeb31605fa1c98ba717fba
parent0ec0095d1a40435042b8ff9e4bc7fedbeb371e5f (diff)
downloadsamba-34092c11b49a8bb16838be414cb71b0b5c2136bf.tar.gz
samba-34092c11b49a8bb16838be414cb71b0b5c2136bf.tar.bz2
samba-34092c11b49a8bb16838be414cb71b0b5c2136bf.zip
s3:loadparm: make lp_load_ex static. We have wrappers for external callers.
-rw-r--r--source3/include/proto.h7
-rw-r--r--source3/param/loadparm.c14
2 files changed, 7 insertions, 14 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4f63a77e99..09c34ed3e7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4016,13 +4016,6 @@ int load_usershare_shares(void);
void gfree_loadparm(void);
void lp_set_in_client(bool b);
bool lp_is_in_client(void);
-bool lp_load_ex(const char *pszFname,
- bool global_only,
- bool save_defaults,
- bool add_ipc,
- bool initialize_globals,
- bool allow_include_registry,
- bool allow_registry_shares);
bool lp_load(const char *pszFname,
bool global_only,
bool save_defaults,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index f02ef261df..340031b45f 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -9162,13 +9162,13 @@ bool lp_is_in_client(void)
False on failure.
***************************************************************************/
-bool lp_load_ex(const char *pszFname,
- bool global_only,
- bool save_defaults,
- bool add_ipc,
- bool initialize_globals,
- bool allow_include_registry,
- bool allow_registry_shares)
+static bool lp_load_ex(const char *pszFname,
+ bool global_only,
+ bool save_defaults,
+ bool add_ipc,
+ bool initialize_globals,
+ bool allow_include_registry,
+ bool allow_registry_shares)
{
char *n2 = NULL;
bool bRetval;