- (dtucker) [auth-skey.c defines.h monitor.c] Make skeychallenge explicitly

   4-arg, with compatibility for 3-arg versions.  From djm@, ok me.

diff --git a/ChangeLog b/ChangeLog
index c28915f504117121bc46549f0ef9b36c74f871b0..afc94920b5930d33ca8400c68ebd4b4d95c3a42a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    from bug #701 (text from jfh at cise.ufl.edu).
  - (dtucker) [acconfig.h configure.ac defines.h] Bug #673: check for 4-arg
    skeychallenge(), eg on NetBSD.  ok mouring@
+ - (dtucker) [auth-skey.c defines.h monitor.c] Make skeychallenge explicitly
+   4-arg, with compatibility for 3-arg versions.  From djm@, ok me.
 
 20040408
  - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating

diff --git a/auth-skey.c b/auth-skey.c
index f9ea03fd1a9b2b7746406917eb102ab4e1ea487a..ac1af69ed917473b147c05bff3b78bbb65ccfeaf 100644 (file)
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -47,7 +47,8 @@ skey_query(void *ctx, char **name, char **infotxt,
        int len;
        struct skey skey;
 
-       if (skeychallenge(&skey, authctxt->user, challenge) == -1)
+       if (_compat_skeychallenge(&skey, authctxt->user, challenge, 
+           sizeof(challenge)) == -1)
                return -1;
 
        *name  = xstrdup("");

diff --git a/defines.h b/defines.h
index f5c599b6edb898c519ec6e153e43ea5535a9a30e..889b918867b8907a7c3e64c1e2cd924a5a15b4d6 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -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.

diff --git a/monitor.c b/monitor.c
index 37d40fcca91ccec77e21acb4edf45c9721fd4530..9c30c1c390e0faa3d53707335ee58fdb2508c585 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -744,7 +744,8 @@ mm_answer_skeyquery(int socket, Buffer *m)
        char challenge[1024];
        u_int success;
 
-       success = skeychallenge(&skey, authctxt->user, challenge) < 0 ? 0 : 1;
+       success = _compat_skeychallenge(&skey, authctxt->user, challenge,
+           sizeof(challenge)) < 0 ? 0 : 1;
 
        buffer_clear(m);
        buffer_put_int(m, success);