Changeset 134 for branches/samba-3.0/source/libsmb/cliconnect.c

Timestamp:

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

Author:

Paul Smedley

Message:

Update source to 3.0.29

File:

• branches/samba-3.0/source/libsmb/cliconnect.c (modified) (2 diffs)

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;
-
 }