diff options
author | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
commit | 915bfea2af69a3bb352a9b4e98e3434b8425124d (patch) | |
tree | ef732498a75f2e13a7a9827edc833dc58bc2a2af /defines.h | |
parent | 89e7a2dfe6044f3980098911a7470d401ff70eb1 (diff) | |
parent | 16f1d21ea191deaaeeba719d01c0ad82aa044653 (diff) |
Merge 3.8.1p1 to the trunk, minus RFC.nroff (#211640).
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 23 |
1 files changed, 22 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.110 2004/02/10 02:01:14 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.115 2004/04/14 07:24:30 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -507,6 +507,10 @@ struct winsize { | |||
507 | # undef HAVE_GAI_STRERROR | 507 | # undef HAVE_GAI_STRERROR |
508 | #endif | 508 | #endif |
509 | 509 | ||
510 | #if defined(BROKEN_UPDWTMPX) && defined(HAVE_UPDWTMPX) | ||
511 | # undef HAVE_UPDWTMPX | ||
512 | #endif | ||
513 | |||
510 | #if !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) | 514 | #if !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) |
511 | # define memmove(s1, s2, n) bcopy((s2), (s1), (n)) | 515 | # define memmove(s1, s2, n) bcopy((s2), (s1), (n)) |
512 | #endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */ | 516 | #endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */ |
@@ -534,6 +538,12 @@ struct winsize { | |||
534 | # define krb5_get_err_text(context,code) error_message(code) | 538 | # define krb5_get_err_text(context,code) error_message(code) |
535 | #endif | 539 | #endif |
536 | 540 | ||
541 | #if defined(SKEYCHALLENGE_4ARG) | ||
542 | # define _compat_skeychallenge(a,b,c,d) skeychallenge(a,b,c,d) | ||
543 | #else | ||
544 | # define _compat_skeychallenge(a,b,c,d) skeychallenge(a,b,c) | ||
545 | #endif | ||
546 | |||
537 | /* Maximum number of file descriptors available */ | 547 | /* Maximum number of file descriptors available */ |
538 | #ifdef HAVE_SYSCONF | 548 | #ifdef HAVE_SYSCONF |
539 | # define SSH_SYSFDMAX sysconf(_SC_OPEN_MAX) | 549 | # define SSH_SYSFDMAX sysconf(_SC_OPEN_MAX) |
@@ -611,11 +621,22 @@ struct winsize { | |||
611 | 621 | ||
612 | #endif | 622 | #endif |
613 | 623 | ||
624 | #ifndef UT_LINESIZE | ||
625 | # define UT_LINESIZE 8 | ||
626 | #endif | ||
627 | |||
614 | /* I hope that the presence of LASTLOG_FILE is enough to detect this */ | 628 | /* I hope that the presence of LASTLOG_FILE is enough to detect this */ |
615 | #if defined(LASTLOG_FILE) && !defined(DISABLE_LASTLOG) | 629 | #if defined(LASTLOG_FILE) && !defined(DISABLE_LASTLOG) |
616 | # define USE_LASTLOG | 630 | # define USE_LASTLOG |
617 | #endif | 631 | #endif |
618 | 632 | ||
633 | #ifdef HAVE_OSF_SIA | ||
634 | # ifdef USE_SHADOW | ||
635 | # undef USE_SHADOW | ||
636 | # endif | ||
637 | # define CUSTOM_SYS_AUTH_PASSWD 1 | ||
638 | #endif | ||
639 | |||
619 | /** end of login recorder definitions */ | 640 | /** end of login recorder definitions */ |
620 | 641 | ||
621 | #endif /* _DEFINES_H */ | 642 | #endif /* _DEFINES_H */ |