diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-04-03 23:18:23 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-04-03 23:47:25 +0200 |
| commit | 13a6aee591e972413a522944d168257e17808ca3 (patch) | |
| tree | 8af6dfe0578bc1b0337f94a9941b8f4eba55b81b /source4/scripting/python/samba/netcmd | |
| parent | 3ec8147105267f2f890b4e605221a4347f51c644 (diff) | |
| download | samba-13a6aee591e972413a522944d168257e17808ca3.tar.gz samba-13a6aee591e972413a522944d168257e17808ca3.tar.xz samba-13a6aee591e972413a522944d168257e17808ca3.zip | |
s4-python: Remove duplicate definition of GUID_DRS_* constants.
Diffstat (limited to 'source4/scripting/python/samba/netcmd')
| -rw-r--r-- | source4/scripting/python/samba/netcmd/dsacl.py | 19 | ||||
| -rw-r--r-- | source4/scripting/python/samba/netcmd/netacl.py | 3 |
2 files changed, 10 insertions, 12 deletions
diff --git a/source4/scripting/python/samba/netcmd/dsacl.py b/source4/scripting/python/samba/netcmd/dsacl.py index d5d39aa69a..f846b26345 100644 --- a/source4/scripting/python/samba/netcmd/dsacl.py +++ b/source4/scripting/python/samba/netcmd/dsacl.py @@ -18,21 +18,22 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from samba.credentials import DONT_USE_KERBEROS import samba.getopt as options from samba.dcerpc import security -from samba import Ldb from samba.samdb import SamDB from samba.ndr import ndr_unpack, ndr_pack -from samba import GUID_DRS_ALLOCATE_RIDS, GUID_DRS_CHANGE_DOMAIN_MASTER, \ - GUID_DRS_CHANGE_INFR_MASTER, GUID_DRS_CHANGE_PDC, GUID_DRS_CHANGE_RID_MASTER, \ - GUID_DRS_CHANGE_SCHEMA_MASTER, GUID_DRS_GET_CHANGES, GUID_DRS_GET_ALL_CHANGES, \ - GUID_DRS_GET_FILTERED_ATTRIBUTES, GUID_DRS_MANAGE_TOPOLOGY, \ - GUID_DRS_MONITOR_TOPOLOGY, GUID_DRS_REPL_SYNCRONIZE, GUID_DRS_RO_REPL_SECRET_SYNC +from samba.dcerpc.security import ( + GUID_DRS_ALLOCATE_RIDS, GUID_DRS_CHANGE_DOMAIN_MASTER, + GUID_DRS_CHANGE_INFR_MASTER, GUID_DRS_CHANGE_PDC, + GUID_DRS_CHANGE_RID_MASTER, GUID_DRS_CHANGE_SCHEMA_MASTER, + GUID_DRS_GET_CHANGES, GUID_DRS_GET_ALL_CHANGES, + GUID_DRS_GET_FILTERED_ATTRIBUTES, GUID_DRS_MANAGE_TOPOLOGY, + GUID_DRS_MONITOR_TOPOLOGY, GUID_DRS_REPL_SYNCRONIZE, + GUID_DRS_RO_REPL_SECRET_SYNC) + import ldb -from ldb import SCOPE_BASE, SCOPE_SUBTREE -import os +from ldb import SCOPE_BASE import re from samba.auth import system_session diff --git a/source4/scripting/python/samba/netcmd/netacl.py b/source4/scripting/python/samba/netcmd/netacl.py index 48e353a75f..41764a56e1 100644 --- a/source4/scripting/python/samba/netcmd/netacl.py +++ b/source4/scripting/python/samba/netcmd/netacl.py @@ -19,9 +19,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -import samba.getopt as options -import os - from samba.netcmd import ( SuperCommand, ) |