Commit 99d8aa8b authored by Herb Lewis's avatar Herb Lewis Committed by Gerald (Jerry) Carter
Browse files

r814: conn is 0 during ioctl (at least during smbtorture IOCTL test) 

fix smbd panic
(This used to be commit 61da0bb1f6ea22df78ea7bd22a740c5868f62591)
parent 331d4fc5

source3/smbd/process.c

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize 
		uint16 session_tag = (lp_security() == SEC_SHARE) ? UID_FIELD_INVALID : SVAL(inbuf,smb_uid);

		connection_struct *conn = conn_find(SVAL(inbuf,smb_tid));



		DEBUG(3,("switch message %s (pid %d)\n",smb_fn_name(type),(int)pid));

		DEBUG(3,("switch message %s (pid %d) conn 0x%x\n",smb_fn_name(type),(int)pid,(unsigned int)conn));



		smb_dump(smb_fn_name(type), 1, inbuf, size);

		if(global_oplock_break) {

source3/smbd/reply.c

+3 −1
Original line number Diff line number Diff line
@@ -489,7 +489,9 @@ int reply_ioctl(connection_struct *conn, 
			}

			SSVAL(p,0,fsp->rap_print_jobid);             /* Job number */

			srvstr_push(outbuf, p+2, global_myname(), 15, STR_TERMINATE|STR_ASCII);

			if (conn) {

				srvstr_push(outbuf, p+18, lp_servicename(SNUM(conn)), 13, STR_TERMINATE|STR_ASCII);

			}

			break;

		}

	}