svn commit: samba r26343 - in branches/SAMBA_4_0: . source/param

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-08 23:31:58 +0000 (Sat, 08 Dec 2007)
New Revision: 26343

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26343

Log:
Remove bLoaded global variable.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/param/loadparm.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c	2007-12-08 23:31:55 UTC (rev 26342)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2007-12-08 23:31:58 UTC (rev 26343)
@@ -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 @@
 
 bool lp_loaded(void)
 {
-	return bLoaded;
+	return (global_loadparm != NULL);
 }
 
 /***************************************************************************
@@ -2489,8 +2487,6 @@
 	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");
 	}