samba-tool: Added "dsacl" command

Added "dsacl" command to substitute "acl ds"

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool
index 17183cea93c1083db43db8c3f41e45be645c8bf7..51a6d64890b8280dc6d7d843f315304895c30f00 100755 (executable)
--- a/source4/scripting/bin/samba-tool
+++ b/source4/scripting/bin/samba-tool
@@ -30,6 +30,7 @@ from samba.netcmd.dbcheck import cmd_dbcheck
 from samba.netcmd.delegation import cmd_delegation
 from samba.netcmd.domain import cmd_domain
 from samba.netcmd.drs import cmd_drs
+from samba.netcmd.dsacl import cmd_dsacl
 from samba.netcmd.fsmo import cmd_fsmo
 from samba.netcmd.gpo import cmd_gpo
 from samba.netcmd.group import cmd_group
@@ -51,6 +52,7 @@ class cmd_sambatool(SuperCommand):
     subcommands["delegation"] = cmd_delegation()
     subcommands["domain"] = cmd_domain()
     subcommands["drs"] = cmd_drs()
+    subcommands["dsacl"] = cmd_dsacl()
     subcommands["fsmo"] = cmd_fsmo()
     subcommands["gpo"] = cmd_gpo()
     subcommands["group"] = cmd_group()

diff --git a/source4/scripting/python/samba/netcmd/dsacl.py b/source4/scripting/python/samba/netcmd/dsacl.py
index f4f33561b54c0a50c331b1ccec7df99cb2bcf559..d6f13c085c3336367050aab11169f49c893e84cb 100644 (file)
--- a/source4/scripting/python/samba/netcmd/dsacl.py
+++ b/source4/scripting/python/samba/netcmd/dsacl.py
@@ -45,7 +45,9 @@ from samba.netcmd import (
     Option,
     )
 
-class cmd_ds_acl_set(Command):
+
+
+class cmd_dsacl_set(Command):
     """Modify access list on a directory object"""
 
     synopsis = "set --objectdn=objectdn --car=control right --action=[deny|allow] --trusteedn=trustee-dn"
@@ -170,8 +172,8 @@ class cmd_ds_acl_set(Command):
         self.print_new_acl(samdb, objectdn)
 
 
-class cmd_ds_acl(SuperCommand):
+class cmd_dsacl(SuperCommand):
     """DS ACLs manipulation"""
 
     subcommands = {}
-    subcommands["set"] = cmd_ds_acl_set()
+    subcommands["set"] = cmd_dsacl_set()

diff --git a/source4/scripting/python/samba/netcmd/netacl.py b/source4/scripting/python/samba/netcmd/netacl.py
index a0f4cf33b1d27e6a5e58feabd2334842163e9f49..65f38753e9fe00b4a269df319a2ba527e7bbafba 100644 (file)
--- a/source4/scripting/python/samba/netcmd/netacl.py
+++ b/source4/scripting/python/samba/netcmd/netacl.py
@@ -24,11 +24,11 @@ from samba.netcmd import (
     SuperCommand,
     )
 from samba.netcmd.ntacl import cmd_nt_acl
-from samba.netcmd.dsacl import cmd_ds_acl
+from samba.netcmd.dsacl import cmd_dsacl
 
 class cmd_acl(SuperCommand):
     """NT ACLs manipulation"""
 
     subcommands = {}
     subcommands["nt"] = cmd_nt_acl()
-    subcommands["ds"] = cmd_ds_acl()
+    subcommands["ds"] = cmd_dsacl()