diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-08 23:31:58 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:51 +0100 |
| commit | f2cd9f66337e5915147236aa4762b8221cfdfa8b (patch) | |
| tree | f8693a748bc512caa517ccaa831a62428e79182a /source4/param | |
| parent | 1cdc55f5ecfbee3c79aaf7a3523b6defe7c17528 (diff) | |
| download | samba-f2cd9f66337e5915147236aa4762b8221cfdfa8b.tar.gz samba-f2cd9f66337e5915147236aa4762b8221cfdfa8b.tar.bz2 samba-f2cd9f66337e5915147236aa4762b8221cfdfa8b.zip | |
r26343: Remove bLoaded global variable.
(This used to be commit 6c3ca6aa816158f3ec27ce6a2bd872017f86c993)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 330a245e51..56f97e4602 100644 --- 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"); } |