diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-07 09:54:12 +0000 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-07-08 17:28:11 +0200 |
| commit | 0d4bf9150f2b9d56429c6de13570713904412376 (patch) | |
| tree | 9b995fe03a2a4ea516935ac7e2c5fb86f6a0cf3f | |
| parent | b7fe8541404667e3d82e36d74c62e62cc52fc309 (diff) | |
| download | samba-0d4bf9150f2b9d56429c6de13570713904412376.tar.gz samba-0d4bf9150f2b9d56429c6de13570713904412376.tar.xz samba-0d4bf9150f2b9d56429c6de13570713904412376.zip | |
smbd: no "dyn" in smbd_smb2_send_oplock_break
We don't need the assignment to state->vector[1+SMBD_SMB2_DYN_IOV_OFS],
this is zero-initialized by talloc_zero
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/smbd/smb2_server.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index 4546d85961..8817ff2025 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -2740,8 +2740,6 @@ NTSTATUS smbd_smb2_send_oplock_break(struct smbd_server_connection *sconn, struct smbXsrv_connection *conn = sconn->conn; uint8_t *body; size_t body_len; - uint8_t *dyn; - size_t dyn_len; bool do_encryption = session->global->encryption_required; uint64_t nonce_high = 0; uint64_t nonce_low = 0; @@ -2759,8 +2757,6 @@ NTSTATUS smbd_smb2_send_oplock_break(struct smbd_server_connection *sconn, body = state->buf; body_len = 0x18; - dyn = body + body_len; - dyn_len = 0; if (do_encryption) { nonce_high = session->nonce_high; @@ -2825,8 +2821,9 @@ NTSTATUS smbd_smb2_send_oplock_break(struct smbd_server_connection *sconn, state->vector[1+SMBD_SMB2_BODY_IOV_OFS].iov_base = body; state->vector[1+SMBD_SMB2_BODY_IOV_OFS].iov_len = body_len; - state->vector[1+SMBD_SMB2_DYN_IOV_OFS].iov_base = dyn; - state->vector[1+SMBD_SMB2_DYN_IOV_OFS].iov_len = dyn_len; + /* + * state->vector[1+SMBD_SMB2_DYN_IOV_OFS] is NULL by talloc_zero above + */ smb2_setup_nbt_length(state->vector, 1 + SMBD_SMB2_NUM_IOV_PER_REQ); |