diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-29 15:33:54 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-29 15:44:09 +1000 |
| commit | 489f528857bfb4993cf44dd7a5391ac5196c0747 (patch) | |
| tree | 2a632f76bb52852710bed32173d00fa30a22745c /source3/param | |
| parent | ff1382753736c08156bd4308b1cc742cb6dc87b9 (diff) | |
| download | samba-489f528857bfb4993cf44dd7a5391ac5196c0747.tar.gz samba-489f528857bfb4993cf44dd7a5391ac5196c0747.tar.bz2 samba-489f528857bfb4993cf44dd7a5391ac5196c0747.zip | |
param: Merge param headers into lib/param/loadparm.h
This defines a common table format, so we can in future define a
common table.
Andrew Bartlett
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 3 | ||||
| -rw-r--r-- | source3/param/service.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 5104f4cefd..808774d1d7 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -59,6 +59,7 @@ #include "printing.h" #include "lib/smbconf/smbconf.h" #include "lib/smbconf/smbconf_init.h" +#include "lib/param/loadparm.h" #include "ads.h" #include "../librpc/gen_ndr/svcctl.h" @@ -5147,7 +5148,7 @@ static void init_globals(bool reinit_globals) */ string_set(&Globals.szPasswdChat, DEFAULT_PASSWD_CHAT); - string_set(&Globals.szWorkgroup, WORKGROUP); + string_set(&Globals.szWorkgroup, DEFAULT_WORKGROUP); string_set(&Globals.szPasswdProgram, ""); string_set(&Globals.szLockDir, get_dyn_LOCKDIR()); diff --git a/source3/param/service.c b/source3/param/service.c index 358b7af2de..f0cec4e216 100644 --- a/source3/param/service.c +++ b/source3/param/service.c @@ -27,6 +27,7 @@ #include "printing/pcap.h" #include "passdb/lookup_sid.h" #include "auth.h" +#include "lib/param/loadparm.h" static int load_registry_service(const char *servicename) { |