diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | monitor_fdpass.c | 4 |
3 files changed, 9 insertions, 6 deletions
@@ -1,6 +1,9 @@ | |||
1 | 20020415 | 1 | 20020415 |
2 | - (djm) Unbreak "make install". Fix from Darren Tucker <dtucker@zip.com.au> | 2 | - (djm) Unbreak "make install". Fix from Darren Tucker <dtucker@zip.com.au> |
3 | - (stevesk) bsd-cygwin_util.[ch] BSD license from Corinna Vinschen | 3 | - (stevesk) bsd-cygwin_util.[ch] BSD license from Corinna Vinschen |
4 | - (tim) [configure.ac] add tests for recvmsg and sendmsg. | ||
5 | [monitor_fdpass.c] add checks for HAVE_SENDMSG and HAVE_RECVMSG for | ||
6 | systems that HAVE_ACCRIGHTS_IN_MSGHDR but no recvmsg or sendmsg. | ||
4 | 7 | ||
5 | 20020414 | 8 | 20020414 |
6 | - (djm) ssh-rand-helper improvements | 9 | - (djm) ssh-rand-helper improvements |
@@ -8245,4 +8248,4 @@ | |||
8245 | - Wrote replacements for strlcpy and mkdtemp | 8248 | - Wrote replacements for strlcpy and mkdtemp |
8246 | - Released 1.0pre1 | 8249 | - Released 1.0pre1 |
8247 | 8250 | ||
8248 | $Id: ChangeLog,v 1.2055 2002/04/15 22:00:51 stevesk Exp $ | 8251 | $Id: ChangeLog,v 1.2056 2002/04/16 04:10:09 tim Exp $ |
diff --git a/configure.ac b/configure.ac index 9516bf7fe..d9ca33d69 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.44 2002/04/13 01:04:41 djm Exp $ | 1 | # $Id: configure.ac,v 1.45 2002/04/16 04:10:11 tim Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -534,8 +534,8 @@ AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \ | |||
534 | getaddrinfo getcwd getgrouplist getnameinfo getopt \ | 534 | getaddrinfo getcwd getgrouplist getnameinfo getopt \ |
535 | getrlimit getrusage getttyent glob inet_aton inet_ntoa \ | 535 | getrlimit getrusage getttyent glob inet_aton inet_ntoa \ |
536 | inet_ntop innetgr login_getcapbool md5_crypt memmove \ | 536 | inet_ntop innetgr login_getcapbool md5_crypt memmove \ |
537 | mkdtemp mmap openpty readpassphrase realpath \ | 537 | mkdtemp mmap openpty readpassphrase realpath recvmsg \ |
538 | rresvport_af setdtablesize setegid setenv seteuid \ | 538 | rresvport_af sendmsg setdtablesize setegid setenv seteuid \ |
539 | setlogin setproctitle setresgid setreuid setrlimit \ | 539 | setlogin setproctitle setresgid setreuid setrlimit \ |
540 | setsid setvbuf sigaction sigvec snprintf socketpair strerror \ | 540 | setsid setvbuf sigaction sigvec snprintf socketpair strerror \ |
541 | strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes \ | 541 | strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes \ |
diff --git a/monitor_fdpass.c b/monitor_fdpass.c index 0045977e4..5401ea466 100644 --- a/monitor_fdpass.c +++ b/monitor_fdpass.c | |||
@@ -34,7 +34,7 @@ RCSID("$OpenBSD: monitor_fdpass.c,v 1.2 2002/03/24 17:53:16 stevesk Exp $"); | |||
34 | void | 34 | void |
35 | mm_send_fd(int socket, int fd) | 35 | mm_send_fd(int socket, int fd) |
36 | { | 36 | { |
37 | #if defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR) | 37 | #if defined(HAVE_SENDMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) |
38 | struct msghdr msg; | 38 | struct msghdr msg; |
39 | struct iovec vec; | 39 | struct iovec vec; |
40 | char ch = '\0'; | 40 | char ch = '\0'; |
@@ -78,7 +78,7 @@ mm_send_fd(int socket, int fd) | |||
78 | int | 78 | int |
79 | mm_receive_fd(int socket) | 79 | mm_receive_fd(int socket) |
80 | { | 80 | { |
81 | #if defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR) | 81 | #if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) |
82 | struct msghdr msg; | 82 | struct msghdr msg; |
83 | struct iovec vec; | 83 | struct iovec vec; |
84 | char ch; | 84 | char ch; |