[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  33705f4 s4-scripting: Remove unused variables from ntacl tests
       via  4aca56c s4-smbd: Check for failure of irpc_add_name
      from  f06c216 s3-pysmbd: Try opening as a file, then as a directory

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


- Log -----------------------------------------------------------------
commit 33705f4cc1773ff4fc37a6e6927af7a327aeb31d
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Aug 7 16:55:58 2012 +1000

    s4-scripting: Remove unused variables from ntacl tests
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Tue Aug  7 11:15:41 CEST 2012 on sn-devel-104

commit 4aca56cd848df11d79a8a0333d3e9944f176bcd9
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Aug 7 15:50:46 2012 +1000

    s4-smbd: Check for failure of irpc_add_name

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

Summary of changes:
 source4/scripting/python/samba/tests/ntacls.py |   10 ----------
 source4/smbd/server.c                          |    5 ++++-
 2 files changed, 4 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/tests/ntacls.py b/source4/scripting/python/samba/tests/ntacls.py
index c7e4101..c867c95 100644
--- a/source4/scripting/python/samba/tests/ntacls.py
+++ b/source4/scripting/python/samba/tests/ntacls.py
@@ -32,8 +32,6 @@ class NtaclsTests(TestCase):
         path = os.environ['SELFTEST_PREFIX']
         acl = "O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695158682-2101375467-513D:(A;OICI;0x001f01ff;;;S-1-5-21-2212615479-2695158682-2101375467-512)"
         tempf = os.path.join(path,"pytests"+str(int(100000*random.random())))
-        ntacl = xattr.NTACL()
-        ntacl.version = 1
         open(tempf, 'w').write("empty")
         lp.set("posix:eadb",os.path.join(path,"eadbtest.tdb"))
         setntacl(lp, tempf, acl, "S-1-5-21-2212615479-2695158682-2101375467")
@@ -46,8 +44,6 @@ class NtaclsTests(TestCase):
         path = os.environ['SELFTEST_PREFIX']
         acl = "O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695158682-2101375467-513D:(A;OICI;0x001f01ff;;;S-1-5-21-2212615479-2695158682-2101375467-512)"
         tempf = os.path.join(path,"pytests"+str(int(100000*random.random())))
-        ntacl = xattr.NTACL()
-        ntacl.version = 1
         open(tempf, 'w').write("empty")
         lp.set("posix:eadb",os.path.join(path,"eadbtest.tdb"))
         setntacl(lp,tempf,acl,"S-1-5-21-2212615479-2695158682-2101375467")
@@ -62,8 +58,6 @@ class NtaclsTests(TestCase):
         acl = "O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695158682-2101375467-513D:(A;OICI;0x001f01ff;;;S-1-5-21-2212615479-2695158682-2101375467-512)"
         path = os.environ['SELFTEST_PREFIX']
         tempf = os.path.join(path,"pytests"+str(int(100000*random.random())))
-        ntacl = xattr.NTACL()
-        ntacl.version = 1
         open(tempf, 'w').write("empty")
         setntacl(lp,tempf,acl,"S-1-5-21-2212615479-2695158682-2101375467","tdb",os.path.join(path,"eadbtest.tdb"))
         facl=getntacl(lp,tempf,"tdb",os.path.join(path,"eadbtest.tdb"))
@@ -77,8 +71,6 @@ class NtaclsTests(TestCase):
         acl = "O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695158682-2101375467-513D:(A;OICI;0x001f01ff;;;S-1-5-21-2212615479-2695158682-2101375467-512)"
         path = os.environ['SELFTEST_PREFIX']
         tempf = os.path.join(path,"pytests"+str(int(100000*random.random())))
-        ntacl = xattr.NTACL()
-        ntacl.version = 1
         open(tempf, 'w').write("empty")
         self.assertRaises(XattrBackendError, setntacl, lp, tempf, acl, "S-1-5-21-2212615479-2695158682-2101375467","ttdb", os.path.join(path,"eadbtest.tdb"))
 
@@ -90,8 +82,6 @@ class NtaclsTests(TestCase):
         acl = "O:S-1-5-21-2212615479-2695158682-2101375467-512G:S-1-5-21-2212615479-2695158682-2101375467-513D:(A;OICI;0x001f01ff;;;S-1-5-21-2212615479-2695158682-2101375467-512)"
         path = os.environ['SELFTEST_PREFIX']
         tempf = os.path.join(path,"pytests"+str(int(100000*random.random())))
-        ntacl = xattr.NTACL()
-        ntacl.version = 1
         open(tempf, 'w').write("empty")
         lp.set("posix:eadb", os.path.join(path,"eadbtest.tdb"))
         self.assertRaises(Exception, setntacl, lp, tempf ,acl,
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index a6ebcd6..f3405a7 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -225,7 +225,10 @@ static NTSTATUS setup_parent_messaging(struct tevent_context *event_ctx,
 			      cluster_id(0, SAMBA_PARENT_TASKID), event_ctx, false);
 	NT_STATUS_HAVE_NO_MEMORY(msg);
 
-	irpc_add_name(msg, "samba");
+	status = irpc_add_name(msg, "samba");
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 
 	status = IRPC_REGISTER(msg, irpc, SAMBA_TERMINATE,
 			       samba_terminate, NULL);


-- 
Samba Shared Repository