diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-04-14 17:24:30 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-04-14 17:24:30 +1000 |
commit | 06a8cfe796bc9afb8bdd9127f348139ec68809fd (patch) | |
tree | cacace28ddb2b3e2611bdaed86e60a581cd6ff28 /defines.h | |
parent | 3b908f65b4b668d20ef0d20c695cb053829bdaef (diff) |
- (dtucker) [auth-skey.c defines.h monitor.c] Make skeychallenge explicitly
4-arg, with compatibility for 3-arg versions. From djm@, ok me.
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.114 2004/04/14 05:26:39 dtucker Exp $ */ +/* $Id: defines.h,v 1.115 2004/04/14 07:24:30 dtucker Exp $ */ /* Constants */ @@ -538,6 +538,12 @@ struct winsize { # define krb5_get_err_text(context,code) error_message(code) #endif +#if defined(SKEYCHALLENGE_4ARG) +# define _compat_skeychallenge(a,b,c,d) skeychallenge(a,b,c,d) +#else +# define _compat_skeychallenge(a,b,c,d) skeychallenge(a,b,c) +#endif + /* Maximum number of file descriptors available */ #ifdef HAVE_SYSCONF # define SSH_SYSFDMAX sysconf(_SC_OPEN_MAX) @@ -546,11 +552,6 @@ struct winsize { #endif -/* Some platforms, eg NetBSD, have a 4th argument for skeychallenge() */ -#ifdef SKEYCHALLENGE_4ARG -# define skeychallenge(a,b,c) skeychallenge((a), (b), (c), (sizeof(c))) -#endif - /* * Define this to use pipes instead of socketpairs for communicating with the * client program. Socketpairs do not seem to work on all systems. |