X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source4%2Frpc_server%2Fdcesrv_auth.c;h=3a7f2420b38ad45d8e467667f24fa043b3bfd878;hb=de53ddee89a5068db3083e922b3e9652f261b239;hp=0aad3775d0bfdf08a763c279e956164a1285e900;hpb=73ebb58f2da7f3dbc0d61d68d1b28b482069b344;p=metze%2Fsamba%2Fwip.git

diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c
index 0aad3775d0bf..3a7f2420b38a 100644
--- a/source4/rpc_server/dcesrv_auth.c
+++ b/source4/rpc_server/dcesrv_auth.c
@@ -429,10 +429,15 @@ bool dcesrv_auth_response(struct dcesrv_call_state *call,
 	}
 
 	/* pad to 16 byte multiple, match win2k3 */
-	dce_conn->auth_state.auth_info->auth_pad_length = NDR_ALIGN(ndr, 16);
-	ndr_push_zero(ndr, dce_conn->auth_state.auth_info->auth_pad_length);
+	dce_conn->auth_state.auth_info->auth_pad_length =
+		(16 - (pkt->u.response.stub_and_verifier.length & 15)) & 15;
+	ndr_err = ndr_push_zero(ndr, dce_conn->auth_state.auth_info->auth_pad_length);
+	if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+		return false;
+	}
 
-	payload_length = ndr->offset - DCERPC_REQUEST_LENGTH;
+	payload_length = pkt->u.response.stub_and_verifier.length +
+		dce_conn->auth_state.auth_info->auth_pad_length;
 
 	if (dce_conn->auth_state.auth_info->auth_level == DCERPC_AUTH_LEVEL_CONNECT) {
 		status = dcesrv_connect_verifier(call,