From 43c766a14a5eeed80e57bae9fde21eb2b542c209 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sun, 6 Sep 2009 21:38:50 -0700 Subject: 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. --- source3/include/proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index 9314e57cc2..4bdd306c0b 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1383,7 +1383,7 @@ ssize_t read_udp_v4_socket(int fd, char *buf, size_t len, struct sockaddr_storage *psa); -NTSTATUS read_socket_with_timeout(int fd, char *buf, +NTSTATUS read_fd_with_timeout(int fd, char *buf, size_t mincnt, size_t maxcnt, unsigned int time_out, size_t *size_ret); -- cgit