diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2008-07-23 09:28:49 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2008-07-23 09:28:49 +0000 |
| commit | ad22e48f1aa1a1e23017e0555540d2d6b61ced1d (patch) | |
| tree | 7f4db193e6aaf3390a97bd79900d7d352cafa0e6 /defines.h | |
| parent | 490bfaade9fd39fe364761a9abb9e53381c5571c (diff) | |
| download | src-test2-ad22e48f1aa1a1e23017e0555540d2d6b61ced1d.tar.gz src-test2-ad22e48f1aa1a1e23017e0555540d2d6b61ced1d.zip | |
Notes
Diffstat (limited to 'defines.h')
| -rw-r--r-- | defines.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/defines.h b/defines.h index 5e7d6769d1ac..ac19095a2b6f 100644 --- a/defines.h +++ b/defines.h @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.143 2007/08/09 04:37:52 dtucker Exp $ */ +/* $Id: defines.h,v 1.146 2008/02/28 08:22:04 dtucker Exp $ */ /* Constants */ @@ -540,6 +540,10 @@ struct winsize { # undef HAVE_UPDWTMPX #endif +#if defined(BROKEN_SHADOW_EXPIRE) && defined(HAS_SHADOW_EXPIRE) +# undef HAS_SHADOW_EXPIRE +#endif + #if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT) && \ defined(SYSLOG_R_SAFE_IN_SIGHAND) # define DO_LOG_SAFE_IN_SIGHAND @@ -563,11 +567,6 @@ struct winsize { # define CUSTOM_SSH_AUDIT_EVENTS #endif -/* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */ -#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f) -# define OPENSSL_free(x) Free(x) -#endif - #if !defined(HAVE___func__) && defined(HAVE___FUNCTION__) # define __func__ __FUNCTION__ #elif !defined(HAVE___func__) @@ -694,9 +693,11 @@ struct winsize { # define CUSTOM_SYS_AUTH_PASSWD 1 #endif +#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) +# define CUSTOM_SYS_AUTH_PASSWD 1 +#endif #if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(BROKEN_LIBIAF) # define USE_LIBIAF -# define CUSTOM_SYS_AUTH_PASSWD 1 #endif /* HP-UX 11.11 */ |