summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorGiampaolo Lauria <lauria2@yahoo.com>2011-08-30 17:09:53 -0400
committerAndrew Bartlett <abartlet@samba.org>2011-09-09 15:24:02 +1000
commit7a609d827eca7d72258b590999ed3ccd8e476d06 (patch)
tree55dc00f382e8e7f7b28887343336489a55b5a3b7 /source4/scripting
parent1a6a626a45107c7b3451ac0d33dd1b6d214dab97 (diff)
downloadsamba-7a609d827eca7d72258b590999ed3ccd8e476d06.tar.gz
samba-7a609d827eca7d72258b590999ed3ccd8e476d06.tar.bz2
samba-7a609d827eca7d72258b590999ed3ccd8e476d06.zip
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>
Diffstat (limited to 'source4/scripting')
-rwxr-xr-xsource4/scripting/bin/samba-tool2
-rw-r--r--source4/scripting/python/samba/netcmd/dsacl.py8
-rw-r--r--source4/scripting/python/samba/netcmd/netacl.py4
3 files changed, 9 insertions, 5 deletions
diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool
index 17183cea93..51a6d64890 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 f4f33561b5..d6f13c085c 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 a0f4cf33b1..65f38753e9 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()