svn commit: samba r4145 - in branches/SAMBA_4_0/source/smb_server: .

[tridge at samba.org]

Author: tridge
Date: 2004-12-11 03:39:09 +0000 (Sat, 11 Dec 2004)
New Revision: 4145

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4145

Log:
make sure we don't set the 32-bit error codes flag unless the client
can handle it, even for success packets (this bug was harmless, but
can be confusing in ethereal with old clients)

Modified:
   branches/SAMBA_4_0/source/smb_server/request.c


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/request.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/request.c	2004-12-11 00:30:28 UTC (rev 4144)
+++ branches/SAMBA_4_0/source/smb_server/request.c	2004-12-11 03:39:09 UTC (rev 4145)
@@ -108,6 +108,8 @@
 */
 void req_setup_reply(struct smbsrv_request *req, uint_t wct, uint_t buflen)
 {
+	uint16_t flags2;
+
 	if (req->chain_count != 0) {
 		req_setup_chain_reply(req, wct, buflen);
 		return;
@@ -124,6 +126,12 @@
 		return;
 	}
 
+	flags2 = FLAGS2_LONG_PATH_COMPONENTS | FLAGS2_EXTENDED_SECURITY;
+	flags2 |= (req->flags2 & FLAGS2_UNICODE_STRINGS);
+	if (req->smb_conn->negotiate.client_caps & CAP_STATUS32) {
+		flags2 |= FLAGS2_32_BIT_ERROR_CODES;
+	}
+
 	req->out.hdr = req->out.buffer + NBT_HDR_SIZE;
 	req->out.vwv = req->out.hdr + HDR_VWV;
 	req->out.wct = wct;
@@ -136,13 +144,9 @@
 	SCVAL(req->out.hdr, HDR_WCT, wct);
 	SSVAL(req->out.vwv, VWV(wct), buflen);
 
-
 	memcpy(req->out.hdr, "\377SMB", 4);
 	SCVAL(req->out.hdr,HDR_FLG, FLAG_REPLY | FLAG_CASELESS_PATHNAMES); 
-	SSVAL(req->out.hdr,HDR_FLG2, 
-	      (req->flags2 & FLAGS2_UNICODE_STRINGS) |
-	      FLAGS2_LONG_PATH_COMPONENTS | FLAGS2_32_BIT_ERROR_CODES | FLAGS2_EXTENDED_SECURITY);
-
+	SSVAL(req->out.hdr,HDR_FLG2, flags2);
 	SSVAL(req->out.hdr,HDR_PIDHIGH,0);
 	memset(req->out.hdr + HDR_SS_FIELD, 0, 10);