Author: vlendec Date: 2006-04-26 09:43:39 +0000 (Wed, 26 Apr 2006) New Revision: 15266
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15266 Log: Fix bug 3720. I wonder why -O1 compiles did not catch this... Thanks to Jason Mader for reporting this. Volker Modified: branches/SAMBA_3_0/source/smbd/ipc.c branches/SAMBA_3_0/source/smbd/nttrans.c branches/SAMBA_3_0/source/smbd/trans2.c trunk/source/smbd/ipc.c trunk/source/smbd/nttrans.c trunk/source/smbd/trans2.c Changeset: Modified: branches/SAMBA_3_0/source/smbd/ipc.c =================================================================== --- branches/SAMBA_3_0/source/smbd/ipc.c 2006-04-26 08:29:53 UTC (rev 15265) +++ branches/SAMBA_3_0/source/smbd/ipc.c 2006-04-26 09:43:39 UTC (rev 15266) @@ -433,8 +433,8 @@ START_PROFILE(SMBtrans); - if (!NT_STATUS_IS_OK(allow_new_trans(conn->pending_trans, - SVAL(inbuf, smb_mid)))) { + result = allow_new_trans(conn->pending_trans, SVAL(inbuf, smb_mid)); + if (!NT_STATUS_IS_OK(result)) { DEBUG(2, ("Got invalid trans request: %s\n", nt_errstr(result))); END_PROFILE(SMBtrans); Modified: branches/SAMBA_3_0/source/smbd/nttrans.c =================================================================== --- branches/SAMBA_3_0/source/smbd/nttrans.c 2006-04-26 08:29:53 UTC (rev 15265) +++ branches/SAMBA_3_0/source/smbd/nttrans.c 2006-04-26 09:43:39 UTC (rev 15266) @@ -2827,8 +2827,8 @@ return ERROR_DOS(ERRSRV,ERRaccess); } - if (!NT_STATUS_IS_OK(allow_new_trans(conn->pending_trans, - SVAL(inbuf, smb_mid)))) { + result = allow_new_trans(conn->pending_trans, SVAL(inbuf, smb_mid)); + if (!NT_STATUS_IS_OK(result)) { DEBUG(2, ("Got invalid nttrans request: %s\n", nt_errstr(result))); END_PROFILE(SMBnttrans); return ERROR_NT(result); Modified: branches/SAMBA_3_0/source/smbd/trans2.c =================================================================== --- branches/SAMBA_3_0/source/smbd/trans2.c 2006-04-26 08:29:53 UTC (rev 15265) +++ branches/SAMBA_3_0/source/smbd/trans2.c 2006-04-26 09:43:39 UTC (rev 15266) @@ -5154,8 +5154,8 @@ START_PROFILE(SMBtrans2); - if (!NT_STATUS_IS_OK(allow_new_trans(conn->pending_trans, - SVAL(inbuf, smb_mid)))) { + result = allow_new_trans(conn->pending_trans, SVAL(inbuf, smb_mid)); + if (!NT_STATUS_IS_OK(result)) { DEBUG(2, ("Got invalid trans2 request: %s\n", nt_errstr(result))); END_PROFILE(SMBtrans2); Modified: trunk/source/smbd/ipc.c =================================================================== --- trunk/source/smbd/ipc.c 2006-04-26 08:29:53 UTC (rev 15265) +++ trunk/source/smbd/ipc.c 2006-04-26 09:43:39 UTC (rev 15266) @@ -433,8 +433,8 @@ START_PROFILE(SMBtrans); - if (!NT_STATUS_IS_OK(allow_new_trans(conn->pending_trans, - SVAL(inbuf, smb_mid)))) { + result = allow_new_trans(conn->pending_trans, SVAL(inbuf, smb_mid)); + if (!NT_STATUS_IS_OK(result)) { DEBUG(2, ("Got invalid trans request: %s\n", nt_errstr(result))); END_PROFILE(SMBtrans); Modified: trunk/source/smbd/nttrans.c =================================================================== --- trunk/source/smbd/nttrans.c 2006-04-26 08:29:53 UTC (rev 15265) +++ trunk/source/smbd/nttrans.c 2006-04-26 09:43:39 UTC (rev 15266) @@ -2827,8 +2827,8 @@ return ERROR_DOS(ERRSRV,ERRaccess); } - if (!NT_STATUS_IS_OK(allow_new_trans(conn->pending_trans, - SVAL(inbuf, smb_mid)))) { + result = allow_new_trans(conn->pending_trans, SVAL(inbuf, smb_mid)); + if (!NT_STATUS_IS_OK(result)) { DEBUG(2, ("Got invalid nttrans request: %s\n", nt_errstr(result))); END_PROFILE(SMBnttrans); return ERROR_NT(result); Modified: trunk/source/smbd/trans2.c =================================================================== --- trunk/source/smbd/trans2.c 2006-04-26 08:29:53 UTC (rev 15265) +++ trunk/source/smbd/trans2.c 2006-04-26 09:43:39 UTC (rev 15266) @@ -5154,8 +5154,8 @@ START_PROFILE(SMBtrans2); - if (!NT_STATUS_IS_OK(allow_new_trans(conn->pending_trans, - SVAL(inbuf, smb_mid)))) { + result = allow_new_trans(conn->pending_trans, SVAL(inbuf, smb_mid)); + if (!NT_STATUS_IS_OK(result)) { DEBUG(2, ("Got invalid trans2 request: %s\n", nt_errstr(result))); END_PROFILE(SMBtrans2);
