s3:rpc_server: Call fsrvp 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/fssd.c b/source3/rpc_server/fssd.c
index a68e2e4886434aa72143f775cfbdd64af8d93995..9e5a6110ebc1c240dc248231152616a6d9208856 100644 (file)
--- a/source3/rpc_server/fssd.c
+++ b/source3/rpc_server/fssd.c
@@ -82,8 +82,6 @@ static void fssd_sig_term_handler(struct tevent_context *ev,
                                  void *siginfo,
                                  void *private_data)
 {
-       rpc_FileServerVssAgent_shutdown();
-
        exit_server_cleanly("termination signal");
 }
 

diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index 2378c0c15ca33add48a142f4f113d2d58c1e9e16..5e9a2cf25c2f65949b29a2728e0134ac6cb24bad 100644 (file)
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -40,6 +40,7 @@
 #include "../librpc/gen_ndr/srv_svcctl.h"
 #include "../librpc/gen_ndr/srv_winreg.h"
 #include "../librpc/gen_ndr/srv_wkssvc.h"
+#include "../librpc/gen_ndr/srv_fsrvp.h"
 #include "printing/notify.h"
 #include "printing.h"
 #include "serverid.h"
@@ -203,6 +204,8 @@ static void exit_server_common(enum server_exit_reason how,
                rpc_netlogon_shutdown();
                rpc_samr_shutdown();
                rpc_lsarpc_shutdown();
+
+               rpc_FileServerVssAgent_shutdown();
        }
 
        /*