s4-samba-tool: switched over to python version of samba-tool drs

diff --git a/source4/samba_tool/samba_tool.c b/source4/samba_tool/samba_tool.c
index fd9e0e51d374279b94730e3859410ed0e81d0bfb..da08a716ce111a1fde1c24f6e5106b712433a4b7 100644 (file)
--- 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 1f5390d5c13a26c70272d0b95820e2b6ac9aaa5e..5b7dbc95bac13541e08463b81e34dce8e8c78a64 100644 (file)
--- 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 8044454bb60dc44d98fed2b8f3c236f389b9b2ae..dafdd77c87f98b6d0af516535bcae61018ed127a 100644 (file)
--- 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()