summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Lauria <lauria2@yahoo.com>2011-08-30 17:19:59 -0400
committerAndrew Bartlett <abartlet@samba.org>2011-09-09 15:24:02 +1000
commit6484e142dc673145fc12f06549d20121e615b7f0 (patch)
tree3c98757cbe2f9798b6fe6cb40a2f6e60b2add36e
parent7a609d827eca7d72258b590999ed3ccd8e476d06 (diff)
downloadsamba-6484e142dc673145fc12f06549d20121e615b7f0.tar.gz
samba-6484e142dc673145fc12f06549d20121e615b7f0.tar.bz2
samba-6484e142dc673145fc12f06549d20121e615b7f0.zip
samba-tool: Added "ntacl" command
Added "ntacl" command to substitute "acl nt" command Signed-off-by: Amitay Isaacs <amitay@gmail.com> Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-rwxr-xr-xsource4/scripting/bin/samba-tool2
-rw-r--r--source4/scripting/python/samba/netcmd/netacl.py4
-rw-r--r--source4/scripting/python/samba/netcmd/ntacl.py14
3 files changed, 13 insertions, 7 deletions
diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool
index 51a6d64890..59c0b72b13 100755
--- a/source4/scripting/bin/samba-tool
+++ b/source4/scripting/bin/samba-tool
@@ -35,6 +35,7 @@ from samba.netcmd.fsmo import cmd_fsmo
from samba.netcmd.gpo import cmd_gpo
from samba.netcmd.group import cmd_group
from samba.netcmd.ldapcmp import cmd_ldapcmp
+from samba.netcmd.ntacl import cmd_ntacl
from samba.netcmd.rodc import cmd_rodc
from samba.netcmd.spn import cmd_spn
from samba.netcmd.testparm import cmd_testparm
@@ -57,6 +58,7 @@ class cmd_sambatool(SuperCommand):
subcommands["gpo"] = cmd_gpo()
subcommands["group"] = cmd_group()
subcommands["ldapcmp"] = cmd_ldapcmp()
+ subcommands["ntacl"] = cmd_ntacl()
subcommands["rodc"] = cmd_rodc()
subcommands["spn"] = cmd_spn()
subcommands["testparm"] = cmd_testparm()
diff --git a/source4/scripting/python/samba/netcmd/netacl.py b/source4/scripting/python/samba/netcmd/netacl.py
index 65f38753e9..9138bc678a 100644
--- a/source4/scripting/python/samba/netcmd/netacl.py
+++ b/source4/scripting/python/samba/netcmd/netacl.py
@@ -23,12 +23,12 @@
from samba.netcmd import (
SuperCommand,
)
-from samba.netcmd.ntacl import cmd_nt_acl
+from samba.netcmd.ntacl import cmd_ntacl
from samba.netcmd.dsacl import cmd_dsacl
class cmd_acl(SuperCommand):
"""NT ACLs manipulation"""
subcommands = {}
- subcommands["nt"] = cmd_nt_acl()
+ subcommands["nt"] = cmd_ntacl()
subcommands["ds"] = cmd_dsacl()
diff --git a/source4/scripting/python/samba/netcmd/ntacl.py b/source4/scripting/python/samba/netcmd/ntacl.py
index d33dc9b9a6..1335644c79 100644
--- a/source4/scripting/python/samba/netcmd/ntacl.py
+++ b/source4/scripting/python/samba/netcmd/ntacl.py
@@ -37,7 +37,9 @@ from samba.netcmd import (
Option,
)
-class cmd_acl_set(Command):
+
+
+class cmd_ntacl_set(Command):
"""Set ACLs on a file"""
synopsis = "%prog set <acl> <file> [--xattr-backend=native|tdb] [--eadb-file=file] [options]"
@@ -74,7 +76,8 @@ class cmd_acl_set(Command):
raise CommandError("Unable to read domain SID from configuration files")
-class cmd_acl_get(Command):
+
+class cmd_ntacl_get(Command):
"""Set ACLs on a file"""
synopsis = "%prog get <file> [--as-sddl] [--xattr-backend=native|tdb] [--eadb-file=file] [options]"
@@ -99,10 +102,11 @@ class cmd_acl_get(Command):
acl.dump()
-class cmd_nt_acl(SuperCommand):
+
+class cmd_ntacl(SuperCommand):
"""NT ACLs manipulation"""
subcommands = {}
- subcommands["set"] = cmd_acl_set()
- subcommands["get"] = cmd_acl_get()
+ subcommands["set"] = cmd_ntacl_set()
+ subcommands["get"] = cmd_ntacl_get()