samba-tool dsacl: Mark old and new descriptor output correctly

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/python/samba/netcmd/dsacl.py b/python/samba/netcmd/dsacl.py
index 3a05b7610634326546f8f8d4e97f802e4c3e9a06..92570760d40e7a478089bba31d032af4c5779254 100644 (file)
--- 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):