[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  34092c1... s3:loadparm: make lp_load_ex static. We have wrappers for external callers.
      from  0ec0095... s3-libsmbclient Convert dos error codes to NTstatus in async libsmbclient.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 34092c11b49a8bb16838be414cb71b0b5c2136bf
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 20 11:14:06 2010 +0200

    s3:loadparm: make lp_load_ex static. We have wrappers for external callers.

-----------------------------------------------------------------------

Summary of changes:
 source3/include/proto.h  |    7 -------
 source3/param/loadparm.c |   14 +++++++-------
 2 files changed, 7 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4f63a77..09c34ed 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 f02ef26..340031b 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;


-- 
Samba Shared Repository