s3-rpcecho: Only register rpcecho in the developer build.

Autobuild-User: Andreas Schneider <asn@samba.org>
Autobuild-Date: Tue Jan  4 18:56:38 CET 2011 on sn-devel-104

diff --git a/source3/rpc_server/srv_echo_nt.c b/source3/rpc_server/srv_echo_nt.c
index 87b2491e36d2a4eeb3ded6241a67fd2976dea3b5..ef6204f4c42d5a0a04a4e072e1d6cccad036475f 100644 (file)
--- a/source3/rpc_server/srv_echo_nt.c
+++ b/source3/rpc_server/srv_echo_nt.c
@@ -24,8 +24,6 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_echo.h"
 
-#ifdef DEVELOPER
-
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
@@ -121,5 +119,3 @@ uint16 _echo_TestDoublePointer(struct pipes_struct *p, struct echo_TestDoublePoi
        p->rng_fault_state = True;
        return 0;
 }
-
-#endif /* DEVELOPER */

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 1b06851114be14f9da65e05a9d6355e2953a1341..1b9e793e4c5eab493761ba524a868ed38c3d6ebb 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1225,9 +1225,11 @@ extern void build_options(bool screen);
        if (!NT_STATUS_IS_OK(rpc_netdfs_init(NULL))) {
                exit(1);
        }
+#ifdef DEVELOPER
        if (!NT_STATUS_IS_OK(rpc_rpcecho_init(NULL))) {
                exit(1);
        }
+#endif
        if (!NT_STATUS_IS_OK(rpc_dssetup_init(NULL))) {
                exit(1);
        }

diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index 65151a108cf6314181d1aadd6f7ff9b8df04a53f..ca906fad4d4ca56ea96a915cde20578cc442816e 100644 (file)
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -131,7 +131,9 @@ static void exit_server_common(enum server_exit_reason how,
        if (am_parent) {
                rpc_wkssvc_shutdown();
                rpc_dssetup_shutdown();
+#ifdef DEVELOPER
                rpc_rpcecho_shutdown();
+#endif
                rpc_netdfs_shutdown();
                rpc_initshutdown_shutdown();
                rpc_eventlog_shutdown();