From 42e405a422b4913e014740678fa067d5a441db88 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 23 Jul 2012 09:23:04 +1000 Subject: param: Make socket_address common, Revert 611ef42053eb99f4c29d4efa86eaea9f1ca06286 This essentially reverts the commit 611ef42053eb99f4c29d4efa86eaea9f1ca06286 Author: Yasuma Takeda Date: Fri Dec 5 13:37:51 2008 -0800 Fix bug #5944 - nmbd does not boot if socket adress = "" is defined in smb.conf Intead, the documentation is fixed so that the correct default is recorded. Removing the special case handling here allows this to be dealt with in the same way as all other parameters. Andrew Bartlett --- docs-xml/smbdotconf/misc/socketaddress.xml | 2 +- lib/param/loadparm.c | 1 - lib/param/param_functions.c | 1 + source3/param/loadparm.c | 16 ---------------- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/docs-xml/smbdotconf/misc/socketaddress.xml b/docs-xml/smbdotconf/misc/socketaddress.xml index 17018efd40..b3a81f2ec3 100644 --- a/docs-xml/smbdotconf/misc/socketaddress.xml +++ b/docs-xml/smbdotconf/misc/socketaddress.xml @@ -15,6 +15,6 @@ address. - +0.0.0.0 192.168.2.20 diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 373df385d7..e9765521f8 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -328,7 +328,6 @@ static struct loadparm_context *global_loadparm_context; FN_GLOBAL_BOOL(readraw, bReadRaw) FN_GLOBAL_BOOL(writeraw, bWriteRaw) FN_GLOBAL_STRING(cachedir, szCacheDir) -FN_GLOBAL_STRING(socket_address, szSocketAddress) FN_GLOBAL_STRING(statedir, szStateDir) /* local prototypes */ diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index d7e09ffafd..c1e50f4105 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -260,6 +260,7 @@ FN_GLOBAL_CONST_STRING(piddir, szPidDir) FN_GLOBAL_CONST_STRING(private_dir, szPrivateDir) FN_GLOBAL_CONST_STRING(realm, szRealm_upper) FN_GLOBAL_CONST_STRING(smb_passwd_file, szSMBPasswdFile) +FN_GLOBAL_CONST_STRING(socket_address, szSocketAddress) FN_GLOBAL_CONST_STRING(socket_options, socket_options) FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir) FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 768fa41924..990831b1cf 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -122,7 +122,6 @@ static bool defaults_saved = false; char *szLdapGroupSuffix; \ char *szStateDir; \ char *szCacheDir; \ - char *szSocketAddress; \ char *szUsershareTemplateShare; \ char *szIdmapUID; \ char *szIdmapGID; \ @@ -5358,21 +5357,6 @@ int lp_min_receive_file_size(void) return MIN(Globals.iminreceivefile, BUFFER_SIZE); } -/******************************************************************* - If socket address is an empty character string, it is necessary to - define it as "0.0.0.0". -********************************************************************/ - -const char *lp_socket_address(void) -{ - char *sock_addr = Globals.szSocketAddress; - - if (sock_addr[0] == '\0'){ - string_set(&Globals.szSocketAddress, "0.0.0.0"); - } - return Globals.szSocketAddress; -} - /******************************************************************* Safe wide links checks. This helper function always verify the validity of wide links, -- cgit