r26343: Remove bLoaded global variable.

(This used to be commit 6c3ca6aa816158f3ec27ce6a2bd872017f86c993)

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 330a245e51af5f5deb6817334f2df496d314b35c..56f97e460216ce6f7114be6cb5660487a6f8145e 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -64,8 +64,6 @@
 #include "param/param.h"
 #include "param/loadparm.h"
 
-static bool bLoaded = false;
-
 #define standard_sub_basic talloc_strdup
 
 static bool do_parameter(const char *, const char *, void *);
@@ -2236,7 +2234,7 @@ static void lp_add_auto_services(struct loadparm_context *lp_ctx,
 
 bool lp_loaded(void)
 {
-       return bLoaded;
+       return (global_loadparm != NULL);
 }
 
 /***************************************************************************
@@ -2489,8 +2487,6 @@ bool lp_load(TALLOC_CTX *mem_ctx, const char *filename, struct loadparm_context
        lp_add_hidden(lp_ctx, "IPC$", "IPC");
        lp_add_hidden(lp_ctx, "ADMIN$", "DISK");
 
-       bLoaded = true;
-
        if (!lp_ctx->globals->szWINSservers && lp_ctx->globals->bWINSsupport) {
                lp_do_global_parameter(lp_ctx, "wins server", "127.0.0.1");
        }