diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /defines.h | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 20 |
1 files changed, 19 insertions, 1 deletions
@@ -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.117 2004/06/22 03:27:16 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.119 2005/02/20 10:01:49 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -288,6 +288,10 @@ struct sockaddr_un { | |||
288 | }; | 288 | }; |
289 | #endif /* HAVE_SYS_UN_H */ | 289 | #endif /* HAVE_SYS_UN_H */ |
290 | 290 | ||
291 | #ifndef HAVE_IN_ADDR_T | ||
292 | typedef u_int32_t in_addr_t; | ||
293 | #endif | ||
294 | |||
291 | #if defined(BROKEN_SYS_TERMIO_H) && !defined(_STRUCT_WINSIZE) | 295 | #if defined(BROKEN_SYS_TERMIO_H) && !defined(_STRUCT_WINSIZE) |
292 | #define _STRUCT_WINSIZE | 296 | #define _STRUCT_WINSIZE |
293 | struct winsize { | 297 | struct winsize { |
@@ -530,6 +534,11 @@ struct winsize { | |||
530 | # define getpgrp() getpgrp(0) | 534 | # define getpgrp() getpgrp(0) |
531 | #endif | 535 | #endif |
532 | 536 | ||
537 | #ifdef USE_BSM_AUDIT | ||
538 | # define SSH_AUDIT_EVENTS | ||
539 | # define CUSTOM_SSH_AUDIT_EVENTS | ||
540 | #endif | ||
541 | |||
533 | /* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */ | 542 | /* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */ |
534 | #if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f) | 543 | #if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f) |
535 | # define OPENSSL_free(x) Free(x) | 544 | # define OPENSSL_free(x) Free(x) |
@@ -644,6 +653,15 @@ struct winsize { | |||
644 | # define CUSTOM_SYS_AUTH_PASSWD 1 | 653 | # define CUSTOM_SYS_AUTH_PASSWD 1 |
645 | #endif | 654 | #endif |
646 | 655 | ||
656 | /* HP-UX 11.11 */ | ||
657 | #ifdef BTMP_FILE | ||
658 | # define _PATH_BTMP BTMP_FILE | ||
659 | #endif | ||
660 | |||
661 | #if defined(USE_BTMP) && defined(_PATH_BTMP) | ||
662 | # define CUSTOM_FAILED_LOGIN | ||
663 | #endif | ||
664 | |||
647 | /** end of login recorder definitions */ | 665 | /** end of login recorder definitions */ |
648 | 666 | ||
649 | #endif /* _DEFINES_H */ | 667 | #endif /* _DEFINES_H */ |