diff options
| author | Jeremy Allison <jra@samba.org> | 2008-04-04 15:28:14 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-04-04 15:28:14 -0700 |
| commit | 1a64916775e8ef5081f1cf0627f15396b6457830 (patch) | |
| tree | 9ba76c481d3d272d3baf61105d10b21b6c07b4ac | |
| parent | 833729125093b884a528057b0aa03891efb9e9b5 (diff) | |
| download | samba-1a64916775e8ef5081f1cf0627f15396b6457830.tar.gz samba-1a64916775e8ef5081f1cf0627f15396b6457830.tar.bz2 samba-1a64916775e8ef5081f1cf0627f15396b6457830.zip | |
When using plaintext 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.
Jeremy.
(This used to be commit 1e7e7d86a1ae1cd2c3cc3de9f36b7326ad249b82)
| -rw-r--r-- | source3/libsmb/cliconnect.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 8bdc284693..4573f39eb3 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -247,9 +247,16 @@ static NTSTATUS cli_session_setup_plaintext(struct cli_state *cli, 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); } p += clistr_push(cli, p, user, -1, STR_TERMINATE); /* username */ @@ -1033,7 +1040,6 @@ NTSTATUS cli_session_setup(struct cli_state *cli, } return NT_STATUS_OK; - } /**************************************************************************** |