sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

s4:dsdb:tests: Remove unused variables

Browse Source 
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton 2023-10-02 14:25:16 +13:00 committed by Andrew Bartlett
parent 079306cf34
commit 1513a4592c
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/dsdb/tests/python/priv_attrs.py
View File

@ -230,9 +230,7 @@ class PrivAttrsTests(samba.tests.TestCase):
def add_computer_ldap(self, computername, others=None, samdb=None):
dn = "CN=%s,%s" % (computername, self.test_ou)
domainname = ldb.Dn(samdb, samdb.domain_dn()).canonical_str().replace("/", "")
samaccountname = "%s$" % computername
dnshostname = "%s.%s" % (computername, domainname)
msg_dict = {
"dn": dn,
"objectclass": "computer"}
@ -252,7 +250,6 @@ class PrivAttrsTests(samba.tests.TestCase):
def add_user_ldap(self, username, others=None, samdb=None):
dn = "CN=%s,%s" % (username, self.test_ou)
domainname = ldb.Dn(samdb, samdb.domain_dn()).canonical_str().replace("/", "")
samaccountname = "%s$" % username
msg_dict = {
"dn": dn,

13
source4/dsdb/tests/python/user_account_control.py
View File

@ -199,9 +199,7 @@ class UserAccountControlTests(samba.tests.TestCase):
if samdb is None:
samdb = self.samdb
dn = "CN=%s,%s" % (computername, self.OU)
domainname = ldb.Dn(self.samdb, self.samdb.domain_dn()).canonical_str().replace("/", "")
samaccountname = "%s$" % computername
dnshostname = "%s.%s" % (computername, domainname)
msg_dict = {
"dn": dn,
"objectclass": "computer"}
@ -311,7 +309,6 @@ class UserAccountControlTests(samba.tests.TestCase):
user_sid = self.sd_utils.get_object_sid(self.unpriv_user_dn)
mod = f"(OA;CI;WDCC;{dsdb.DS_GUID_SCHEMA_CLASS_COMPUTER};;{user_sid})"
old_sd = self.sd_utils.read_sd_on_dn(self.OU)
self.sd_utils.dacl_add_ace(self.OU, mod)
computername = self.computernames[0]
@ -391,8 +388,6 @@ class UserAccountControlTests(samba.tests.TestCase):
user_sid = self.sd_utils.get_object_sid(self.unpriv_user_dn)
mod = "(OA;;CC;bf967a86-0de6-11d0-a285-00aa003049e2;;%s)" % str(user_sid)
old_sd = self.sd_utils.read_sd_on_dn(self.OU)
self.sd_utils.dacl_add_ace(self.OU, mod)
computername = self.computernames[0]
@ -449,7 +444,6 @@ class UserAccountControlTests(samba.tests.TestCase):
user_sid = self.sd_utils.get_object_sid(self.unpriv_user_dn)
mod = f"(OA;CI;CC;{dsdb.DS_GUID_SCHEMA_CLASS_COMPUTER};;{user_sid})"
old_sd = self.sd_utils.read_sd_on_dn(self.OU)
self.sd_utils.dacl_add_ace(self.OU, mod)
computername = self.computernames[0]
@ -554,8 +548,6 @@ class UserAccountControlTests(samba.tests.TestCase):
# non-ACL userAccountControl rules
mod = f"(OA;CI;WP;;;{user_sid})(OA;;CC;;;{user_sid})"
old_sd = self.sd_utils.read_sd_on_dn(self.OU)
self.sd_utils.dacl_add_ace(self.OU, mod)
# We want to start with UF_NORMAL_ACCOUNT, so we make a user
@ -620,8 +612,6 @@ class UserAccountControlTests(samba.tests.TestCase):
# non-ACL userAccountControl rules
mod = f"(OA;CI;WP;;;{user_sid})(OA;;CC;;;{user_sid})"
old_sd = self.sd_utils.read_sd_on_dn(self.OU)
self.sd_utils.dacl_add_ace(self.OU, mod)
computername = self.computernames[0]
@ -821,8 +811,6 @@ class UserAccountControlTests(samba.tests.TestCase):
user_sid = self.sd_utils.get_object_sid(self.unpriv_user_dn)
mod = "(OA;;CC;bf967a86-0de6-11d0-a285-00aa003049e2;;%s)" % str(user_sid)
old_sd = self.sd_utils.read_sd_on_dn(self.OU)
self.sd_utils.dacl_add_ace(self.OU, mod)
invalid_bits = set([UF_TEMP_DUPLICATE_ACCOUNT])
@ -888,7 +876,6 @@ class UserAccountControlTests(samba.tests.TestCase):
ace_cc = f"(OA;;CC;{dsdb.DS_GUID_SCHEMA_CLASS_COMPUTER};;{user_sid})"
ace_wp_dnshostname = f"(OA;CI;WP;{dsdb.DS_GUID_SCHEMA_ATTR_DNS_HOST_NAME};;{user_sid})"
ace_wp_primarygroupid = f"(OA;CI;WP;{dsdb.DS_GUID_SCHEMA_ATTR_PRIMARY_GROUP_ID};;{user_sid})"
old_sd = self.sd_utils.read_sd_on_dn(self.OU)
mod = ace_cc + ace_wp_dnshostname + ace_wp_primarygroupid
self.sd_utils.dacl_add_ace(self.OU, mod)