The branch, master has been updated via 8925b03 s3-rpcecho: Only register rpcecho in the developer build. from f8275ba s4/ldapcmp: Check if creds2 is actualy set by the command line
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 8925b03b5997d9e4fff604a2417eb1f4d8958e86 Author: Andreas Schneider <a...@samba.org> Date: Tue Jan 4 16:53:33 2011 +0100 s3-rpcecho: Only register rpcecho in the developer build. Autobuild-User: Andreas Schneider <a...@samba.org> Autobuild-Date: Tue Jan 4 18:56:38 CET 2011 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/rpc_server/srv_echo_nt.c | 4 ---- source3/smbd/server.c | 2 ++ source3/smbd/server_exit.c | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/rpc_server/srv_echo_nt.c b/source3/rpc_server/srv_echo_nt.c index 87b2491..ef6204f 100644 --- 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 1b06851..1b9e793 100644 --- 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 65151a1..ca906fa 100644 --- 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(); -- Samba Shared Repository