s3:smb2_server: remove unused get_min_receive_file_size() wrapper function
authorStefan Metzmacher <metze@samba.org>
Thu, 10 Apr 2014 23:37:42 +0000 (01:37 +0200)
committerJeremy Allison <jra@samba.org>
Fri, 11 Apr 2014 21:55:17 +0000 (23:55 +0200)
smb2req always comes from talloc_zero().

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Apr 11 23:55:17 CEST 2014 on sn-devel-104

source3/smbd/smb2_server.c

index 4f6967968c4f28996fd0aea52bbddb8d3ef216fa..4a7abcbeacb95a784883f28f7f6ed61b56f0b7ba 100644 (file)
@@ -2837,17 +2837,6 @@ NTSTATUS smbd_smb2_send_oplock_break(struct smbd_server_connection *sconn,
        return NT_STATUS_OK;
 }
 
-static size_t get_min_receive_file_size(struct smbd_smb2_request *smb2_req)
-{
-       if (smb2_req->do_signing) {
-               return 0;
-       }
-       if (smb2_req->do_encryption) {
-               return 0;
-       }
-       return (size_t)lp_min_receive_file_size();
-}
-
 static bool is_smb2_recvfile_write(struct smbd_smb2_request_read_state *state)
 {
        NTSTATUS status;
@@ -2969,7 +2958,7 @@ static NTSTATUS smbd_smb2_request_next_incoming(struct smbd_server_connection *s
                return NT_STATUS_NO_MEMORY;
        }
        state->req->sconn = sconn;
-       state->min_recv_size = get_min_receive_file_size(state->req);
+       state->min_recv_size = lp_min_receive_file_size();
 
        TEVENT_FD_READABLE(sconn->smb2.fde);
 
@@ -3337,7 +3326,7 @@ got_full:
                req = state->req;
                ZERO_STRUCTP(state);
                state->req = req;
-               state->min_recv_size = get_min_receive_file_size(state->req);
+               state->min_recv_size = lp_min_receive_file_size();
                req = NULL;
                goto again;
        }