sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

param: Make socket_address common, Revert 611ef42053

Browse Source 
This essentially reverts the commit 611ef42053
Author: Yasuma Takeda <yasuma@osstech.co.jp>
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
This commit is contained in:
Andrew Bartlett 2012-07-23 09:23:04 +10:00
parent bc1826abd6
commit 42e405a422
4 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs-xml/smbdotconf/misc/socketaddress.xml
View File

@ -15,6 +15,6 @@
address.</para> address.</para>
</description> </description>
<value type="default"></value> <value type="default">0.0.0.0</value>
<value type="example">192.168.2.20</value> <value type="example">192.168.2.20</value>
</samba:parameter> </samba:parameter>

1
lib/param/loadparm.c
View File

@ -328,7 +328,6 @@ static struct loadparm_context *global_loadparm_context;
FN_GLOBAL_BOOL(readraw, bReadRaw) FN_GLOBAL_BOOL(readraw, bReadRaw)
FN_GLOBAL_BOOL(writeraw, bWriteRaw) FN_GLOBAL_BOOL(writeraw, bWriteRaw)
FN_GLOBAL_STRING(cachedir, szCacheDir) FN_GLOBAL_STRING(cachedir, szCacheDir)
FN_GLOBAL_STRING(socket_address, szSocketAddress)
FN_GLOBAL_STRING(statedir, szStateDir) FN_GLOBAL_STRING(statedir, szStateDir)
/* local prototypes */ /* local prototypes */

1
lib/param/param_functions.c
View File

@ -260,6 +260,7 @@ FN_GLOBAL_CONST_STRING(piddir, szPidDir)
FN_GLOBAL_CONST_STRING(private_dir, szPrivateDir) FN_GLOBAL_CONST_STRING(private_dir, szPrivateDir)
FN_GLOBAL_CONST_STRING(realm, szRealm_upper) FN_GLOBAL_CONST_STRING(realm, szRealm_upper)
FN_GLOBAL_CONST_STRING(smb_passwd_file, szSMBPasswdFile) 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(socket_options, socket_options)
FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir) FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir)
FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell) FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell)

16
source3/param/loadparm.c
View File

@ -122,7 +122,6 @@ static bool defaults_saved = false;
char *szLdapGroupSuffix; \ char *szLdapGroupSuffix; \
char *szStateDir; \ char *szStateDir; \
char *szCacheDir; \ char *szCacheDir; \
char *szSocketAddress; \
char *szUsershareTemplateShare; \ char *szUsershareTemplateShare; \
char *szIdmapUID; \ char *szIdmapUID; \
char *szIdmapGID; \ char *szIdmapGID; \
@ -5358,21 +5357,6 @@ int lp_min_receive_file_size(void)
return MIN(Globals.iminreceivefile, BUFFER_SIZE); 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. Safe wide links checks.
This helper function always verify the validity of wide links, This helper function always verify the validity of wide links,