From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 20 Jun 2016 14:16:23 +0000 (+0200)
Subject: s4:librpc/rpc: don't ask for auth_length if we ask for auth data only
X-Git-Tag: samba-4.3.12~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aa85a9dfc868a2d67ba9316d78fb9e564dae9d6;p=thirdparty%2Fsamba.git

s4:librpc/rpc: don't ask for auth_length if we ask for auth data only

dcerpc_pull_auth_trailer() handles auth_length=NULL just fine.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11982

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit e05c732c6074df2524403ad7bb30eade91443525)
---

diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index ade742cae70..e6ff29b7be1 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -1414,12 +1414,10 @@ static void dcerpc_bind_recv_handler(struct rpc_request *subreq,
 
 	/* the bind_ack might contain a reply set of credentials */
 	if (pkt->auth_length != 0 && sec->tmp_auth_info.in != NULL) {
-		uint32_t auth_length;
-
 		status = dcerpc_pull_auth_trailer(pkt, sec->tmp_auth_info.mem,
 						  &pkt->u.bind_ack.auth_info,
 						  sec->tmp_auth_info.in,
-						  &auth_length, true);
+						  NULL, true);
 		if (tevent_req_nterror(req, status)) {
 			return;
 		}
@@ -2434,12 +2432,10 @@ static void dcerpc_alter_context_recv_handler(struct rpc_request *subreq,
 
 	/* the alter_resp might contain a reply set of credentials */
 	if (pkt->auth_length != 0 && sec->tmp_auth_info.in != NULL) {
-		uint32_t auth_length;
-
 		status = dcerpc_pull_auth_trailer(pkt, sec->tmp_auth_info.mem,
 						  &pkt->u.alter_resp.auth_info,
 						  sec->tmp_auth_info.in,
-						  &auth_length, true);
+						  NULL, true);
 		if (tevent_req_nterror(req, status)) {
 			return;
 		}