diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-11-01 17:23:34 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-11-04 21:09:00 +0000 |
| commit | 83f78a30a05ba96e7c599d97feea24aa65cbad51 (patch) | |
| tree | f58a4a847b6f143375cf19b750e0c96c1c072b1e | |
| parent | c133fcc0b1e844103c6454b370f7cd101f09df47 (diff) | |
| download | samba-83f78a30a05ba96e7c599d97feea24aa65cbad51.tar.gz samba-83f78a30a05ba96e7c599d97feea24aa65cbad51.tar.bz2 samba-83f78a30a05ba96e7c599d97feea24aa65cbad51.zip | |
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
| -rwxr-xr-x | source4/dsdb/tests/python/ldap.py | 8 | ||||
| -rwxr-xr-x | source4/dsdb/tests/python/passwords.py | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py index 7057fb4e1e..c3a4087fdb 100755 --- 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 8f58890d18..66a6cf93ea 100755 --- 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): |