From: Andrew Bartlett Date: Thu, 21 Feb 2019 02:33:01 +0000 (+1300) Subject: samba-tool dsacl: Mark old and new descriptor output correctly X-Git-Tag: ldb-1.6.1~48 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8431cd40c23c079f92083985fda784cd38159df3;p=thirdparty%2Fsamba.git samba-tool dsacl: Mark old and new descriptor output correctly Signed-off-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- diff --git a/python/samba/netcmd/dsacl.py b/python/samba/netcmd/dsacl.py index 3a05b761063..92570760d40 100644 --- a/python/samba/netcmd/dsacl.py +++ b/python/samba/netcmd/dsacl.py @@ -131,10 +131,13 @@ class cmd_dsacl_set(Command): desc = security.descriptor.from_sddl(desc_sddl, self.get_domain_sid(samdb)) self.modify_descriptor(samdb, object_dn, desc) - def print_new_acl(self, samdb, object_dn): + def print_acl(self, samdb, object_dn, new=False): desc = self.read_descriptor(samdb, object_dn) desc_sddl = desc.as_sddl(self.get_domain_sid(samdb)) - self.outf.write("new descriptor for %s:\n" % object_dn) + if new: + self.outf.write("new descriptor for %s:\n" % object_dn) + else: + self.outf.write("old descriptor for %s:\n" % object_dn) self.outf.write(desc_sddl + "\n") def run(self, car, action, objectdn, trusteedn, sddl, @@ -172,9 +175,9 @@ class cmd_dsacl_set(Command): else: raise CommandError("Wrong argument '%s'!" % action) - self.print_new_acl(samdb, objectdn) + self.print_acl(samdb, objectdn) self.add_ace(samdb, objectdn, new_ace) - self.print_new_acl(samdb, objectdn) + self.print_acl(samdb, objectdn, new=True) class cmd_dsacl_get(Command):