From: Jeremy Allison <jra@samba.org>
Date: Tue, 17 Apr 2007 02:14:28 +0000 (+0000)
Subject: r22291: Fix off-by-one in tconX parsing.
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~691
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc6ac4feac8c62cda2b6151eb648d3d5979e8a95;p=thirdparty%2Fsamba.git

r22291: Fix off-by-one in tconX parsing.
Jeremy.
---

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index eb4106b0c18..3d0f8a3ca84 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -469,13 +469,22 @@ int reply_tcon_and_X(connection_struct *conn, char *inbuf,char *outbuf,int lengt
  
 	if (global_encrypted_passwords_negotiated) {
 		password = data_blob(smb_buf(inbuf),passlen);
+		if (lp_security() == SEC_SHARE) {
+			/*
+			 * Security = share always has a pad byte
+			 * after the password.
+			 */
+			p = smb_buf(inbuf) + passlen + 1;
+		} else {
+			p = smb_buf(inbuf) + passlen;
+		}
 	} else {
 		password = data_blob(smb_buf(inbuf),passlen+1);
 		/* Ensure correct termination */
-		password.data[passlen]=0;    
+		password.data[passlen]=0;
+		p = smb_buf(inbuf) + passlen + 1;
 	}
 
-	p = smb_buf(inbuf) + passlen;
 	p += srvstr_pull_buf(inbuf, path, p, sizeof(path), STR_TERMINATE);
 
 	/*