[SCM] Samba Shared Repository - branch master updated - 611ef42053eb99f4c29d4efa86eaea9f1ca06286

[Jeremy Allison]

The branch, master has been updated
       via  611ef42053eb99f4c29d4efa86eaea9f1ca06286 (commit)
      from  ac4a77ccca08b73f828938a0cfaece66b1c9deea (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 611ef42053eb99f4c29d4efa86eaea9f1ca06286
Author: Yasuma Takeda <yasuma at 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

-----------------------------------------------------------------------

Summary of changes:
 source3/param/loadparm.c |   16 +++++++++++++++-
 source3/smbd/server.c    |    5 ++---
 2 files changed, 17 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 217957a..c743b89 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5063,7 +5063,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)
@@ -9468,3 +9467,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;
+}
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index fff05a3..f7bdb58 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -469,9 +469,8 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
 		char *sock_tok;
 		const char *sock_ptr;
 
-		if (sock_addr[0] == '\0' ||
-				strequal(sock_addr, "0.0.0.0") ||
-				strequal(sock_addr, "::")) {
+		if (strequal(sock_addr, "0.0.0.0") ||
+		    strequal(sock_addr, "::")) {
 #if HAVE_IPV6
 			sock_addr = "::,0.0.0.0";
 #else


-- 
Samba Shared Repository