s4:ldap.py/passwords.py - just use objectclass "user" for users

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Thu Nov  4 21:09:00 UTC 2010 on sn-devel-104

diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index 7057fb4e1e9f74e285b4e20fce14356753b27644..c3a4087fdbeb3b247635287d4b61602efd22a82a 100755 (executable)
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -1636,7 +1636,7 @@ servicePrincipalName: host/ldaptest2computer29
         self.delete_force(self.ldb, "cn=ldaptestuser2,cn=users," + self.base_dn)
         ldb.add({
             "dn": "cn=ldaptestuser2,cn=useRs," + self.base_dn,
-            "objectClass": ["person", "user"],
+            "objectClass": "user",
             "cn": "LDAPtestUSER2",
             "givenname": "testy",
             "sn": "ldap user2"})
@@ -1782,7 +1782,7 @@ servicePrincipalName: host/ldaptest2computer29
         # ensure we cannot add it again
         try:
             ldb.add({"dn": "cn=ldaptestuser3,cn=userS," + self.base_dn,
-                      "objectClass": ["person", "user"],
+                      "objectClass": "user",
                       "cn": "LDAPtestUSER3"})
             self.fail()
         except LdbError, (num, _):
@@ -1801,7 +1801,7 @@ servicePrincipalName: host/ldaptest2computer29
 
         # ensure can now use that name
         ldb.add({"dn": "cn=ldaptestuser3,cn=users," + self.base_dn,
-                      "objectClass": ["person", "user"],
+                      "objectClass": "user",
                       "cn": "LDAPtestUSER3"})
 
         # ensure we now cannot rename
@@ -1830,7 +1830,7 @@ servicePrincipalName: host/ldaptest2computer29
                  "objectClass": "container"})
 
         ldb.add({"dn": "CN=ldaptestuser4,CN=ldaptestcontainer," + self.base_dn,
-                 "objectClass": ["person", "user"],
+                 "objectClass": "user",
                  "cn": "LDAPtestUSER4"})
 
         ldb.modify_ldif("""

diff --git a/source4/dsdb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py
index 8f58890d18b17c55c2c7f9f1c6d0498ea499c1f1..66a6cf93eac10e3f307d077bab4a9c2880397399 100755 (executable)
--- a/source4/dsdb/tests/python/passwords.py
+++ b/source4/dsdb/tests/python/passwords.py
@@ -83,7 +83,7 @@ class PasswordTests(samba.tests.TestCase):
         self.delete_force(self.ldb, "cn=testuser,cn=users," + self.base_dn)
         self.ldb.add({
              "dn": "cn=testuser,cn=users," + self.base_dn,
-             "objectclass": ["user", "person"],
+             "objectclass": "user",
              "sAMAccountName": "testuser"})
 
         # Tests a password change when we don't have any password yet with a
@@ -637,14 +637,14 @@ userPassword: thatsAcomplPASS4
         self.delete_force(self.ldb, "cn=testuser2,cn=users," + self.base_dn)
         self.ldb.add({
              "dn": "cn=testuser2,cn=users," + self.base_dn,
-             "objectclass": ["user", "person"],
+             "objectclass": "user",
              "userPassword": ["thatsAcomplPASS1", "thatsAcomplPASS2"] })
 
         # This surprisingly should work
         self.delete_force(self.ldb, "cn=testuser2,cn=users," + self.base_dn)
         self.ldb.add({
              "dn": "cn=testuser2,cn=users," + self.base_dn,
-             "objectclass": ["user", "person"],
+             "objectclass": "user",
              "userPassword": ["thatsAcomplPASS1", "thatsAcomplPASS1"] })
 
     def tearDown(self):