diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-27 23:50:25 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-28 00:16:38 +1100 |
| commit | 3d8d382fe57125c1752cab85f9edcb094887b9dc (patch) | |
| tree | 55b77b5bba72536df8a8eaa8303a006fd0c3d854 | |
| parent | d06bf954ba780f915ecff2f450f0c9f4c6b79dc0 (diff) | |
| download | samba-3d8d382fe57125c1752cab85f9edcb094887b9dc.tar.gz samba-3d8d382fe57125c1752cab85f9edcb094887b9dc.tar.bz2 samba-3d8d382fe57125c1752cab85f9edcb094887b9dc.zip | |
s4-samba-tool: switched over to python version of samba-tool drs
| -rw-r--r-- | source4/samba_tool/samba_tool.c | 2 | ||||
| -rw-r--r-- | source4/samba_tool/wscript_build | 11 | ||||
| -rw-r--r-- | source4/scripting/python/samba/netcmd/__init__.py | 2 |
3 files changed, 3 insertions, 12 deletions
diff --git a/source4/samba_tool/samba_tool.c b/source4/samba_tool/samba_tool.c index fd9e0e51d3..da08a716ce 100644 --- a/source4/samba_tool/samba_tool.c +++ b/source4/samba_tool/samba_tool.c @@ -51,7 +51,6 @@ #include "lib/events/events.h" #include "auth/credentials/credentials.h" #include "scripting/python/modules.h" -#include "samba_tool/drs/drs.h" /* There's no Py_ssize_t in 2.4, apparently */ #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5 @@ -199,7 +198,6 @@ static const struct net_functable net_functable[] = { {"password", "Changes/Sets the password on a user account [server connection needed]\n", net_password, net_password_usage}, {"samdump", "dump the sam of a domain\n", net_samdump, net_samdump_usage}, {"samsync", "synchronise into the local ldb the sam of an NT4 domain\n", net_samsync_ldb, net_samsync_ldb_usage}, - {"drs", "Implements functionality offered by repadmin.exe utility in Windows\n", net_drs, net_drs_usage}, {"gpo", "Administer group policies\n", net_gpo, net_gpo_usage}, {NULL, NULL, NULL, NULL} }; diff --git a/source4/samba_tool/wscript_build b/source4/samba_tool/wscript_build index 1f5390d5c1..5b7dbc95ba 100644 --- a/source4/samba_tool/wscript_build +++ b/source4/samba_tool/wscript_build @@ -1,17 +1,8 @@ #!/usr/bin/env python -bld.SAMBA_MODULE('samba_tool_drs', - source='drs/drs.c drs/drs_bind.c drs/drs_kcc.c drs/drs_replicate.c drs/drs_showrepl.c', - autoproto='drs/drs_proto.h', - subsystem='samba-tool', - deps='LIBCLI_DRSUAPI ldb ldbsamba', - internal_module=True - ) - - bld.SAMBA_BINARY('samba-tool', source='samba_tool.c password.c vampire.c gpo.c', autoproto='proto.h', - deps='samba-hostconfig samba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS samba_tool_drs policy auth', + deps='samba-hostconfig samba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS policy auth', pyembed=True ) diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py index 8044454bb6..dafdd77c87 100644 --- a/source4/scripting/python/samba/netcmd/__init__.py +++ b/source4/scripting/python/samba/netcmd/__init__.py @@ -168,3 +168,5 @@ from samba.netcmd.join import cmd_join commands["join"] = cmd_join() from samba.netcmd.rodc import cmd_rodc commands["rodc"] = cmd_rodc() +from samba.netcmd.drs import cmd_drs +commands["drs"] = cmd_drs() |