From 520175e2275abfabfdb5a62e192c4936a6c74d35 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Tue, 16 Apr 2019 19:32:52 +0200 Subject: [PATCH] s3:mdssvc: use an early return if spotlight is not enabled. No change in behaviour, best viewed with git show -w. Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- source3/rpc_server/mdssvc/srv_mdssvc_nt.c | 50 +++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/source3/rpc_server/mdssvc/srv_mdssvc_nt.c b/source3/rpc_server/mdssvc/srv_mdssvc_nt.c index 839cd4614c2..68a05bec5ff 100644 --- a/source3/rpc_server/mdssvc/srv_mdssvc_nt.c +++ b/source3/rpc_server/mdssvc/srv_mdssvc_nt.c @@ -160,35 +160,35 @@ void _mdssvc_open(struct pipes_struct *p, struct mdssvc_open *r) if (!VALID_SNUM(snum)) { return; } + if (!lp_spotlight(snum)) { + return; + } + + DBG_DEBUG("Spotlight enabled: %s\n", r->in.share_name); + + path = lp_path(talloc_tos(), snum); + if (path == NULL) { + DBG_ERR("Couldn't create policy handle for %s\n", + r->in.share_name); + p->fault_state = DCERPC_FAULT_CANT_PERFORM; + return; + } - if (lp_spotlight(snum)) { - DBG_DEBUG("Spotlight enabled: %s\n", r->in.share_name); - - path = lp_path(talloc_tos(), snum); - if (path == NULL) { - DBG_ERR("Couldn't create policy handle for %s\n", - r->in.share_name); - p->fault_state = DCERPC_FAULT_CANT_PERFORM; - return; - } - - status = create_mdssvc_policy_handle(p->mem_ctx, p, - snum, - r->in.share_name, - path, - r->out.handle); - if (!NT_STATUS_IS_OK(status)) { - DBG_ERR("Couldn't create policy handle for %s\n", - r->in.share_name); - talloc_free(path); - p->fault_state = DCERPC_FAULT_CANT_PERFORM; - return; - } - - strlcpy(outpath, path, 1024); + status = create_mdssvc_policy_handle(p->mem_ctx, p, + snum, + r->in.share_name, + path, + r->out.handle); + if (!NT_STATUS_IS_OK(status)) { + DBG_ERR("Couldn't create policy handle for %s\n", + r->in.share_name); talloc_free(path); + p->fault_state = DCERPC_FAULT_CANT_PERFORM; + return; } + strlcpy(outpath, path, 1024); + talloc_free(path); return; } -- 2.47.2