common_aces.append(ace)
self_aces = sorted(self_aces)
if len(self_aces) > 0:
- res += 4 *" " + "ACEs found only in %s:\n" % self.con.host
+ res += 4 * " " + "ACEs found only in %s:\n" % self.con.host
for ace in self_aces:
res += 8 * " " + ace + "\n"
#
common_aces.append(ace)
other_aces = sorted(other_aces)
if len(other_aces) > 0:
- res += 4 *" " + "ACEs found only in %s:\n" % other.con.host
+ res += 4 * " " + "ACEs found only in %s:\n" % other.con.host
for ace in other_aces:
res += 8 * " " + ace + "\n"
#
common_aces = sorted(list(set(common_aces)))
if self.con.verbose:
- res += 4 *" " + "ACEs found in both:\n"
+ res += 4 * " " + "ACEs found in both:\n"
for ace in common_aces:
res += 8 * " " + ace + "\n"
return (self_aces == [] and other_aces == [], res)
res += 8 * " " + x + "\n"
self.unique_attrs.append(x)
#
- title = 4 *" " + "Attributes found only in %s:" % other.con.host
+ title = 4 * " " + "Attributes found only in %s:" % other.con.host
for x in other.attributes.keys():
if x not in self.attributes.keys() and \
not x.upper() in [q.upper() for q in self.ignore_attributes]:
while counter < len(self.dn_list) and self.two_domains:
# Use alias reference
tmp = self.dn_list[counter]
- tmp = tmp[:len(tmp) -len(self.con.base_dn)] + "${DOMAIN_DN}"
+ tmp = tmp[:len(tmp) - len(self.con.base_dn)] + "${DOMAIN_DN}"
tmp = tmp.replace("CN=%s" % self.con.domain_netbios, "CN=${DOMAIN_NETBIOS}")
if len(self.con.server_names) == 1:
for x in self.con.server_names:
s3conf.set("passdb backend", "samba_dsdb:%s" % samdb.url)
LA_sid = security.dom_sid(str(domain_sid)
- + "-" +str(security.DOMAIN_RID_ADMINISTRATOR))
+ + "-" + str(security.DOMAIN_RID_ADMINISTRATOR))
BA_sid = security.dom_sid(security.SID_BUILTIN_ADMINISTRATORS)
s4_passdb = passdb.PDB(s3conf.get("passdb backend"))
else:
return (samba.xattr_tdb, os.path.abspath(os.path.join(lp.get("state dir"), "xattr.tdb")))
else:
- raise XattrBackendError("Invalid xattr backend choice %s" %backend)
+ raise XattrBackendError("Invalid xattr backend choice %s" % backend)
def getdosinfo(lp, file):
raise TimeoutHelper.Timeout()
-def _make_cmdline(data='$', repeat=5 *1024 *1024, retcode=0):
+def _make_cmdline(data='$', repeat=(5 * 1024 * 1024), retcode=0):
"""Build a command to call gen_output.py to generate large output"""
return 'gen_output.py --data {} --repeat {} --retcode {}'.format(data, repeat, retcode)