From 7a609d827eca7d72258b590999ed3ccd8e476d06 Mon Sep 17 00:00:00 2001 From: Giampaolo Lauria Date: Tue, 30 Aug 2011 17:09:53 -0400 Subject: [PATCH] samba-tool: Added "dsacl" command Added "dsacl" command to substitute "acl ds" Signed-off-by: Amitay Isaacs Signed-off-by: Andrew Bartlett --- source4/scripting/bin/samba-tool | 2 ++ source4/scripting/python/samba/netcmd/dsacl.py | 8 +++++--- source4/scripting/python/samba/netcmd/netacl.py | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool index 17183cea93c..51a6d64890b 100755 --- 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 f4f33561b54..d6f13c085c3 100644 --- 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 a0f4cf33b1d..65f38753e9f 100644 --- 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() -- 2.11.4.GIT