]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbd: Use smb1cli_is_andx_req()
authorVolker Lendecke <vl@samba.org>
Thu, 30 May 2019 08:01:34 +0000 (10:01 +0200)
committerJeremy Allison <jra@samba.org>
Tue, 18 Jun 2019 12:53:59 +0000 (12:53 +0000)
We have two implementations of this -- use the one from common libs

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/smbd/process.c

index 2842c98458c400e1ef02081b613c769083586471..177cb3cc5056b325da87d80c1d8893f237fa912d 100644 (file)
@@ -2104,7 +2104,7 @@ static bool find_andx_cmd_ofs(uint8_t *buf, size_t *pofs)
 
        cmd = CVAL(buf, smb_com);
 
-       if (!is_andx_req(cmd)) {
+       if (!smb1cli_is_andx_req(cmd)) {
                return false;
        }
 
@@ -2112,7 +2112,7 @@ static bool find_andx_cmd_ofs(uint8_t *buf, size_t *pofs)
 
        while (CVAL(buf, ofs) != 0xff) {
 
-               if (!is_andx_req(CVAL(buf, ofs))) {
+               if (!smb1cli_is_andx_req(CVAL(buf, ofs))) {
                        return false;
                }
 
@@ -2269,7 +2269,7 @@ bool smb1_is_chain(const uint8_t *buf)
        uint8_t cmd, wct, andx_cmd;
 
        cmd = CVAL(buf, smb_com);
-       if (!is_andx_req(cmd)) {
+       if (!smb1cli_is_andx_req(cmd)) {
                return false;
        }
        wct = CVAL(buf, smb_wct);
@@ -2305,7 +2305,7 @@ bool smb1_walk_chain(const uint8_t *buf,
                return false;
        }
 
-       if (!is_andx_req(cmd)) {
+       if (!smb1cli_is_andx_req(cmd)) {
                return true;
        }
        if (wct < 2) {
@@ -2363,7 +2363,7 @@ bool smb1_walk_chain(const uint8_t *buf,
 
                wct = CVAL(smb_buf, chain_offset);
 
-               if (is_andx_req(chain_cmd) && (wct < 2)) {
+               if (smb1cli_is_andx_req(chain_cmd) && (wct < 2)) {
                        return false;
                }
 
@@ -2398,7 +2398,7 @@ bool smb1_walk_chain(const uint8_t *buf,
                        return false;
                }
 
-               if (!is_andx_req(chain_cmd)) {
+               if (!smb1cli_is_andx_req(chain_cmd)) {
                        return true;
                }
                chain_cmd = CVAL(vwv, 0);
@@ -4146,7 +4146,7 @@ bool req_is_in_chain(const struct smb_request *req)
                return true;
        }
 
-       if (!is_andx_req(req->cmd)) {
+       if (!smb1cli_is_andx_req(req->cmd)) {
                return false;
        }