From: Ralph Boehme <slow@samba.org>
Date: Tue, 20 Aug 2019 14:50:52 +0000 (+0200)
Subject: s3:mdssvc: use a helper variable for the service type
X-Git-Tag: talloc-2.3.1~435
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78a2d95511357a5ea34473e6a6d98515b4344fb5;p=thirdparty%2Fsamba.git

s3:mdssvc: use a helper variable for the service type

No change in behaviour. Simplifies a subsequent logical change.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>
---

diff --git a/source3/rpc_server/mdssvc/srv_mdssvc_nt.c b/source3/rpc_server/mdssvc/srv_mdssvc_nt.c
index aea6019e871..345e05be912 100644
--- a/source3/rpc_server/mdssvc/srv_mdssvc_nt.c
+++ b/source3/rpc_server/mdssvc/srv_mdssvc_nt.c
@@ -63,6 +63,8 @@ static bool rpc_setup_mdssvc(struct tevent_context *ev_ctx,
 	NTSTATUS status;
 	enum rpc_service_mode_e service_mode = rpc_service_mode(t->name);
 	enum rpc_daemon_type_e mdssvc_type = rpc_mdssd_daemon();
+	bool external = service_mode != RPC_SERVICE_MODE_EMBEDDED ||
+			mdssvc_type != RPC_DAEMON_EMBEDDED;
 
 	mdssvc_cb.init         = mdssvc_init_cb;
 	mdssvc_cb.shutdown     = mdssvc_shutdown_cb;
@@ -73,8 +75,7 @@ static bool rpc_setup_mdssvc(struct tevent_context *ev_ctx,
 		return false;
 	}
 
-	if (service_mode != RPC_SERVICE_MODE_EMBEDDED
-	    || mdssvc_type != RPC_DAEMON_EMBEDDED) {
+	if (external) {
 		return true;
 	}