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)

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 1b5a5f39c72b82ee700eeab6c925e1a8c9f817b0..7f9505606ccdb99bbc0e854682eeedaccd7485ab 100644 (file)
--- 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 839eb7bb279813fbe72e4b9c6bb5bbc7023429f8..96e2c18bc003c7fa26390dece6f2f8f0590e862c 100644 (file)
--- 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 b229807bfdc48676893bcdeaa5938c3ea3345198..5d6de951ef5bdd2ea930515a79c32137739ecbda 100644 (file)
--- 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);