s3:rpc_server: Call epmapper RPC shutdown function from server exit routines

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/rpc_server/epmd.c b/source3/rpc_server/epmd.c
index 872c48a1fbe92ce3839e9b1257347df6ba2a6c1b..2f41d22c97bee3ae1fb0137810302a0b842c9672 100644 (file)
--- a/source3/rpc_server/epmd.c
+++ b/source3/rpc_server/epmd.c
@@ -79,8 +79,6 @@ static void epmd_sig_term_handler(struct tevent_context *ev,
                                  void *siginfo,
                                  void *private_data)
 {
-       rpc_epmapper_shutdown();
-
        exit_server_cleanly("termination signal");
 }
 

diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index 5e9a2cf25c2f65949b29a2728e0134ac6cb24bad..ba5e6c7ff1e09af04f286373d2e4499abc767c74 100644 (file)
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -41,6 +41,7 @@
 #include "../librpc/gen_ndr/srv_winreg.h"
 #include "../librpc/gen_ndr/srv_wkssvc.h"
 #include "../librpc/gen_ndr/srv_fsrvp.h"
+#include "../librpc/gen_ndr/srv_epmapper.h"
 #include "printing/notify.h"
 #include "printing.h"
 #include "serverid.h"
@@ -206,6 +207,8 @@ static void exit_server_common(enum server_exit_reason how,
                rpc_lsarpc_shutdown();
 
                rpc_FileServerVssAgent_shutdown();
+
+               rpc_epmapper_shutdown();
        }
 
        /*