[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  63c7107 s3:smbd: also the parent smbd needs FLAG_MSG_PRINT_GENERAL (bug #8553)
       via  e082745 s4:nbt_server/dgram: higher debug level for NBT_MAILSLOT_NETLOGON requests
       via  8386b20 s4:lib/socket: don't pass -1 to close()
      from  8b375ee s3: fix typo in net ads join output

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


- Log -----------------------------------------------------------------
commit 63c7107c4affa3992e9c05647b81ecbfe87be01e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 31 15:52:37 2011 +0100

    s3:smbd: also the parent smbd needs FLAG_MSG_PRINT_GENERAL (bug #8553)
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Oct 31 17:37:34 CET 2011 on sn-devel-104

commit e082745b510192c66038df901a5fe4d3c5956696
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 31 12:15:18 2011 +0100

    s4:nbt_server/dgram: higher debug level for NBT_MAILSLOT_NETLOGON requests
    
    This matches the log level of the CLDAP case.
    
    metze

commit 8386b2079937907fdcb6d080423a40ede5dfc9df
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 31 09:34:13 2011 +0100

    s4:lib/socket: don't pass -1 to close()
    
    metze

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

Summary of changes:
 source3/smbd/server.c               |    1 +
 source4/lib/socket/socket_ip.c      |    5 ++++-
 source4/nbt_server/dgram/netlogon.c |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index acbab9d..1786be6 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -739,6 +739,7 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent,
 
 	if (!serverid_register(procid_self(),
 			       FLAG_MSG_GENERAL|FLAG_MSG_SMBD
+			       |FLAG_MSG_PRINT_GENERAL
 			       |FLAG_MSG_DBWRAP)) {
 		DEBUG(0, ("open_sockets_smbd: Failed to register "
 			  "myself in serverid.tdb\n"));
diff --git a/source4/lib/socket/socket_ip.c b/source4/lib/socket/socket_ip.c
index 80f7d33..cab51be 100644
--- a/source4/lib/socket/socket_ip.c
+++ b/source4/lib/socket/socket_ip.c
@@ -58,7 +58,10 @@ static NTSTATUS ipv4_init(struct socket_context *sock)
 
 static void ip_close(struct socket_context *sock)
 {
-	close(sock->fd);
+	if (sock->fd != -1) {
+		close(sock->fd);
+		sock->fd = -1;
+	}
 }
 
 static NTSTATUS ip_connect_complete(struct socket_context *sock, uint32_t flags)
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index a727c69..f99f195 100644
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -168,7 +168,7 @@ void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot,
 		goto failed;
 	}
 
-	DEBUG(2,("netlogon request to %s from %s:%d\n", 
+	DEBUG(5,("netlogon request to %s from %s:%d\n",
 		 nbt_name_string(netlogon, name), src->addr, src->port));
 	status = dgram_mailslot_netlogon_parse_request(dgmslot, netlogon, packet, netlogon);
 	if (!NT_STATUS_IS_OK(status)) goto failed;


-- 
Samba Shared Repository