From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 4 Jun 2012 14:26:27 +0000 (+0200)
Subject: s3:libsmb: use inhdr instead of inbuf in tree connect related functions
X-Git-Tag: tevent-0.9.16~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b5d4d4267fe00578124c076cd1c7d0038765fa1;p=thirdparty%2Fsamba.git

s3:libsmb: use inhdr instead of inbuf in tree connect related functions

metze
---

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 520dc437151..9ddfe9501cb 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2413,7 +2413,7 @@ static void cli_tcon_andx_done(struct tevent_req *subreq)
 		req, struct cli_tcon_andx_state);
 	struct cli_state *cli = state->cli;
 	uint8_t *in;
-	char *inbuf;
+	uint8_t *inhdr;
 	uint8_t wct;
 	uint16_t *vwv;
 	uint32_t num_bytes;
@@ -2428,12 +2428,12 @@ static void cli_tcon_andx_done(struct tevent_req *subreq)
 		return;
 	}
 
-	inbuf = (char *)in;
+	inhdr = in + NBT_HDR_SIZE;
 
 	if (num_bytes) {
 		if (clistr_pull_talloc(cli,
-				inbuf,
-				SVAL(inbuf, smb_flg2),
+				(const char *)inhdr,
+				SVAL(inhdr, HDR_FLG2),
 				&cli->dev,
 				bytes,
 				num_bytes,
@@ -2465,7 +2465,7 @@ static void cli_tcon_andx_done(struct tevent_req *subreq)
 		cli->dfsroot = ((SVAL(vwv+2, 0) & SMB_SHARE_IN_DFS) != 0);
 	}
 
-	cli->smb1.tid = SVAL(inbuf,smb_tid);
+	cli->smb1.tid = SVAL(inhdr, HDR_TID);
 	tevent_req_done(req);
 }