merged OpenSSH 5.2p1 to trunk

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

diff --git a/openssh/defines.h b/openssh/defines.h
index 4820ef4af0e4de089e1ff7112ae7b4865f3ba1bb..748759785b2384d38234071135b025b04c99922d 100644 (file)
--- a/openssh/defines.h
+++ b/openssh/defines.h
@@ -702,7 +702,7 @@ struct winsize {
 # define CUSTOM_SYS_AUTH_PASSWD 1
 #endif
 
-#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID)
+#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(HAVE_SECUREWARE)
 # define CUSTOM_SYS_AUTH_PASSWD 1
 #endif
 #if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(BROKEN_LIBIAF)
@@ -742,4 +742,8 @@ struct winsize {
 # define EWOULDBLOCK EAGAIN
 #endif
 
+#ifndef INET6_ADDRSTRLEN       /* for non IPv6 machines */
+#define INET6_ADDRSTRLEN 46
+#endif
+
 #endif /* _DEFINES_H */