diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-07-23 09:23:04 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-07-27 03:34:23 +0200 |
| commit | 42e405a422b4913e014740678fa067d5a441db88 (patch) | |
| tree | 59425d442c7aa3a620429c031e8f756d76ae006a /lib/param | |
| parent | bc1826abd67627588f40a7fe3a0a993ab83bb65d (diff) | |
| download | samba-42e405a422b4913e014740678fa067d5a441db88.tar.gz | |
param: Make socket_address common, Revert 611ef42053eb99f4c29d4efa86eaea9f1ca06286
This essentially reverts the commit 611ef42053eb99f4c29d4efa86eaea9f1ca06286
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
Diffstat (limited to 'lib/param')
| -rw-r--r-- | lib/param/loadparm.c | 1 | ||||
| -rw-r--r-- | lib/param/param_functions.c | 1 |
2 files changed, 1 insertions, 1 deletions
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) |