[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Tue Apr 21 19:44:02 MDT 2015


The branch, master has been updated
       via  74e684d s3-unix_msg: remove socket file after closing socket fd
      from  64b038d s3:smbd: update comment to correctly reflect MS-SMB2

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


- Log -----------------------------------------------------------------
commit 74e684db80f1e80592f642d29669bbcbe8db17ba
Author: Youzhong Yang <yyang at mathworks.com>
Date:   Mon Apr 20 09:42:42 2015 -0400

    s3-unix_msg: remove socket file after closing socket fd
    
    This is needed on Solaris.
    
    It fixes https://bugzilla.samba.org/show_bug.cgi?id=11217
    
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Wed Apr 22 03:43:30 CEST 2015 on sn-devel-104

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

Summary of changes:
 source3/lib/unix_msg/unix_msg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/unix_msg/unix_msg.c b/source3/lib/unix_msg/unix_msg.c
index 7cb1936..0baaa9d 100644
--- a/source3/lib/unix_msg/unix_msg.c
+++ b/source3/lib/unix_msg/unix_msg.c
@@ -684,13 +684,13 @@ static int unix_dgram_free(struct unix_dgram_ctx *ctx)
 
 	ctx->ev_funcs->watch_free(ctx->sock_read_watch);
 
+	close(ctx->sock);
 	if (getpid() == ctx->created_pid) {
 		/* If we created it, unlink. Otherwise someone else might
 		 * still have it open */
 		unlink(ctx->path);
 	}
 
-	close(ctx->sock);
 	free(ctx->recv_buf);
 	free(ctx);
 	return 0;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list