Changeset 751 for trunk/server/source3/smbd/smb2_keepalive.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/smbd/smb2_keepalive.c (modified) (1 diff)

trunk/server/source3/smbd/smb2_keepalive.c

@@ -26 +26 @@
 NTSTATUS smbd_smb2_request_process_keepalive(struct smbd_smb2_request *req)
 {
-        const uint8_t *inbody;
-        int i = req->current_idx;
         DATA_BLOB outbody;
-        size_t expected_body_size = 0x04;
-        size_t body_size;
+        NTSTATUS status;
 
-        if (req->in.vector[i+1].iov_len != (expected_body_size & 0xFFFFFFFE)) {
-                return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
-        }
-
-        inbody = (const uint8_t *)req->in.vector[i+1].iov_base;
-
-        body_size = SVAL(inbody, 0x00);
-        if (body_size != expected_body_size) {
-                return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+        status = smbd_smb2_request_verify_sizes(req, 0x04);
+        if (!NT_STATUS_IS_OK(status)) {
+                return smbd_smb2_request_error(req, status);
         }