[SCM] Samba Shared Repository - branch master updated

[Nadezhda Ivanova]

The branch, master has been updated
       via  2c993f0 s4-tests: Adapted passwords.py to use set_minPwdAge from SamDB.
       via  2c96be1 s4-tests: Adapted acl.py to use set_minPwdAge from SamDB.
       via  c88b90e s4-dsdb: Added a helper to python SamDB for retrieving and setting minPwdAge.
      from  b85dfce s4-test/repl_schema: Remote global ldb connections

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


- Log -----------------------------------------------------------------
commit 2c993f0d4eb43d39553857641d0686baba444b4b
Author: Nadezhda Ivanova <nivanova at samba.org>
Date:   Mon Nov 22 18:51:55 2010 +0200

    s4-tests: Adapted passwords.py to use set_minPwdAge from SamDB.
    
    Autobuild-User: Nadezhda Ivanova <nivanova at samba.org>
    Autobuild-Date: Mon Nov 22 18:39:06 CET 2010 on sn-devel-104

commit 2c96be185d7d8222fc7f1aef513ca0e5b0ca2408
Author: Nadezhda Ivanova <nivanova at samba.org>
Date:   Mon Nov 22 18:50:35 2010 +0200

    s4-tests: Adapted acl.py to use set_minPwdAge from SamDB.

commit c88b90e9f69554832a4932cbc9e44ea1c3bd2b81
Author: Nadezhda Ivanova <nivanova at samba.org>
Date:   Mon Nov 22 18:34:18 2010 +0200

    s4-dsdb: Added a helper to python SamDB for retrieving and setting minPwdAge.

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

Summary of changes:
 source4/dsdb/tests/python/acl.py        |   13 +++----------
 source4/dsdb/tests/python/passwords.py  |   14 +++-----------
 source4/scripting/python/samba/samdb.py |   15 +++++++++++++++
 3 files changed, 21 insertions(+), 21 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index 1480005..8a1c6a4 100755
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -232,12 +232,6 @@ url: www.example.com
             m["dSHeuristics"] = MessageElement([], FLAG_MOD_DELETE, "dsHeuristics")
         self.ldb_admin.modify(m)
 
-    def set_minPwdAge(self, value):
-        m = Message()
-        m.dn = Dn(self.ldb_admin, self.base_dn)
-        m["minPwdAge"] = MessageElement(value, FLAG_MOD_REPLACE, "minPwdAge")
-        self.ldb_admin.modify(m)
-
 #tests on ldap add operations
 class AclAddTests(AclTests):
 
@@ -1341,19 +1335,18 @@ class AclCARTests(AclTests):
         else:
             self.dsheuristics = None
 
-        res = self.ldb_admin.search(self.base_dn, scope=SCOPE_BASE, attrs=["minPwdAge"])
-        self.minPwdAge = res[0]["minPwdAge"][0]
+        self.minPwdAge = self.ldb_admin.get_minPwdAge()
 
         # Set the "dSHeuristics" to have the tests run against Windows Server
         self.set_dsheuristics("000000001")
 # Set minPwdAge to 0
-        self.set_minPwdAge("0")
+        self.ldb_admin.set_minPwdAge("0")
 
     def tearDown(self):
         super(AclCARTests, self).tearDown()
         #restore original values
         self.set_dsheuristics(self.dsheuristics)
-        self.set_minPwdAge(self.minPwdAge)
+        self.ldb_admin.set_minPwdAge(self.minPwdAge)
         self.delete_force(self.ldb_admin, self.get_user_dn(self.user_with_wp))
         self.delete_force(self.ldb_admin, self.get_user_dn(self.user_with_pc))
 
diff --git a/source4/dsdb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py
index 461d135..1512346 100755
--- a/source4/dsdb/tests/python/passwords.py
+++ b/source4/dsdb/tests/python/passwords.py
@@ -948,14 +948,9 @@ m["dSHeuristics"] = MessageElement("000000001", FLAG_MOD_REPLACE,
 ldb.modify(m)
 
 # Get the old "minPwdAge"
-res = ldb.search(base_dn, scope=SCOPE_BASE, attrs=["minPwdAge"])
-minPwdAge = res[0]["minPwdAge"][0]
-
+minPwdAge = ldb.get_minPwdAge()
 # Set it temporarely to "0"
-m = Message()
-m.dn = Dn(ldb, base_dn)
-m["minPwdAge"] = MessageElement("0", FLAG_MOD_REPLACE, "minPwdAge")
-ldb.modify(m)
+ldb.set_minPwdAge("0")
 
 runner = SubunitTestRunner()
 rc = 0
@@ -974,9 +969,6 @@ else:
 ldb.modify(m)
 
 # Reset the "minPwdAge" as it was before
-m = Message()
-m.dn = Dn(ldb, base_dn)
-m["minPwdAge"] = MessageElement(minPwdAge, FLAG_MOD_REPLACE, "minPwdAge")
-ldb.modify(m)
+ldb.set_minPwdAge(minPwdAge)
 
 sys.exit(rc)
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 61d7c3e..460c8b8 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -602,3 +602,18 @@ accountExpires: %u
 
     def get_partitions_dn(self):
         return dsdb._dsdb_get_partitions_dn(self)
+
+    def set_minPwdAge(self, value):
+        m = ldb.Message()
+        m.dn = ldb.Dn(self, self.domain_dn())
+        m["minPwdAge"] = ldb.MessageElement(value, ldb.FLAG_MOD_REPLACE, "minPwdAge")
+        self.modify(m)
+
+    def get_minPwdAge(self):
+        res = self.search(self.domain_dn(), scope=ldb.SCOPE_BASE, attrs=["minPwdAge"])
+        if len(res) == 0:
+            return None
+        elif not "minPwdAge" in res[0]:
+            return None
+        else:
+            return res[0]["minPwdAge"][0]


-- 
Samba Shared Repository