diff options
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 13 |
1 files changed, 7 insertions, 6 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.114 2004/04/14 05:26:39 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 */ |
@@ -538,6 +538,12 @@ struct winsize { | |||
538 | # define krb5_get_err_text(context,code) error_message(code) | 538 | # define krb5_get_err_text(context,code) error_message(code) |
539 | #endif | 539 | #endif |
540 | 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 | |||
541 | /* Maximum number of file descriptors available */ | 547 | /* Maximum number of file descriptors available */ |
542 | #ifdef HAVE_SYSCONF | 548 | #ifdef HAVE_SYSCONF |
543 | # define SSH_SYSFDMAX sysconf(_SC_OPEN_MAX) | 549 | # define SSH_SYSFDMAX sysconf(_SC_OPEN_MAX) |
@@ -546,11 +552,6 @@ struct winsize { | |||
546 | #endif | 552 | #endif |
547 | 553 | ||
548 | 554 | ||
549 | /* Some platforms, eg NetBSD, have a 4th argument for skeychallenge() */ | ||
550 | #ifdef SKEYCHALLENGE_4ARG | ||
551 | # define skeychallenge(a,b,c) skeychallenge((a), (b), (c), (sizeof(c))) | ||
552 | #endif | ||
553 | |||
554 | /* | 555 | /* |
555 | * Define this to use pipes instead of socketpairs for communicating with the | 556 | * Define this to use pipes instead of socketpairs for communicating with the |
556 | * client program. Socketpairs do not seem to work on all systems. | 557 | * client program. Socketpairs do not seem to work on all systems. |