sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

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

Browse Source 
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Thu Nov  4 21:09:00 UTC 2010 on sn-devel-104
This commit is contained in:
Matthias Dieter Wallnöfer
2010-11-01 17:23:34 +01:00
parent c133fcc0b1
commit 83f78a30a0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source4/dsdb/tests/python/ldap.py
View File

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

6
source4/dsdb/tests/python/passwords.py
View File

@ -83,7 +83,7 @@ class PasswordTests(samba.tests.TestCase):
self.delete_force(self.ldb, "cn=testuser,cn=users," + self.base_dn) self.delete_force(self.ldb, "cn=testuser,cn=users," + self.base_dn)
self.ldb.add({ self.ldb.add({
"dn": "cn=testuser,cn=users," + self.base_dn, "dn": "cn=testuser,cn=users," + self.base_dn,
"objectclass": ["user", "person"], "objectclass": "user",
"sAMAccountName": "testuser"}) "sAMAccountName": "testuser"})
# Tests a password change when we don't have any password yet with a # 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.delete_force(self.ldb, "cn=testuser2,cn=users," + self.base_dn)
self.ldb.add({ self.ldb.add({
"dn": "cn=testuser2,cn=users," + self.base_dn, "dn": "cn=testuser2,cn=users," + self.base_dn,
"objectclass": ["user", "person"], "objectclass": "user",
"userPassword": ["thatsAcomplPASS1", "thatsAcomplPASS2"] }) "userPassword": ["thatsAcomplPASS1", "thatsAcomplPASS2"] })
# This surprisingly should work # This surprisingly should work
self.delete_force(self.ldb, "cn=testuser2,cn=users," + self.base_dn) self.delete_force(self.ldb, "cn=testuser2,cn=users," + self.base_dn)
self.ldb.add({ self.ldb.add({
"dn": "cn=testuser2,cn=users," + self.base_dn, "dn": "cn=testuser2,cn=users," + self.base_dn,
"objectclass": ["user", "person"], "objectclass": "user",
"userPassword": ["thatsAcomplPASS1", "thatsAcomplPASS1"] }) "userPassword": ["thatsAcomplPASS1", "thatsAcomplPASS1"] })
def tearDown(self): def tearDown(self):