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 @@ 20020415 - (djm) Unbreak "make install". Fix from Darren Tucker <dtucker@zip.com.au> - (stevesk) bsd-cygwin_util.[ch] BSD license from Corinna Vinschen + - (tim) [configure.ac] add tests for recvmsg and sendmsg. + [monitor_fdpass.c] add checks for HAVE_SENDMSG and HAVE_RECVMSG for + systems that HAVE_ACCRIGHTS_IN_MSGHDR but no recvmsg or sendmsg. 20020414 - (djm) ssh-rand-helper improvements @@ -8245,4 +8248,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.2055 2002/04/15 22:00:51 stevesk Exp $ +$Id: ChangeLog,v 1.2056 2002/04/16 04:10:09 tim Exp $ diff --git a/configure.ac b/configure.ac index 9516bf7f..d9ca33d6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.44 2002/04/13 01:04:41 djm Exp $ +# $Id: configure.ac,v 1.45 2002/04/16 04:10:11 tim Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -534,8 +534,8 @@ AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \ getaddrinfo getcwd getgrouplist getnameinfo getopt \ getrlimit getrusage getttyent glob inet_aton inet_ntoa \ inet_ntop innetgr login_getcapbool md5_crypt memmove \ - mkdtemp mmap openpty readpassphrase realpath \ - rresvport_af setdtablesize setegid setenv seteuid \ + mkdtemp mmap openpty readpassphrase realpath recvmsg \ + rresvport_af sendmsg setdtablesize setegid setenv seteuid \ setlogin setproctitle setresgid setreuid setrlimit \ setsid setvbuf sigaction sigvec snprintf socketpair strerror \ strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes \ diff --git a/monitor_fdpass.c b/monitor_fdpass.c index 0045977e..5401ea46 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 $"); void mm_send_fd(int socket, int fd) { -#if defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR) +#if defined(HAVE_SENDMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) struct msghdr msg; struct iovec vec; char ch = '\0'; @@ -78,7 +78,7 @@ mm_send_fd(int socket, int fd) int mm_receive_fd(int socket) { -#if defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR) +#if defined(HAVE_RECVMSG) && (defined(HAVE_ACCRIGHTS_IN_MSGHDR) || defined(HAVE_CONTROL_IN_MSGHDR)) struct msghdr msg; struct iovec vec; char ch; |