5 files changed, 59 insertions, 0 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 39e62cce39..c6335106a4 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1197,6 +1197,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
 	   utils/net_eventlog.o \
 	   utils/net_printing.o \
 	   utils/net_rpc_trust.o \
+	   utils/net_rpc_conf.o\
 	   $(LIBNDR_NTPRINTING_OBJ) \
 	   $(LIBNDR_PREG_OBJ) \
 	   $(LIBCLI_SPOOLSS_OBJ) \
diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index d1393f1818..c25294b174 100644
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -469,4 +469,7 @@ int net_g_lock(struct net_context *c, int argc, const char **argv);
 /* The following definitions come from utils/net_rpc_trust.c  */
 int net_rpc_trust(struct net_context *c, int argc, const char **argv);
 
+/* The following definitions come from utils/net_rpc_conf.c */
+int net_rpc_conf(struct net_context *c, int argc, const char **argv);
+
 #endif /*  _NET_PROTO_H_  */
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 6e71c56f83..04e6e687e3 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -8001,6 +8001,14 @@ int net_rpc(struct net_context *c, int argc, const char **argv)
 			N_("net rpc trust\n"
 			   "    Manage trusts")
 		},
+		{
+			"conf",
+			net_rpc_conf,
+			NET_TRANSPORT_RPC,
+			N_("Configure a remote samba server"),
+			N_("net rpc conf\n"
+			   "    Configure a remote samba server")
+		},
 		{NULL, NULL, 0, NULL, NULL}
 	};
 
diff --git a/source3/utils/net_rpc_conf.c b/source3/utils/net_rpc_conf.c
new file mode 100644
index 0000000000..e27201904a
--- /dev/null
+++ b/source3/utils/net_rpc_conf.c
@@ -0,0 +1,46 @@
+/*
+ *  Samba Unix/Linux SMB client library
+ *  Distributed SMB/CIFS Server Management Utility
+ *  Local configuration interface
+ *  Copyright (C) Vicentiu Ciorbaru 2011
+ *
+ *  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/>.
+ */
+
+/*
+ * This is an interface to Samba's configuration.
+ *
+ * This tool supports local as well as remote interaction via rpc
+ * with the configuration stored in the registry.
+ */
+
+
+#include "includes.h"
+#include "utils/net.h"
+#include "rpc_client/cli_pipe.h"
+#include "../librpc/gen_ndr/ndr_samr_c.h"
+#include "rpc_client/init_samr.h"
+#include "../librpc/gen_ndr/ndr_winreg_c.h"
+#include "../libcli/registry/util_reg.h"
+#include "rpc_client/cli_winreg.h"
+#include "../lib/smbconf/smbconf.h"
+
+
+/* function calls */
+int net_rpc_conf(struct net_context *c, int argc,
+		 const char **argv)
+{
+	return 0;
+
+}
diff --git a/source3/wscript_build b/source3/wscript_build
index 46e9a85387..cdf1958f04 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -552,6 +552,7 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               utils/net_eventlog.c
               utils/net_printing.c
               utils/net_rpc_trust.c
+	      utils/net_rpc_conf.c
               registry/reg_parse.c registry/reg_format.c
               registry/reg_parse_internal.c registry/reg_import.c
               lib/cbuf.c lib/srprs.c'''