diff --git a/ChangeLog b/ChangeLog
index 84358c3ca..e3f3fcaf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20020322
+ - (stevesk) HAVE_ACCRIGHTS_IN_MSGHDR configure support
+
 20020321
  - (bal) OpenBSD CVS Sync
    - itojun@cvs.openbsd.org 2002/03/08 06:10:16
@@ -7991,4 +7994,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1966 2002/03/22 03:53:00 mouring Exp $
+$Id: ChangeLog,v 1.1967 2002/03/22 17:23:25 stevesk Exp $
diff --git a/acconfig.h b/acconfig.h
index 40cbeeb7d..b2cf81ca7 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.122 2002/02/26 16:40:49 tim Exp $ */
+/* $Id: acconfig.h,v 1.123 2002/03/22 17:23:26 stevesk Exp $ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -32,6 +32,9 @@
 /* Define if your password has a pw_change field */
 #undef HAVE_PW_CHANGE_IN_PASSWD
 
+/* Define if your system uses access rights style file descriptor passing */
+#undef HAVE_ACCRIGHTS_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 670764f52..4a61c82f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.26 2002/03/17 20:17:35 tim Exp $
+# $Id: configure.ac,v 1.27 2002/03/22 17:23:26 stevesk Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -1576,6 +1576,22 @@ if test "x$ac_cv_have_pw_change_in_struct_passwd" = "xyes" ; then
 	AC_DEFINE(HAVE_PW_CHANGE_IN_PASSWD)
 fi
 
+AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
+		ac_cv_have_accrights_in_msghdr, [
+	AC_TRY_COMPILE(
+		[
+#include <sys/socket.h>
+#include <sys/uio.h>
+		],
+		[ struct msghdr m; m.msg_accrights = 0; ],
+		[ ac_cv_have_accrights_in_msghdr="yes" ],
+		[ ac_cv_have_accrights_in_msghdr="no" ]
+	)
+])
+if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then
+	AC_DEFINE(HAVE_ACCRIGHTS_IN_MSGHDR)
+fi
+
 AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
 	AC_TRY_LINK([], 
 		[ extern char *__progname; printf("%s", __progname); ],