Changeset 124 for branches/samba-3.0/source/libsmb/smb_signing.c

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

File:

• branches/samba-3.0/source/libsmb/smb_signing.c (modified) (5 diffs)

branches/samba-3.0/source/libsmb/smb_signing.c

@@ -27 +27 @@
         uint16 mid;
         uint32 reply_seq_num;
-        BOOL can_delete; /* Set to False in trans state. */
 };
 
@@ -44 +43 @@
         for (t = *list; t; t = t->next) {
                 if (t->mid == mid) {
-                        return False;
+                        DLIST_REMOVE(*list, t);
+                        SAFE_FREE(t);
+                        break;
                 }
         }
@@ -53 +54 @@
         t->mid = mid;
         t->reply_seq_num = reply_seq_num;
-        t->can_delete = True;
 
         /*
@@ -80 +80 @@
                         DEBUG(10,("get_sequence_for_reply: found seq = %u mid = %u\n",
                                 (unsigned int)t->reply_seq_num, (unsigned int)t->mid ));
-                        if (t->can_delete) {
-                                DLIST_REMOVE(*list, t);
-                                SAFE_FREE(t);
-                        }
-                        return True;
-                }
-        }
-        return False;
-}
-
-static BOOL set_sequence_can_delete_flag(struct outstanding_packet_lookup **list, uint16 mid, BOOL can_delete_entry)
-{
-        struct outstanding_packet_lookup *t;
-
-        for (t = *list; t; t = t->next) {
-                if (t->mid == mid) {
-                        t->can_delete = can_delete_entry;
+                        DLIST_REMOVE(*list, t);
+                        SAFE_FREE(t);
                         return True;
                 }
@@ -605 +590 @@
 
 /***********************************************************
- Enter trans/trans2/nttrans state.
-************************************************************/
-
-BOOL client_set_trans_sign_state_on(struct cli_state *cli, uint16 mid)
-{
-        struct smb_sign_info *si = &cli->sign_info;
-        struct smb_basic_signing_context *data = (struct smb_basic_signing_context *)si->signing_context;
-
-        if (!si->doing_signing) {
-                return True;
-        }
-
-        if (!data) {
-                return False;
-        }
-
-        if (!set_sequence_can_delete_flag(&data->outstanding_packet_list, mid, False)) {
-                return False;
-        }
-
-        return True;
-}
-
-/***********************************************************
- Leave trans/trans2/nttrans state.
-************************************************************/
-
-BOOL client_set_trans_sign_state_off(struct cli_state *cli, uint16 mid)
-{
-        uint32 reply_seq_num;
-        struct smb_sign_info *si = &cli->sign_info;
-        struct smb_basic_signing_context *data = (struct smb_basic_signing_context *)si->signing_context;
-
-        if (!si->doing_signing) {
-                return True;
-        }
-
-        if (!data) {
-                return False;
-        }
-
-        if (!set_sequence_can_delete_flag(&data->outstanding_packet_list, mid, True)) {
-                return False;
-        }
-
-        /* Now delete the stored mid entry. */
-        if (!get_sequence_for_reply(&data->outstanding_packet_list, mid, &reply_seq_num)) {
-                return False;
-        }
-
-        return True;
-}
-
-/***********************************************************
  SMB signing - Server implementation - send the MAC.
 ************************************************************/