summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Lauria <lauria2@yahoo.com>2011-08-30 17:22:06 -0400
committerAndrew Bartlett <abartlet@samba.org>2011-09-09 15:24:02 +1000
commit62379dde2389082f17fea6fdaa3821419fdd38a3 (patch)
tree8fbe126865b8fdbd48bc92ba20f8bc09db7982be
parent6484e142dc673145fc12f06549d20121e615b7f0 (diff)
downloadsamba-62379dde2389082f17fea6fdaa3821419fdd38a3.tar.gz
samba-62379dde2389082f17fea6fdaa3821419fdd38a3.tar.bz2
samba-62379dde2389082f17fea6fdaa3821419fdd38a3.zip
samba-tool: Removed "acl" command
Removed "acl" command as it has been changed to: "dsacl" and "ntacl" 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.py34
2 files changed, 0 insertions, 36 deletions
diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool
index 59c0b72b13..2e92041076 100755
--- a/source4/scripting/bin/samba-tool
+++ b/source4/scripting/bin/samba-tool
@@ -25,7 +25,6 @@ sys.path.insert(0, "bin/python")
from samba import netcmd
from samba.netcmd import SuperCommand
-from samba.netcmd.netacl import cmd_acl
from samba.netcmd.dbcheck import cmd_dbcheck
from samba.netcmd.delegation import cmd_delegation
from samba.netcmd.domain import cmd_domain
@@ -48,7 +47,6 @@ class cmd_sambatool(SuperCommand):
"""samba-tool SuperCommand"""
subcommands = {}
- subcommands["acl"] = cmd_acl()
subcommands["dbcheck"] = cmd_dbcheck()
subcommands["delegation"] = cmd_delegation()
subcommands["domain"] = cmd_domain()
diff --git a/source4/scripting/python/samba/netcmd/netacl.py b/source4/scripting/python/samba/netcmd/netacl.py
deleted file mode 100644
index 9138bc678a..0000000000
--- a/source4/scripting/python/samba/netcmd/netacl.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-#
-# Manipulate ACLs
-#
-# Copyright (C) Matthieu Patou <mat@matws.net> 2010
-# Copyright (C) Nadezhda Ivanova <nivanova@samba.org> 2010
-# Copyright Giampaolo Lauria 2011 <lauria2@yahoo.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-from samba.netcmd import (
- SuperCommand,
- )
-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_ntacl()
- subcommands["ds"] = cmd_dsacl()