s3:smbd: use new simplified snb_signing code in the server

[sfrench/samba-autobuild/.git] / source3 / smbd / oplock.c

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 22870283fa5996d2e519096ca8ba319d7ea7f144..ce00397bbde6f61d5fcfb9430210bc89be80db7b 100644 (file)
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -361,7 +361,6 @@ void process_oplock_async_level2_break_message(struct messaging_context *msg_ctx
        struct share_mode_entry msg;
        files_struct *fsp;
        char *break_msg;
-       bool sign_state;
 
        if (data->data == NULL) {
                DEBUG(0, ("Got NULL buffer\n"));
@@ -423,20 +422,14 @@ void process_oplock_async_level2_break_message(struct messaging_context *msg_ctx
                wait_before_sending_break();
        }
 
-       /* Save the server smb signing state. */
-       sign_state = srv_oplock_set_signing(False);
-
        show_msg(break_msg);
        if (!srv_send_smb(smbd_server_fd(),
-                       break_msg,
+                       break_msg, false, 0,
                        IS_CONN_ENCRYPTED(fsp->conn),
                        NULL)) {
                exit_server_cleanly("oplock_break: srv_send_smb failed.");
        }
 
-       /* Restore the sign state to what it was. */
-       srv_oplock_set_signing(sign_state);
-
        TALLOC_FREE(break_msg);
 
        /* Async level2 request, don't send a reply, just remove the oplock. */
@@ -457,7 +450,6 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
        files_struct *fsp;
        char *break_msg;
        bool break_to_level2 = False;
-       bool sign_state;
 
        if (data->data == NULL) {
                DEBUG(0, ("Got NULL buffer\n"));
@@ -530,20 +522,14 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
                wait_before_sending_break();
        }
 
-       /* Save the server smb signing state. */
-       sign_state = srv_oplock_set_signing(False);
-
        show_msg(break_msg);
        if (!srv_send_smb(smbd_server_fd(),
-                       break_msg,
+                       break_msg, false, 0,
                        IS_CONN_ENCRYPTED(fsp->conn),
                        NULL)) {
                exit_server_cleanly("oplock_break: srv_send_smb failed.");
        }
 
-       /* Restore the sign state to what it was. */
-       srv_oplock_set_signing(sign_state);
-
        TALLOC_FREE(break_msg);
 
        fsp->sent_oplock_break = break_to_level2 ? LEVEL_II_BREAK_SENT:BREAK_TO_NONE_SENT;
@@ -570,7 +556,6 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
        unsigned long file_id;
        files_struct *fsp;
        char *break_msg;
-       bool sign_state;
 
        if (data->data == NULL) {
                DEBUG(0, ("Got NULL buffer\n"));
@@ -610,20 +595,14 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
                exit_server("Could not talloc break_msg\n");
        }
 
-       /* Save the server smb signing state. */
-       sign_state = srv_oplock_set_signing(False);
-
        show_msg(break_msg);
        if (!srv_send_smb(smbd_server_fd(),
-                       break_msg,
+                       break_msg, false, 0,
                        IS_CONN_ENCRYPTED(fsp->conn),
                        NULL)) {
                exit_server_cleanly("oplock_break: srv_send_smb failed.");
        }
 
-       /* Restore the sign state to what it was. */
-       srv_oplock_set_signing(sign_state);
-
        TALLOC_FREE(break_msg);
 
        fsp->sent_oplock_break = BREAK_TO_NONE_SENT;