Attachment 602 Details for Bug 673 – Test if skeychallenge() takes 4 args.

[patch] Test if skeychallenge() takes 4 args.

openssh-skey-4arg.patch (text/plain), 2.06 KB, created by Darren Tucker on 2004-04-14 14:27:45 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2004-04-14 14:27:45 AEST

Size: 2.06 KB

patch

obsolete

>Index: acconfig.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/acconfig.h,v
>retrieving revision 1.175
>diff -u -p -r1.175 acconfig.h
>--- acconfig.h	7 Apr 2004 04:16:11 -0000	1.175
>+++ acconfig.h	14 Apr 2004 04:24:41 -0000
>@@ -131,6 +131,9 @@
> /* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */
> #undef AIX_LOGINFAILED_4ARG
> 
>+/* Define if your skeychallenge() function takes 4 arguments (eg NetBSD) */
>+#undef SKEYCHALLENGE_4ARG
>+
> /* Define if you have/want arrays (cluster-wide session managment, not C arrays) */
> #undef WITH_IRIX_ARRAY
> 
>Index: configure.ac
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/configure.ac,v
>retrieving revision 1.211
>diff -u -p -r1.211 configure.ac
>--- configure.ac	7 Apr 2004 04:16:11 -0000	1.211
>+++ configure.ac	14 Apr 2004 04:25:15 -0000
>@@ -743,6 +743,15 @@ int main() { char *ff = skey_keyinfo("")
> 					AC_MSG_RESULT(no)
> 					AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
> 				])
>+                 	AC_MSG_CHECKING(if skeychallenge takes 4 arguments)
>+			AC_TRY_COMPILE(
>+				[#include <stdio.h>
>+				 #include <skey.h>],
>+				[(void)skeychallenge(NULL,"name","ss",0);],
>+				[AC_MSG_RESULT(yes)
>+				 AC_DEFINE(SKEYCHALLENGE_4ARG)],
>+				[AC_MSG_RESULT(no)]
>+        		)
> 		fi
> 	]
> )
>Index: defines.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/defines.h,v
>retrieving revision 1.113
>diff -u -p -r1.113 defines.h
>--- defines.h	8 Apr 2004 06:16:06 -0000	1.113
>+++ defines.h	14 Apr 2004 04:25:33 -0000
>@@ -546,6 +546,11 @@ 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.

Actions: View | Diff

Attachments on bug 673: 602