diff options
author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-10-31 22:39:49 +0100 |
---|---|---|
committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-11-01 12:34:51 +0100 |
commit | 02547de5f9a055723d388b3790ac9cd82d8e1895 (patch) | |
tree | 5903126457f4c7e21e2e1d5a37456c70b539ad86 /source4/dsdb/tests/python/ldap.py | |
parent | 6f2001efa53fa3a46966bde8ed0e3307bbdcf0c4 (diff) | |
download | samba-02547de5f9a055723d388b3790ac9cd82d8e1895.tar.gz samba-02547de5f9a055723d388b3790ac9cd82d8e1895.tar.bz2 samba-02547de5f9a055723d388b3790ac9cd82d8e1895.zip |
s4:ldap.py/sam.py - simplify the objectclass specifications
- For user accounts we only need to specify "user" ("person" is an inherited
objectclass)
- Don't use the brackets when we have only one objectclass specified
Diffstat (limited to 'source4/dsdb/tests/python/ldap.py')
-rwxr-xr-x | source4/dsdb/tests/python/ldap.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py index d713056776..d69824373f 100755 --- a/source4/dsdb/tests/python/ldap.py +++ b/source4/dsdb/tests/python/ldap.py @@ -1087,7 +1087,7 @@ objectClass: container self.ldb.add({ "dn": "cn=ldaptestuser2,cn=users," + self.base_dn, - "objectclass": ["user", "person"] }) + "objectclass": "user" }) ldb.rename("cn=ldaptestuser2,cn=users," + self.base_dn, "cn=ldaptestuser2,cn=users," + self.base_dn) ldb.rename("cn=ldaptestuser2,cn=users," + self.base_dn, "cn=ldaptestuser3,cn=users," + self.base_dn) @@ -1184,13 +1184,13 @@ objectClass: container self.ldb.add({ "dn": "cn=ldaptestuser5,cn=users," + self.base_dn, - "objectclass": ["user", "person"] }) + "objectclass": "user" }) ldb.rename("cn=ldaptestuser5,cn=users," + self.base_dn, "cn=ldaptestUSER5,cn=users," + self.base_dn) self.delete_force(self.ldb, "cn=ldaptestuser5,cn=users," + self.base_dn) self.ldb.add({ "dn": "cn=ldaptestuser5,cn=users," + self.base_dn, - "objectclass": ["user", "person"] }) + "objectclass": "user" }) ldb.rename("cn=ldaptestuser5,cn=Users," + self.base_dn, "cn=ldaptestUSER5,cn=users," + self.base_dn) res = ldb.search(expression="cn=ldaptestuser5") print "Found %u records" % len(res) @@ -1304,14 +1304,14 @@ objectClass: container try: ldb.add({ "dn": "cn=ldaptestuser,cn=users," + self.base_dn, - "objectclass": ["user", "person"], + "objectclass": "user", "memberOf": "cn=ldaptestgroup,cn=users," + self.base_dn}) except LdbError, (num, _): self.assertEquals(num, ERR_UNWILLING_TO_PERFORM) ldb.add({ "dn": "cn=ldaptestuser,cn=users," + self.base_dn, - "objectclass": ["user", "person"]}) + "objectclass": "user"}) m = Message() m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn) @@ -1417,7 +1417,7 @@ objectClass: container ldb.add({ "dn": "cn=ldaptestuser,cn=uSers," + self.base_dn, - "objectclass": ["user", "person"], + "objectclass": "user", "cN": "LDAPtestUSER", "givenname": "ldap", "sn": "testy"}) |