From: Volker Lendecke <vl@samba.org>
Date: Wed, 20 Mar 2019 12:45:32 +0000 (+0100)
Subject: rpc_server: Simplify make_server_pipes_struct
X-Git-Tag: tdb-1.4.1~642
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1220f69caba5d5aa4ded0cd09d8a1af4fd13bfa7;p=thirdparty%2Fsamba.git

rpc_server: Simplify make_server_pipes_struct

Do an early return on error

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 36dff114f90..0086fea48a4 100644
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -57,16 +57,17 @@ int make_server_pipes_struct(TALLOC_CTX *mem_ctx,
 		return -1;
 	}
 
-	if (session_info->unix_token && session_info->unix_info && session_info->security_token) {
-		/* Don't call create_local_token(), we already have the full details here */
-		p->session_info = talloc_steal(p, session_info);
-
-	} else {
-		DEBUG(0, ("Supplied session_info in make_server_pipes_struct was incomplete!"));
+	if ((session_info->unix_token == NULL) ||
+	    (session_info->unix_info == NULL) ||
+	    (session_info->security_token == NULL)) {
+		DBG_ERR("Supplied session_info was incomplete!\n");
 		*perrno = EINVAL;
 		return -1;
 	}
 
+	/* Don't call create_local_token(), we already have the full details here */
+	p->session_info = talloc_steal(p, session_info);
+
 	*_p = p;
 	return 0;
 }