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

netcmd/ldapcmp: make code pythonic

Browse Source 
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joe Guo
2018-11-06 22:10:55 +13:00
committed by Andrew Bartlett
parent 26f0992c24
commit 7ebbd3731d
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
python/samba/netcmd/ldapcmp.py
View File

@ -105,17 +105,14 @@ class LDAPBase(object):
res = self.ldb.search(base="OU=Domain Controllers,%s" % self.base_dn, res = self.ldb.search(base="OU=Domain Controllers,%s" % self.base_dn,
scope=SCOPE_SUBTREE, expression="(objectClass=computer)", attrs=["cn"]) scope=SCOPE_SUBTREE, expression="(objectClass=computer)", attrs=["cn"])
assert len(res) > 0 assert len(res) > 0
srv = [] return [str(x["cn"][0]) for x in res]
for x in res:
srv.append(str(x["cn"][0]))
return srv
def find_netbios(self): def find_netbios(self):
res = self.ldb.search(base="CN=Partitions,%s" % self.config_dn, res = self.ldb.search(base="CN=Partitions,%s" % self.config_dn,
scope=SCOPE_SUBTREE, attrs=["nETBIOSName"]) scope=SCOPE_SUBTREE, attrs=["nETBIOSName"])
assert len(res) > 0 assert len(res) > 0
for x in res: for x in res:
if "nETBIOSName" in x.keys(): if "nETBIOSName" in x:
return x["nETBIOSName"][0] return x["nETBIOSName"][0]
def object_exists(self, object_dn): def object_exists(self, object_dn):
@ -172,7 +169,7 @@ class LDAPBase(object):
fm = None fm = None
fvals = None fvals = None
for key in res.keys(): for key in res:
m = RE_RANGED_RESULT.match(key) m = RE_RANGED_RESULT.match(key)
if m is None: if m is None:
@ -342,10 +339,8 @@ class Descriptor(object):
common_aces = [] common_aces = []
self_aces = [] self_aces = []
other_aces = [] other_aces = []
self_dacl_list_fixed = [] self_dacl_list_fixed = [self.fix_sid(ace) for ace in self.dacl_list]
other_dacl_list_fixed = [] other_dacl_list_fixed = [other.fix_sid(ace) for ace in other.dacl_list]
[self_dacl_list_fixed.append(self.fix_sid(ace)) for ace in self.dacl_list]
[other_dacl_list_fixed.append(other.fix_sid(ace)) for ace in other.dacl_list]
for ace in self_dacl_list_fixed: for ace in self_dacl_list_fixed:
try: try:
other_dacl_list_fixed.index(ace) other_dacl_list_fixed.index(ace)
@ -589,7 +584,7 @@ class LDAPObject(object):
missing_attrs = self_unique_attrs & other_unique_attrs missing_attrs = self_unique_attrs & other_unique_attrs
title = 4 * " " + "Difference in attribute values:" title = 4 * " " + "Difference in attribute values:"
for x in self.attributes.keys(): for x in self.attributes:
if x.upper() in self.ignore_attributes or x.upper() in missing_attrs: if x.upper() in self.ignore_attributes or x.upper() in missing_attrs:
continue continue
if isinstance(self.attributes[x], list) and isinstance(other.attributes[x], list): if isinstance(self.attributes[x], list) and isinstance(other.attributes[x], list):