summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2002-04-07 16:18:03 +0000
committerKevin Steves <stevesk@pobox.com>2002-04-07 16:18:03 +0000
commita44e0351ee8dd45435bf1c887f1aca4933a205b0 (patch)
tree47832b2019b052e3f13f52f7ae5f72e28cd1daf1
parentfdee8ef0ac9965aab53c14a4ebf990a8592b9f94 (diff)
- (stevesk) HAVE_CONTROL_IN_MSGHDR; not used right now.
Future: we may want to test if fd passing works correctly.
-rw-r--r--ChangeLog6
-rw-r--r--acconfig.h5
-rw-r--r--configure.ac18
3 files changed, 26 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c9c7ac9f..ad39fc63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20020407
+ - (stevesk) HAVE_CONTROL_IN_MSGHDR; not used right now.
+ Future: we may want to test if fd passing works correctly.
+
20020406
- (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann
<carsten.grohmann@dr-baldeweg.de>
@@ -8187,4 +8191,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.2033 2002/04/06 23:52:02 mouring Exp $
+$Id: ChangeLog,v 1.2034 2002/04/07 16:18:03 stevesk Exp $
diff --git a/acconfig.h b/acconfig.h
index 00fdfac6..7c5c1605 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.127 2002/04/06 23:52:04 mouring Exp $ */
+/* $Id: acconfig.h,v 1.128 2002/04/07 16:18:04 stevesk Exp $ */
#ifndef _CONFIG_H
#define _CONFIG_H
@@ -34,6 +34,9 @@
/* Define if your system uses access rights style file descriptor passing */
#undef HAVE_ACCRIGHTS_IN_MSGHDR
+/* Define if your system uses ancillary data style file descriptor passing */
+#undef HAVE_CONTROL_IN_MSGHDR
+
/* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */
#undef BROKEN_INET_NTOA
diff --git a/configure.ac b/configure.ac
index abe9a1a4..0afab075 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.35 2002/04/06 23:52:04 mouring Exp $
+# $Id: configure.ac,v 1.36 2002/04/07 16:18:04 stevesk Exp $
AC_INIT
AC_CONFIG_SRCDIR([ssh.c])
@@ -1582,6 +1582,22 @@ if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then
AC_DEFINE(HAVE_ACCRIGHTS_IN_MSGHDR)
fi
+AC_CACHE_CHECK([for msg_control field in struct msghdr],
+ ac_cv_have_control_in_msghdr, [
+ AC_TRY_COMPILE(
+ [
+#include <sys/socket.h>
+#include <sys/uio.h>
+ ],
+ [ struct msghdr m; m.msg_control = 0; ],
+ [ ac_cv_have_control_in_msghdr="yes" ],
+ [ ac_cv_have_control_in_msghdr="no" ]
+ )
+])
+if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then
+ AC_DEFINE(HAVE_CONTROL_IN_MSGHDR)
+fi
+
AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
AC_TRY_LINK([],
[ extern char *__progname; printf("%s", __progname); ],