[SCM] Samba Shared Repository - branch master updated

[Nadezhda Ivanova]

The branch, master has been updated
       via  622ef6a s4-provision: Fixed owner/group for hard-coded Sites descriptor.
       via  35d8b80 s4-tools: Fixed a bug in ldapcmp - DACL was not retrieved correctly if the object had no SACL.
      from  93da0aa s3-rpc_client: Fixed status check of dcerpc_lsa_lookup_sids_noalloc.

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


- Log -----------------------------------------------------------------
commit 622ef6aed82a2f2f7748c2a88535486af77487de
Author: Nadezhda Ivanova <nivanova at samba.org>
Date:   Mon Jan 17 17:48:36 2011 +0200

    s4-provision: Fixed owner/group for hard-coded Sites descriptor.
    
    We must not specify explicitly owner and group. As there is a difference between WIN_2003 and WIN_2008, we should let descriptor
    module compute the correct default ones. Also removed inherited ACEs, they are ignored during SD creation anyway.
    
    Autobuild-User: Nadezhda Ivanova <nivanova at samba.org>
    Autobuild-Date: Mon Jan 17 18:23:24 CET 2011 on sn-devel-104

commit 35d8b808005638e9fa33bf7983d449db34dfb761
Author: Nadezhda Ivanova <nivanova at samba.org>
Date:   Mon Jan 17 17:44:10 2011 +0200

    s4-tools: Fixed a bug in ldapcmp - DACL was not retrieved correctly if the object had no SACL.
    
    --Pair-Programmed-With: Zahari Zahariev

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

Summary of changes:
 source4/scripting/python/samba/netcmd/ldapcmp.py   |    5 ++++-
 .../scripting/python/samba/provision/__init__.py   |    4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/netcmd/ldapcmp.py b/source4/scripting/python/samba/netcmd/ldapcmp.py
index d62b554..1cde860 100755
--- a/source4/scripting/python/samba/netcmd/ldapcmp.py
+++ b/source4/scripting/python/samba/netcmd/ldapcmp.py
@@ -216,7 +216,10 @@ class Descriptor(object):
         """ Extracts the DACL as a list of ACE string (with the brakets).
         """
         try:
-            res = re.search("D:(.*?)(\(.*?\))S:", self.sddl).group(2)
+            if "S:" in self.sddl:
+                res = re.search("D:(.*?)(\(.*?\))S:", self.sddl).group(2)
+            else:
+                res = re.search("D:(.*?)(\(.*\))", self.sddl).group(2)
         except AttributeError:
             return []
         return re.findall("(\(.*?\))", res)
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 3e402b2..e200083 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -106,11 +106,9 @@ def find_setup_dir():
 # "get_schema_descriptor" is located in "schema.py"
 
 def get_sites_descriptor(domain_sid):
-    sddl = "O:EAG:EAD:AI(A;;RPLCLORC;;;AU)" \
+    sddl = "D:(A;;RPLCLORC;;;AU)" \
            "(A;;RPWPCRCCLCLORCWOWDSW;;;EA)" \
            "(A;;RPWPCRCCDCLCLORCWOWDSDDTSW;;;SY)" \
-           "(A;CIID;RPWPCRCCDCLCLORCWOWDSDDTSW;;;EA)" \
-           "(A;CIID;RPWPCRCCLCLORCWOWDSDSW;;;DA)" \
            "S:AI(AU;CISA;CCDCSDDT;;;WD)" \
            "(OU;CIIOSA;CR;;f0f8ffab-1191-11d0-a060-00aa006c33ed;WD)" \
            "(OU;CIIOSA;WP;f30e3bbe-9ff0-11d1-b603-0000f80367c1;bf967ab3-0de6-11d0-a285-00aa003049e2;WD)" \


-- 
Samba Shared Repository