summaryrefslogtreecommitdiff
path: root/defines.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-01-01 17:15:23 +0000
committerColin Watson <cjwatson@debian.org>2010-01-01 17:15:23 +0000
commit99b402ea4c8457b0a3cafff37f5b3410a8dc6476 (patch)
tree1d24ce54c9981ea8cbb4c5a9309964a0e4c4b320 /defines.h
parent87552344215a38d3a2b0d4d63dc151e05978bbe1 (diff)
parent54af7a4ae8d455791a631bdfaade4b64436ae16a (diff)
import openssh-5.2p1-gsskex-all-20090726.patch
Diffstat (limited to 'defines.h')
-rw-r--r--defines.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/defines.h b/defines.h
index a8203ebbb..536ec4978 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.151 2008/07/04 13:10:49 djm Exp $ */ 28/* $Id: defines.h,v 1.153 2009/02/01 11:19:54 dtucker Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -698,7 +698,7 @@ struct winsize {
698# define CUSTOM_SYS_AUTH_PASSWD 1 698# define CUSTOM_SYS_AUTH_PASSWD 1
699#endif 699#endif
700 700
701#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) 701#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(HAVE_SECUREWARE)
702# define CUSTOM_SYS_AUTH_PASSWD 1 702# define CUSTOM_SYS_AUTH_PASSWD 1
703#endif 703#endif
704#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(BROKEN_LIBIAF) 704#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(BROKEN_LIBIAF)
@@ -738,4 +738,8 @@ struct winsize {
738# define EWOULDBLOCK EAGAIN 738# define EWOULDBLOCK EAGAIN
739#endif 739#endif
740 740
741#ifndef INET6_ADDRSTRLEN /* for non IPv6 machines */
742#define INET6_ADDRSTRLEN 46
743#endif
744
741#endif /* _DEFINES_H */ 745#endif /* _DEFINES_H */