Attachment #18427 for bug #33131

View | Details | Raw Unified | Return to bug 33131
Collapse All | Expand All

Lines 89-95 Link Here

(-)netsmb//netbios.h (-1 / +1 lines)
89	#define NBNS_NMFLAG_BCAST 0x01	89	#define NBNS_NMFLAG_BCAST 0x01
90	#define NBNS_NMFLAG_RA 0x08 /* recursion available */	90	#define NBNS_NMFLAG_RA 0x08 /* recursion available */
91	#define NBNS_NMFLAG_RD 0x10 /* recursion desired */	91	#define NBNS_NMFLAG_RD 0x10 /* recursion desired */
92	#define NBNS_NMFLAG_TC 0x20 /* truncation occured */	92	#define NBNS_NMFLAG_TC 0x20 /* truncation occurred */
93	#define NBNS_NMFLAG_AA 0x40 /* authoritative answer */	93	#define NBNS_NMFLAG_AA 0x40 /* authoritative answer */
94		94
95	/*	95	/*




 */

/*
 * Common definitions and structures for SMB/CIFS protocol
 */
 
#ifndef _NETSMB_SMB_H_

 * Security mode bits
 */
#define SMB_SM_USER		0x01		/* server in the user security mode */
#define	SMB_SM_ENCRYPT		0x02		/* use challenge/response */

/*
 * NTLM capabilities

#define ERRqfull	49	/* Print queue full */
#define ERRqtoobig	50	/* Print queue full - no space */
#define ERRinvpfid	52	/* Invalid print file FID */
#define ERRsmbcmd	64	/* The server did not recognize the command */
#define ERRsrverror	65	/* The server encountered and internal error */
#define ERRfilespecs	67	/* The Fid and path name contains an invalid combination */
#define ERRbadpermits	69	/* Access mode invalid */

#define ERRtoomanyuids	90      /* Too many UIDs active on this session */
#define ERRbaduid	91	/* The UID is not known in this session */
#define ERRusempx	250	/* Temporarily unable to support Raw, use MPX mode */
#define ERRusestd	251	/* Temporarily unable to support Raw, use standard r/w */
#define ERRcontmpx	252	/* Continue in MPX mode */
#define ERRnosupport	65535	/* Invalid function */


Lines 78-85 Link Here

(-)netsmb//smb_conn.h (-3 / +3 lines)
78	#define SMBV_WIN95 0x0010 /* used to apply bugfixes for this OS */	78	#define SMBV_WIN95 0x0010 /* used to apply bugfixes for this OS */
79	#define SMBV_PRIVATE 0x0020 /* connection can be used only by creator */	79	#define SMBV_PRIVATE 0x0020 /* connection can be used only by creator */
80	#define SMBV_RECONNECTING 0x0040 /* conn is in the process of reconnection */	80	#define SMBV_RECONNECTING 0x0040 /* conn is in the process of reconnection */
81	#define SMBV_SINGLESHARE 0x0080 /* only one share connectin should be allowed */	81	#define SMBV_SINGLESHARE 0x0080 /* only one share connecting should be allowed */
82	#define SMBV_CREATE 0x0100 /* lookup for create opeartion */	82	#define SMBV_CREATE 0x0100 /* lookup for create operation */
83	/#define SMBV_FAILED 0x0200/ /* last reconnect attempt has failed */	83	/#define SMBV_FAILED 0x0200/ /* last reconnect attempt has failed */
84		84
85		85
Lines 114-120 Link Here
114	u_int16_t sv_rawmode;	114	u_int16_t sv_rawmode;
115	u_int32_t sv_maxraw; /* maximum raw-buffer size */	115	u_int32_t sv_maxraw; /* maximum raw-buffer size */
116	u_int32_t sv_skey; /* session key */	116	u_int32_t sv_skey; /* session key */
117	u_int32_t sv_caps; /* capabilites SMB_CAP_ */	117	u_int32_t sv_caps; /* capabilities SMB_CAP_ */
118	};	118	};
119		119
120	/*	120	/*




		return 0;
	}
	/*
	 * Now we have to get all subsequent responses. The CIFS specification
	 * says that they can be disordered which is weird.
	 * TODO: timo
	 */
	totpgot = totdgot = 0;

		    (error = md_get_uint16le(mdp, &pdisp)) != 0)
			break;
		if (pcount != 0 && pdisp != totpgot) {
			SMBERROR("Can't handle disordered parameters %d:%d\n",
			    pdisp, totpgot);
			error = EINVAL;
			break;

		    (error = md_get_uint16le(mdp, &ddisp)) != 0)
			break;
		if (dcount != 0 && ddisp != totdgot) {
			SMBERROR("Can't handle disordered data\n");
			error = EINVAL;
			break;
		}

Lines 119-125 Link Here

(-)netsmb//smb_rq.h (-1 / +1 lines)
119	int t2_flags; /* SMBT2_ */	119	int t2_flags; /* SMBT2_ */
120	struct mbchain t2_tparam; /* parameters to transmit */	120	struct mbchain t2_tparam; /* parameters to transmit */
121	struct mbchain t2_tdata; /* data to transmit */	121	struct mbchain t2_tdata; /* data to transmit */
122	struct mdchain t2_rparam; /* received paramters */	122	struct mdchain t2_rparam; /* received parameters */
123	struct mdchain t2_rdata; /* received data */	123	struct mdchain t2_rdata; /* received data */
124	struct smb_cred*t2_cred;	124	struct smb_cred*t2_cred;
125	struct smb_connobj *t2_source;	125	struct smb_connobj *t2_source;

Lines 132-138 Link Here

(-)netsmb//smb_trantcp.c (-1 / +1 lines)
132	if (timevalcmp(&rtv, &atv, >=)) {	132	if (timevalcmp(&rtv, &atv, >=)) {
133	/*	133	/*
134	* An event of our interest may occur during locking a process.	134	* An event of our interest may occur during locking a process.
135	* In order to avoid missing the event that occured during locking	135	* In order to avoid missing the event that occurred during locking
136	* the process, test P_SELECT and rescan file descriptors if	136	* the process, test P_SELECT and rescan file descriptors if
137	* necessary.	137	* necessary.
138	*/	138	*/

Return to bug 33131

Lines 451-458 Link Here

(-)netsmb//smb_rq.c (-4 / +4 lines)
451	return 0;	451	return 0;
452	}	452	}
453	/*	453	/*
454	* Now we have to get all subseqent responses. The CIFS specification	454	* Now we have to get all subsequent responses. The CIFS specification
455	* says that they can be misordered which is weird.	455	* says that they can be disordered which is weird.
456	* TODO: timo	456	* TODO: timo
457	*/	457	*/
458	totpgot = totdgot = 0;	458	totpgot = totdgot = 0;
Lines 479-485 Link Here
479	(error = md_get_uint16le(mdp, &pdisp)) != 0)	479	(error = md_get_uint16le(mdp, &pdisp)) != 0)
480	break;	480	break;
481	if (pcount != 0 && pdisp != totpgot) {	481	if (pcount != 0 && pdisp != totpgot) {
482	SMBERROR("Can't handle misordered parameters %d:%d\n",	482	SMBERROR("Can't handle disordered parameters %d:%d\n",
483	pdisp, totpgot);	483	pdisp, totpgot);
484	error = EINVAL;	484	error = EINVAL;
485	break;	485	break;
Lines 489-495 Link Here
489	(error = md_get_uint16le(mdp, &ddisp)) != 0)	489	(error = md_get_uint16le(mdp, &ddisp)) != 0)
490	break;	490	break;
491	if (dcount != 0 && ddisp != totdgot) {	491	if (dcount != 0 && ddisp != totdgot) {
492	SMBERROR("Can't handle misordered data\n");	492	SMBERROR("Can't handle disordered data\n");
493	error = EINVAL;	493	error = EINVAL;
494	break;	494	break;
495	}	495	}

Lines 33-39 Link Here

(-)netsmb//smb.h (-4 / +4 lines)
33	*/	33	*/
34		34
35	/*	35	/*
36	* Common definintions and structures for SMB/CIFS protocol	36	* Common definitions and structures for SMB/CIFS protocol
37	*/	37	*/
38		38
39	#ifndef _NETSMB_SMB_H_	39	#ifndef _NETSMB_SMB_H_
Lines 97-103 Link Here
97	* Security mode bits	97	* Security mode bits
98	*/	98	*/
99	#define SMB_SM_USER 0x01 /* server in the user security mode */	99	#define SMB_SM_USER 0x01 /* server in the user security mode */
100	#define SMB_SM_ENCRYPT 0x02 /* use challenge/responce */	100	#define SMB_SM_ENCRYPT 0x02 /* use challenge/response */
101		101
102	/*	102	/*
103	* NTLM capabilities	103	* NTLM capabilities
Lines 336-342 Link Here
336	#define ERRqfull 49 /* Print queue full */	336	#define ERRqfull 49 /* Print queue full */
337	#define ERRqtoobig 50 /* Print queue full - no space */	337	#define ERRqtoobig 50 /* Print queue full - no space */
338	#define ERRinvpfid 52 /* Invalid print file FID */	338	#define ERRinvpfid 52 /* Invalid print file FID */
339	#define ERRsmbcmd 64 /* The server did not recognise the command */	339	#define ERRsmbcmd 64 /* The server did not recognize the command */
340	#define ERRsrverror 65 /* The server encountered and internal error */	340	#define ERRsrverror 65 /* The server encountered and internal error */
341	#define ERRfilespecs 67 /* The Fid and path name contains an invalid combination */	341	#define ERRfilespecs 67 /* The Fid and path name contains an invalid combination */
342	#define ERRbadpermits 69 /* Access mode invalid */	342	#define ERRbadpermits 69 /* Access mode invalid */
Lines 350-356 Link Here
350	#define ERRtoomanyuids 90 /* Too many UIDs active on this session */	350	#define ERRtoomanyuids 90 /* Too many UIDs active on this session */
351	#define ERRbaduid 91 /* The UID is not known in this session */	351	#define ERRbaduid 91 /* The UID is not known in this session */
352	#define ERRusempx 250 /* Temporarily unable to support Raw, use MPX mode */	352	#define ERRusempx 250 /* Temporarily unable to support Raw, use MPX mode */
353	#define ERRusestd 251 /* Temporarily unable to support Raw, use stdandard r/w */	353	#define ERRusestd 251 /* Temporarily unable to support Raw, use standard r/w */
354	#define ERRcontmpx 252 /* Continue in MPX mode */	354	#define ERRcontmpx 252 /* Continue in MPX mode */
355	#define ERRnosupport 65535 /* Invalid function */	355	#define ERRnosupport 65535 /* Invalid function */
356		356