summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-04-26 09:43:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:16:30 -0500
commit1ca61f4748283bdc9d30ddec3ec812fb830b6ac4 (patch)
tree3c769152f1d7e806a1f75b30e7b017b46c386856
parentf353704bbf6240d0c402fc4166119a5016eb640c (diff)
downloadsamba-1ca61f4748283bdc9d30ddec3ec812fb830b6ac4.tar.gz
samba-1ca61f4748283bdc9d30ddec3ec812fb830b6ac4.tar.bz2
samba-1ca61f4748283bdc9d30ddec3ec812fb830b6ac4.zip
r15266: Fix bug 3720. I wonder why -O1 compiles did not catch this...
Thanks to Jason Mader for reporting this. Volker (This used to be commit 3e616c3272ba76a2d135f7c51ceb44461ad165ad)
-rw-r--r--source3/smbd/ipc.c4
-rw-r--r--source3/smbd/nttrans.c4
-rw-r--r--source3/smbd/trans2.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 1b5a5f39c7..7f9505606c 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -433,8 +433,8 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf,
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);
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 839eb7bb27..96e2c18bc0 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -2827,8 +2827,8 @@ int reply_nttrans(connection_struct *conn,
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);
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b229807bfd..5d6de951ef 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -5154,8 +5154,8 @@ int reply_trans2(connection_struct *conn, char *inbuf,char *outbuf,
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);