summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--acconfig.h5
-rw-r--r--configure.ac11
-rw-r--r--defines.h7
4 files changed, 23 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7712628cc..409c9bae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120040412 120040412
2 - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning 2 - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning
3 from bug #701 (text from jfh at cise.ufl.edu). 3 from bug #701 (text from jfh at cise.ufl.edu).
4 - (dtucker) [acconfig.h configure.ac defines.h] Bug #673: check for 4-arg
5 skeychallenge(), eg on NetBSD. ok mouring@
4 6
520040408 720040408
6 - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating 8 - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating
@@ -961,4 +963,4 @@
961 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 963 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
962 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 964 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
963 965
964$Id: ChangeLog,v 1.3308 2004/04/14 03:04:35 dtucker Exp $ 966$Id: ChangeLog,v 1.3309 2004/04/14 05:26:39 dtucker Exp $
diff --git a/acconfig.h b/acconfig.h
index 7e788b826..f1db83e43 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
1/* $Id: acconfig.h,v 1.175 2004/04/07 04:16:11 mouring Exp $ */ 1/* $Id: acconfig.h,v 1.176 2004/04/14 05:26:39 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1999-2003 Damien Miller. All rights reserved. 4 * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@@ -131,6 +131,9 @@
131/* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */ 131/* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */
132#undef AIX_LOGINFAILED_4ARG 132#undef AIX_LOGINFAILED_4ARG
133 133
134/* Define if your skeychallenge() function takes 4 arguments (eg NetBSD) */
135#undef SKEYCHALLENGE_4ARG
136
134/* Define if you have/want arrays (cluster-wide session managment, not C arrays) */ 137/* Define if you have/want arrays (cluster-wide session managment, not C arrays) */
135#undef WITH_IRIX_ARRAY 138#undef WITH_IRIX_ARRAY
136 139
diff --git a/configure.ac b/configure.ac
index fa5021cfa..763c26275 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.211 2004/04/07 04:16:11 mouring Exp $ 1# $Id: configure.ac,v 1.212 2004/04/14 05:26:39 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -743,6 +743,15 @@ int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); }
743 AC_MSG_RESULT(no) 743 AC_MSG_RESULT(no)
744 AC_MSG_ERROR([** Incomplete or missing s/key libraries.]) 744 AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
745 ]) 745 ])
746 AC_MSG_CHECKING(if skeychallenge takes 4 arguments)
747 AC_TRY_COMPILE(
748 [#include <stdio.h>
749 #include <skey.h>],
750 [(void)skeychallenge(NULL,"name","",0);],
751 [AC_MSG_RESULT(yes)
752 AC_DEFINE(SKEYCHALLENGE_4ARG)],
753 [AC_MSG_RESULT(no)]
754 )
746 fi 755 fi
747 ] 756 ]
748) 757)
diff --git a/defines.h b/defines.h
index a4fdd2c83..f52dfd256 100644
--- a/defines.h
+++ b/defines.h
@@ -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.113 2004/04/08 06:16:06 dtucker Exp $ */ 28/* $Id: defines.h,v 1.114 2004/04/14 05:26:39 dtucker Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -546,6 +546,11 @@ struct winsize {
546#endif 546#endif
547 547
548 548
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
549/* 554/*
550 * Define this to use pipes instead of socketpairs for communicating with the 555 * Define this to use pipes instead of socketpairs for communicating with the
551 * client program. Socketpairs do not seem to work on all systems. 556 * client program. Socketpairs do not seem to work on all systems.