diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /defines.h | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 62 |
1 files changed, 34 insertions, 28 deletions
@@ -25,12 +25,12 @@ | |||
25 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
26 | #define _DEFINES_H | 26 | #define _DEFINES_H |
27 | 27 | ||
28 | /* $Id: defines.h,v 1.130 2005/12/17 11:04:09 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.138 2006/09/21 13:13:30 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
32 | 32 | ||
33 | #ifndef SHUT_RDWR | 33 | #if defined(HAVE_DECL_SHUT_RD) && HAVE_DECL_SHUT_RD == 0 |
34 | enum | 34 | enum |
35 | { | 35 | { |
36 | SHUT_RD = 0, /* No more receptions. */ | 36 | SHUT_RD = 0, /* No more receptions. */ |
@@ -90,8 +90,8 @@ enum | |||
90 | #endif | 90 | #endif |
91 | #endif | 91 | #endif |
92 | 92 | ||
93 | #ifndef O_NONBLOCK /* Non Blocking Open */ | 93 | #if defined(HAVE_DECL_O_NONBLOCK) && HAVE_DECL_O_NONBLOCK == 0 |
94 | # define O_NONBLOCK 00004 | 94 | # define O_NONBLOCK 00004 /* Non Blocking Open */ |
95 | #endif | 95 | #endif |
96 | 96 | ||
97 | #ifndef S_ISDIR | 97 | #ifndef S_ISDIR |
@@ -143,16 +143,11 @@ including rpc/rpc.h breaks Solaris 6 | |||
143 | #define INADDR_LOOPBACK ((u_long)0x7f000001) | 143 | #define INADDR_LOOPBACK ((u_long)0x7f000001) |
144 | #endif | 144 | #endif |
145 | 145 | ||
146 | #ifndef __unused | ||
147 | #define __unused | ||
148 | #endif | ||
149 | |||
150 | /* Types */ | 146 | /* Types */ |
151 | 147 | ||
152 | /* If sys/types.h does not supply intXX_t, supply them ourselves */ | 148 | /* If sys/types.h does not supply intXX_t, supply them ourselves */ |
153 | /* (or die trying) */ | 149 | /* (or die trying) */ |
154 | 150 | ||
155 | |||
156 | #ifndef HAVE_U_INT | 151 | #ifndef HAVE_U_INT |
157 | typedef unsigned int u_int; | 152 | typedef unsigned int u_int; |
158 | #endif | 153 | #endif |
@@ -496,6 +491,22 @@ struct winsize { | |||
496 | # define offsetof(type, member) ((size_t) &((type *)0)->member) | 491 | # define offsetof(type, member) ((size_t) &((type *)0)->member) |
497 | #endif | 492 | #endif |
498 | 493 | ||
494 | /* Set up BSD-style BYTE_ORDER definition if it isn't there already */ | ||
495 | /* XXX: doesn't try to cope with strange byte orders (PDP_ENDIAN) */ | ||
496 | #ifndef BYTE_ORDER | ||
497 | # ifndef LITTLE_ENDIAN | ||
498 | # define LITTLE_ENDIAN 1234 | ||
499 | # endif /* LITTLE_ENDIAN */ | ||
500 | # ifndef BIG_ENDIAN | ||
501 | # define BIG_ENDIAN 4321 | ||
502 | # endif /* BIG_ENDIAN */ | ||
503 | # ifdef WORDS_BIGENDIAN | ||
504 | # define BYTE_ORDER BIG_ENDIAN | ||
505 | # else /* WORDS_BIGENDIAN */ | ||
506 | # define BYTE_ORDER LITTLE_ENDIAN | ||
507 | # endif /* WORDS_BIGENDIAN */ | ||
508 | #endif /* BYTE_ORDER */ | ||
509 | |||
499 | /* Function replacement / compatibility hacks */ | 510 | /* Function replacement / compatibility hacks */ |
500 | 511 | ||
501 | #if !defined(HAVE_GETADDRINFO) && (defined(HAVE_OGETADDRINFO) || defined(HAVE_NGETADDRINFO)) | 512 | #if !defined(HAVE_GETADDRINFO) && (defined(HAVE_OGETADDRINFO) || defined(HAVE_NGETADDRINFO)) |
@@ -517,19 +528,6 @@ struct winsize { | |||
517 | # define optarg BSDoptarg | 528 | # define optarg BSDoptarg |
518 | #endif | 529 | #endif |
519 | 530 | ||
520 | /* In older versions of libpam, pam_strerror takes a single argument */ | ||
521 | #ifdef HAVE_OLD_PAM | ||
522 | # define PAM_STRERROR(a,b) pam_strerror((b)) | ||
523 | #else | ||
524 | # define PAM_STRERROR(a,b) pam_strerror((a),(b)) | ||
525 | #endif | ||
526 | |||
527 | #ifdef PAM_SUN_CODEBASE | ||
528 | # define PAM_MSG_MEMBER(msg, n, member) ((*(msg))[(n)].member) | ||
529 | #else | ||
530 | # define PAM_MSG_MEMBER(msg, n, member) ((msg)[(n)]->member) | ||
531 | #endif | ||
532 | |||
533 | #if defined(BROKEN_GETADDRINFO) && defined(HAVE_GETADDRINFO) | 531 | #if defined(BROKEN_GETADDRINFO) && defined(HAVE_GETADDRINFO) |
534 | # undef HAVE_GETADDRINFO | 532 | # undef HAVE_GETADDRINFO |
535 | #endif | 533 | #endif |
@@ -544,6 +542,11 @@ struct winsize { | |||
544 | # undef HAVE_UPDWTMPX | 542 | # undef HAVE_UPDWTMPX |
545 | #endif | 543 | #endif |
546 | 544 | ||
545 | #if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT) && \ | ||
546 | defined(SYSLOG_R_SAFE_IN_SIGHAND) | ||
547 | # define DO_LOG_SAFE_IN_SIGHAND | ||
548 | #endif | ||
549 | |||
547 | #if !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) | 550 | #if !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) |
548 | # define memmove(s1, s2, n) bcopy((s2), (s1), (n)) | 551 | # define memmove(s1, s2, n) bcopy((s2), (s1), (n)) |
549 | #endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */ | 552 | #endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */ |
@@ -553,6 +556,7 @@ struct winsize { | |||
553 | #endif /* defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) */ | 556 | #endif /* defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) */ |
554 | 557 | ||
555 | #ifndef GETPGRP_VOID | 558 | #ifndef GETPGRP_VOID |
559 | # include <unistd.h> | ||
556 | # define getpgrp() getpgrp(0) | 560 | # define getpgrp() getpgrp(0) |
557 | #endif | 561 | #endif |
558 | 562 | ||
@@ -715,12 +719,14 @@ struct winsize { | |||
715 | # undef HAVE_MMAP | 719 | # undef HAVE_MMAP |
716 | #endif | 720 | #endif |
717 | 721 | ||
718 | /* some system headers on HP-UX define YES/NO */ | 722 | #ifndef IOV_MAX |
719 | #ifdef YES | 723 | # if defined(_XOPEN_IOV_MAX) |
720 | # undef YES | 724 | # define IOV_MAX _XOPEN_IOV_MAX |
721 | #endif | 725 | # elif defined(DEF_IOV_MAX) |
722 | #ifdef NO | 726 | # define IOV_MAX DEF_IOV_MAX |
723 | # undef NO | 727 | # else |
728 | # define IOV_MAX 16 | ||
729 | # endif | ||
724 | #endif | 730 | #endif |
725 | 731 | ||
726 | #endif /* _DEFINES_H */ | 732 | #endif /* _DEFINES_H */ |