diff options
| -rw-r--r-- | docs-xml/smbdotconf/misc/socketaddress.xml | 2 | ||||
| -rw-r--r-- | lib/param/loadparm.c | 1 | ||||
| -rw-r--r-- | lib/param/param_functions.c | 1 | ||||
| -rw-r--r-- | 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.</para> </description> -<value type="default"></value> +<value type="default">0.0.0.0</value> <value type="example">192.168.2.20</value> </samba:parameter> 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; \ @@ -5359,21 +5358,6 @@ int lp_min_receive_file_size(void) } /******************************************************************* - 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, even after a configuration file reload. |