[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  39932f2 autobuild: create an autobuild.pid file
       via  0a2e55b s4-mailslot: fixed handling of random collision in temporary mailslot names
      from  45794dd Fix shadow warning for "access" variable.

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


- Log -----------------------------------------------------------------
commit 39932f21dabbd96b6a1e7165d9289069cac87a3e
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Oct 20 09:44:03 2010 +1100

    autobuild: create an autobuild.pid file
    
    this will allow us to avoid an error email when you resubmit and there
    is an existing autobuild.
    
    Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Tue Oct 19 23:36:05 UTC 2010 on sn-devel-104

commit 0a2e55bb41c8ed32d4731c8b6456fc714a1149f4
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Oct 20 09:14:40 2010 +1100

    s4-mailslot: fixed handling of random collision in temporary mailslot names
    
    we could get occasional failures in the samba4.nbt.dgram test if we
    happened to get a collision in the random mailslot names.
    
    Thanks to Jeremy for spotting this! (his autobuild failed)
    
    Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 script/autobuild.py             |    9 +++++++++
 source4/libcli/dgram/mailslot.c |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/script/autobuild.py b/script/autobuild.py
index cb3e959..3fae59f 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -273,6 +273,13 @@ def daemonize(logfile):
     os.dup2(0, 1)
     os.dup2(0, 2)
 
+def write_pidfile(fname):
+    '''write a pid file, cleanup on exit'''
+    f = open(fname, mode='w')
+    f.write("%u\n" % os.getpid())
+    f.close()
+    cleanup_list.append(fname)
+
 
 def rebase_tree(url):
     print("Rebasing on %s" % url)
@@ -435,6 +442,8 @@ if options.daemon:
     print "Forking into the background, writing progress to %s" % logfile
     daemonize(logfile)
 
+write_pidfile(gitroot + "/autobuild.pid")
+
 while True:
     try:
         run_cmd("rm -rf %s" % test_master)
diff --git a/source4/libcli/dgram/mailslot.c b/source4/libcli/dgram/mailslot.c
index 261946e..38dd8fb 100644
--- a/source4/libcli/dgram/mailslot.c
+++ b/source4/libcli/dgram/mailslot.c
@@ -129,7 +129,7 @@ struct dgram_mailslot_handler *dgram_mailslot_temp(struct nbt_dgram_socket *dgms
 		if (name == NULL) return NULL;
 		if (dgram_mailslot_find(dgmsock, name)) {
 			talloc_free(name);
-			return NULL;
+			continue;
 		}
 		dgmslot = dgram_mailslot_listen(dgmsock, name, handler, private_data);
 		talloc_free(name);


-- 
Samba Shared Repository