[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4602-gbcbdb0f

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  bcbdb0f2394acb9130763097c8192f4b497533eb (commit)
      from  8b49bf06e252b3c37ba910f8b887f48232eb1a9b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit bcbdb0f2394acb9130763097c8192f4b497533eb
Author: Yasuma Takeda <[EMAIL PROTECTED]>
Date:   Fri Dec 5 13:37:04 2008 -0800

    Fix bug #5944 - nmbd does not boot if socket adress = "" is defined in 
smb.conf

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

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


Changeset truncated at 500 lines:

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 99f2569..87d87e6 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;
+}
diff --git a/source/smbd/server.c b/source/smbd/server.c
index ae36c7d..1c1e728 100644
--- a/source/smbd/server.c
+++ b/source/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