diff options
| author | Yasuma Takeda <yasuma@osstech.co.jp> | 2008-12-05 13:37:04 -0800 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-12-11 10:27:16 +0100 |
| commit | af6786b707ce936312cc629dd2a8821de8076b17 (patch) | |
| tree | 91af5e99f29a1c252ef6e8acf736928500c0b5bc /source/param | |
| parent | 588bff8c28c474bf4f801778623805054f5f579c (diff) | |
| download | samba-af6786b707ce936312cc629dd2a8821de8076b17.tar.gz | |
Fix bug #5944 - nmbd does not boot if socket adress = "" is defined in smb.conf
(cherry picked from commit bcbdb0f2394acb9130763097c8192f4b497533eb)
Diffstat (limited to 'source/param')
| -rw-r--r-- | source/param/loadparm.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c index 99f25692467..87d87e6cc69 100644 --- a/source/param/loadparm.c +++ b/source/param/loadparm.c @@ -5022,7 +5022,6 @@ FN_GLOBAL_STRING(lp_remote_announce, &Globals.szRemoteAnnounce) FN_GLOBAL_STRING(lp_remote_browse_sync, &Globals.szRemoteBrowseSync) FN_GLOBAL_LIST(lp_wins_server_list, &Globals.szWINSservers) FN_GLOBAL_LIST(lp_interfaces, &Globals.szInterfaces) -FN_GLOBAL_STRING(lp_socket_address, &Globals.szSocketAddress) FN_GLOBAL_STRING(lp_nis_home_map_name, &Globals.szNISHomeMapName) static FN_GLOBAL_STRING(lp_announce_version, &Globals.szAnnounceVersion) FN_GLOBAL_LIST(lp_netbios_aliases, &Globals.szNetbiosAliases) @@ -9509,3 +9508,18 @@ 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; +} |