Changeset 134 for branches/samba-3.0/source/libsmb

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

Location:

branches/samba-3.0/source/libsmb

Files:

• cliconnect.c (modified) (2 diffs)
• clireadwrite.c (modified) (2 diffs)
• clitrans.c (modified) (7 diffs)
• libsmbclient.c (modified) (1 diff)
• nterr.c (modified) (1 diff)
• smb_signing.c (modified) (5 diffs)
• trusts_util.c (modified) (1 diff)

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

@@ -250 +250 @@
                 p += clistr_push(cli, p, pass, -1, STR_TERMINATE); /* password */
                 SSVAL(cli->outbuf,smb_vwv7,PTR_DIFF(p, smb_buf(cli->outbuf)));
-        }
-        else { 
+        } else {
+                /* For ucs2 passwords clistr_push calls ucs2_align, which causes
+                 * the space taken by the unicode password to be one byte too
+                 * long (as we're on an odd byte boundary here). Reduce the
+                 * count by 1 to cope with this. Fixes smbclient against NetApp
+                 * servers which can't cope. Fix from
+                 * bryan.kolodziej@allenlund.com in bug #3840.
+                 */
                 p += clistr_push(cli, p, pass, -1, STR_UNICODE|STR_TERMINATE); /* unicode password */
-                SSVAL(cli->outbuf,smb_vwv8,PTR_DIFF(p, smb_buf(cli->outbuf)));  
+                SSVAL(cli->outbuf,smb_vwv8,PTR_DIFF(p, smb_buf(cli->outbuf))-1);        
         }
         
@@ -1027 +1033 @@
 
         return NT_STATUS_OK;
-
 }
 

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

@@ -353 +353 @@
 
         while (received < blocks) {
+                ssize_t size1 = 0;
 
                 while ((issued - received < mpx) && (issued < blocks)) {
                         ssize_t bsent = issued * block;
-                        ssize_t size1 = MIN(block, size - bsent);
+
+                        size1 = MIN(block, size - bsent);
 
                         if (!cli_issue_write(cli, fnum, offset + bsent,
@@ -375 +377 @@
 
                 bwritten += SVAL(cli->inbuf, smb_vwv2);
-                bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))<<16);
+                if (size1 > 0xFFFF) {
+                        bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))<<16);
+                }
         }
 

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

@@ -96 +96 @@
         }
 
+        /* Note we're in a trans state. Save the sequence
+         * numbers for replies. */
+        client_set_trans_sign_state_on(cli, mid);
+
         if (this_ldata < ldata || this_lparam < lparam) {
                 /* receive interim response */
                 if (!cli_receive_smb(cli) || cli_is_error(cli)) {
+                        client_set_trans_sign_state_off(cli, mid);
                         return(False);
                 }
@@ -108 +113 @@
                         this_lparam = MIN(lparam-tot_param,cli->max_xmit - 500); /* hack */
                         this_ldata = MIN(ldata-tot_data,cli->max_xmit - (500+this_lparam));
+
+                        client_set_trans_sign_state_off(cli, mid);
+                        client_set_trans_sign_state_on(cli, mid);
 
                         set_message(cli->outbuf,trans==SMBtrans?8:9,0,True);
@@ -140 +148 @@
                         show_msg(cli->outbuf);
                         if (!cli_send_smb(cli)) {
+                                client_set_trans_sign_state_off(cli, mid);
                                 return False;
                         }
@@ -318 +327 @@
   out:
 
+        client_set_trans_sign_state_off(cli, SVAL(cli->inbuf,smb_mid));
         return ret;
 }
@@ -385 +395 @@
         }       
 
+        /* Note we're in a trans state. Save the sequence
+         * numbers for replies. */
+        client_set_trans_sign_state_on(cli, mid);
+
         if (this_ldata < ldata || this_lparam < lparam) {
                 /* receive interim response */
                 if (!cli_receive_smb(cli) || cli_is_error(cli)) {
+                        client_set_trans_sign_state_off(cli, mid);
                         return(False);
                 }
@@ -429 +444 @@
 
                         if (!cli_send_smb(cli)) {
+                                client_set_trans_sign_state_off(cli, mid);
                                 return False;
                         }
@@ -628 +644 @@
   out:
 
+        client_set_trans_sign_state_off(cli, SVAL(cli->inbuf,smb_mid));
         return ret;
 }

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

@@ -6365 +6365 @@
         SAFE_FREE(context->user);
         
-        DEBUG(3, ("Context %p succesfully freed\n", context));
+        DEBUG(3, ("Context %p successfully freed\n", context));
         SAFE_FREE(context->internal);
         SAFE_FREE(context);

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

@@ -536 +536 @@
         { "NT_STATUS_DS_NO_MORE_RIDS", NT_STATUS_DS_NO_MORE_RIDS },
         { "NT_STATUS_NOT_A_REPARSE_POINT", NT_STATUS_NOT_A_REPARSE_POINT },
+        { "NT_STATUS_DOWNGRADE_DETECTED", NT_STATUS_DOWNGRADE_DETECTED },
         { "NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES },
         { "STATUS_MORE_ENTRIES", STATUS_MORE_ENTRIES },

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. */
 };
 
@@ -43 +44 @@
         for (t = *list; t; t = t->next) {
                 if (t->mid == mid) {
-                        DLIST_REMOVE(*list, t);
-                        SAFE_FREE(t);
-                        break;
+                        return False;
                 }
         }
@@ -54 +53 @@
         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 ));
-                        DLIST_REMOVE(*list, t);
-                        SAFE_FREE(t);
+                        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;
                         return True;
                 }
@@ -590 +605 @@
 
 /***********************************************************
+ 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.
 ************************************************************/

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

@@ -42 +42 @@
 
         if (cli->auth.auth_type != PIPE_AUTH_TYPE_SCHANNEL) {
-                uint32 neg_flags = NETLOGON_NEG_SELECT_AUTH2_FLAGS;
+                uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
 
                 result = rpccli_netlogon_setup_creds(cli,