diff options
| author | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2009-11-10 15:58:52 +0200 |
|---|---|---|
| committer | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2009-11-10 15:58:52 +0200 |
| commit | cee83ac34a257a6f2090077ef2e8a6f888783f03 (patch) | |
| tree | 084f284fee5040f52da1cf387eb9655e7da7b7c3 | |
| parent | d241b9ae4c9b520406aac98e24d078f2d4fd4ae5 (diff) | |
| download | samba-cee83ac34a257a6f2090077ef2e8a6f888783f03.tar.gz samba-cee83ac34a257a6f2090077ef2e8a6f888783f03.tar.bz2 samba-cee83ac34a257a6f2090077ef2e8a6f888783f03.zip | |
Fixes for some tests not eorking against Windows or Samba.
| -rwxr-xr-x | source4/lib/ldb/tests/python/sec_descriptor.py | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/source4/lib/ldb/tests/python/sec_descriptor.py b/source4/lib/ldb/tests/python/sec_descriptor.py index 155b65f4ab..7dc0cfaacd 100755 --- a/source4/lib/ldb/tests/python/sec_descriptor.py +++ b/source4/lib/ldb/tests/python/sec_descriptor.py @@ -8,6 +8,7 @@ import os import base64 import re import random +import time sys.path.append("bin/python") sys.path.append("../lib/subunit/python") @@ -207,9 +208,9 @@ showInAdvancedViewOnly: TRUE _ldb.add_ldif(ldif) def read_desc(self, object_dn): - res = self.ldb_admin.search(base=object_dn, attrs=["nTSecurityDescriptor"]) + res = self.ldb_admin.search(base=object_dn, scope=SCOPE_BASE, attrs=["nTSecurityDescriptor"]) desc = res[0]["nTSecurityDescriptor"][0] - return ndr_unpack( security.descriptor, desc ) + return ndr_unpack(security.descriptor, desc) def enable_account(self, user_dn): """Enable an account. @@ -274,8 +275,6 @@ userAccountControl: %s""" % userAccountControl self.SAMBA = True else: self.WIN2003 = True - #print "self.SAMBA:", self.SAMBA - #print "self.WIN2003:", self.WIN2003 ################################################################################################ @@ -446,7 +445,7 @@ member: """ + user_dn "113" : "O:DAG:DA", "114" : "O:DAG:DA", "115" : "O:DAG:DA", - "130" : "", + "130" : "0:EAG:EA", "131" : "", "132" : "", "133" : "%s", @@ -542,7 +541,7 @@ member: """ + user_dn self.assertEqual(self.results[self.DS_BEHAVIOR]["100"], res) def test_101(self): - """ Dmain admin group member creates object (default nTSecurityDescriptor) in DOMAIN + """ Domain admin group member creates object (default nTSecurityDescriptor) in DOMAIN """ user_name = "testuser2" self.check_user_belongs(self.get_users_domain_dn(user_name), ["Domain Admins"]) @@ -1377,8 +1376,8 @@ class DaclDescriptorTests(DescriptorTests): DescriptorTests.setUp(self) def tearDown(self): - self.delete_force(self.ldb_admin, "CN=test_inherit_group,OU=test_inherit_ou," + self.base_dn) - self.delete_force(self.ldb_admin, "OU=test_inherit_ou," + self.base_dn) + self.delete_force(self.ldb_admin, "CN=_test_inherit_group,OU=test_inherit_ou," + self.base_dn) + self.delete_force(self.ldb_admin, "OU=_test_inherit_ou," + self.base_dn) def create_clean_ou(self, object_dn): """ Base repeating setup for unittests to follow """ @@ -1397,11 +1396,8 @@ class DaclDescriptorTests(DescriptorTests): desc_sddl = desc_sddl.replace(x, "") # Add flag 'protected' in both DACL and SACL so no inherit ACEs # can propagate from above + # remove SACL, we are not interested desc_sddl = desc_sddl.replace(":AI", ":AIP") - # colon at the end breaks ldif parsing, fix it - res = re.findall(".*?S:", desc_sddl) - if res: - desc_sddl = desc_sddl.replace("S:", "") self.modify_desc(object_dn, desc_sddl) # Verify all inheritable ACEs are gone desc_sddl = self.get_desc_sddl(object_dn) |