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:sam.py - uncomment/enhance some account type tests

Browse Source 
Reviewed-by: abartlet
This commit is contained in:
Matthias Dieter Wallnöfer
2011-05-23 12:52:35 +02:00
parent 2ad0100d5b
commit 11937ce5e1
1 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
source4/dsdb/tests/python/sam.py
View File

@ -1471,25 +1471,33 @@ class SamTests(unittest.TestCase):
self.assertEquals(num, ERR_OTHER) self.assertEquals(num, ERR_OTHER)
delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn) delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
# This isn't supported yet in s4 try:
# try: ldb.add({
# ldb.add({ "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
# "dn": "cn=ldaptestuser,cn=users," + self.base_dn, "objectclass": "user",
# "objectclass": "user", "userAccountControl": str(UF_SERVER_TRUST_ACCOUNT)})
# "userAccountControl": str(UF_SERVER_TRUST_ACCOUNT)}) self.fail()
# self.fail() except LdbError, (num, _):
# except LdbError, (num, _): self.assertEquals(num, ERR_OBJECT_CLASS_VIOLATION)
# self.assertEquals(num, ERR_OBJECT_CLASS_VIOLATION) delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
# delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
# try:
# try: ldb.add({
# ldb.add({ "dn": "cn=ldaptestuser,cn=users," + self.base_dn,
# "dn": "cn=ldaptestuser,cn=users," + self.base_dn, "objectclass": "user",
# "objectclass": "user", "userAccountControl": str(UF_WORKSTATION_TRUST_ACCOUNT)})
# "userAccountControl": str(UF_WORKSTATION_TRUST_ACCOUNT)}) except LdbError, (num, _):
# except LdbError, (num, _): self.assertEquals(num, ERR_OBJECT_CLASS_VIOLATION)
# self.assertEquals(num, ERR_OBJECT_CLASS_VIOLATION) delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
# delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
try:
ldb.add({
"dn": "cn=ldaptestuser,cn=users," + self.base_dn,
"objectclass": "user",
"userAccountControl": str(UF_WORKSTATION_TRUST_ACCOUNT | UF_PARTIAL_SECRETS_ACCOUNT)})
except LdbError, (num, _):
self.assertEquals(num, ERR_OBJECT_CLASS_VIOLATION)
delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
# This isn't supported yet in s4 - needs ACL module adaption # This isn't supported yet in s4 - needs ACL module adaption
# try: # try:
@ -1570,17 +1578,16 @@ class SamTests(unittest.TestCase):
except LdbError, (num, _): except LdbError, (num, _):
self.assertEquals(num, ERR_OTHER) self.assertEquals(num, ERR_OTHER)
# This isn't supported yet in s4 try:
# try: m = Message()
# m = Message() m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
# m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn) m["userAccountControl"] = MessageElement(
# m["userAccountControl"] = MessageElement( str(UF_SERVER_TRUST_ACCOUNT),
# str(UF_SERVER_TRUST_ACCOUNT), FLAG_MOD_REPLACE, "userAccountControl")
# FLAG_MOD_REPLACE, "userAccountControl") ldb.modify(m)
# ldb.modify(m) self.fail()
# self.fail() except LdbError, (num, _):
# except LdbError, (num, _): self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
# self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
m = Message() m = Message()
m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn) m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
@ -1589,6 +1596,17 @@ class SamTests(unittest.TestCase):
FLAG_MOD_REPLACE, "userAccountControl") FLAG_MOD_REPLACE, "userAccountControl")
ldb.modify(m) ldb.modify(m)
try:
m = Message()
m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
m["userAccountControl"] = MessageElement(
str(UF_WORKSTATION_TRUST_ACCOUNT | UF_PARTIAL_SECRETS_ACCOUNT),
FLAG_MOD_REPLACE, "userAccountControl")
ldb.modify(m)
self.fail()
except LdbError, (num, _):
self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
res1 = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn, res1 = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn,
scope=SCOPE_BASE, attrs=["sAMAccountType"]) scope=SCOPE_BASE, attrs=["sAMAccountType"])
self.assertTrue(len(res1) == 1) self.assertTrue(len(res1) == 1)