diff options
| author | Jeremy Allison <jra@samba.org> | 2009-09-06 21:38:50 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-09-06 21:38:50 -0700 |
| commit | 43c766a14a5eeed80e57bae9fde21eb2b542c209 (patch) | |
| tree | b0330fce78ed8ec8fc30e039acf701787ebca90e /source3/libsmb | |
| parent | 5a22c0225abe2da11e844888475cbd9c40c6c47c (diff) | |
| download | samba-43c766a14a5eeed80e57bae9fde21eb2b542c209.tar.gz samba-43c766a14a5eeed80e57bae9fde21eb2b542c209.tar.bz2 samba-43c766a14a5eeed80e57bae9fde21eb2b542c209.zip | |
Fix bug 6673 - smbpasswd does not work with "unix password sync = yes".
Revert change from 3.3 -> 3.4 with read_socket_with_timeout changed
from sys_read() to sys_recv(). read_socket_with_timeout() is called
with non-fd's (with a pty in chgpasswd.c and with a disk file in
lib/dbwrap_file.c via read_data()). recv works for the disk file,
but not the pty. Change the name of read_socket_with_timeout() to
read_fd_with_timeout() to make this clear (and add comments).
Jeremy.
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/clientgen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index bc2a092de3..1ea8033fc6 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -296,7 +296,7 @@ ssize_t cli_receive_smb_data(struct cli_state *cli, char *buffer, size_t len) set_smb_read_error(&cli->smb_rw_error, SMB_READ_OK); - status = read_socket_with_timeout( + status = read_fd_with_timeout( cli->fd, buffer, len, len, cli->timeout, NULL); if (NT_STATUS_IS_OK(status)) { return len; |