From: Samuel Cabrero <scabrero@suse.de>
Date: Tue, 26 Feb 2019 12:33:12 +0000 (+0100)
Subject: s3:rpc_server: Call fsrvp RPC shutdown function from server exit routines
X-Git-Tag: talloc-2.3.0~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63a39ef605176f6d6adef7dd95ae430d344a36bb;p=thirdparty%2Fsamba.git

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 a68e2e48864..9e5a6110ebc 100644
--- 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 2378c0c15ca..5e9a2cf25c2 100644
--- 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();
 	}
 
 	/*