merge OpenSSH 3.9p1 to trunk

[gssapi-openssh.git] / openssh / acconfig.h

diff --git a/openssh/acconfig.h b/openssh/acconfig.h
index fd14c1a01285656c3f304dfe03d5e47aee47d32b..18013f2341c6d49b38a46d9caccf16bbc811b500 100644 (file)
--- a/openssh/acconfig.h
+++ b/openssh/acconfig.h
@@ -104,6 +104,9 @@
 /* Work around problematic Linux PAM modules handling of PAM_TTY */
 #undef PAM_TTY_KLUDGE
 
+/* Define if pam_chauthtok wants real uid set to the unpriv'ed user */
+#undef SSHPAM_CHAUTHTOK_NEEDS_RUID
+
 /* Use PIPES instead of a socketpair() */
 #undef USE_PIPES
 
@@ -447,6 +450,12 @@
 /* Define if cmsg_type is not passed correctly */
 #undef BROKEN_CMSG_TYPE
 
+/*
+ * Define to whatever link() returns for "not supported" if it doesn't
+ * return EOPNOTSUPP.
+ */
+#undef LINK_OPNOTSUPP_ERRNO
+
 /* Strings used in /etc/passwd to denote locked account */
 #undef LOCKED_PASSWD_STRING
 #undef LOCKED_PASSWD_PREFIX
@@ -461,6 +470,9 @@
 /* Define if your resolver libs need this for getrrsetbyname */
 #undef BIND_8_COMPAT
 
+/* Define if you have /proc/$pid/fd */
+#undef HAVE_PROC_PID
+
 @BOTTOM@
 
 /* ******************* Shouldn't need to edit below this line ************** */