From 8db9a0ffd86d387e5362c5ecf7fdb225bd6f71bf Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 6 Apr 2004 21:31:12 +1000 Subject: - (dtucker) [acconfig.h configure.ac defines.h] Bug #820: don't use updwtmpx() on IRIX since it seems to clobber utmp. ok djm@ --- acconfig.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'acconfig.h') diff --git a/acconfig.h b/acconfig.h index 62252d760..a1f4556f8 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,4 +1,4 @@ -/* $Id: acconfig.h,v 1.173 2004/02/06 05:24:31 dtucker Exp $ */ +/* $Id: acconfig.h,v 1.174 2004/04/06 11:31:13 dtucker Exp $ */ /* * Copyright (c) 1999-2003 Damien Miller. All rights reserved. @@ -347,6 +347,9 @@ /* getaddrinfo is broken (if present) */ #undef BROKEN_GETADDRINFO +/* updwtmpx is broken (if present) */ +#undef BROKEN_UPDWTMPX + /* Workaround more Linux IPv6 quirks */ #undef DONT_TRY_OTHER_AF -- cgit v1.2.3 From a8104b5c92a44774208e6d8b979d583975ba67d4 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Wed, 7 Apr 2004 04:16:11 +0000 Subject: - (bal) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Check to see if Krb5 library exports krb5_init_etc() since some OSes (like MacOS/X) are starting to restrict it as internal since it is not needed by developers any more. (Patch based on Apple tree) - (bal) [monitor.c monitor_wrap.c] monitor_wrap.c] moved zlib.h higher since krb5 on MacOS/X conflicts. There may be a better solution, but this will work for now. --- ChangeLog | 9 ++++++++- acconfig.h | 5 ++++- auth-krb5.c | 2 ++ configure.ac | 3 ++- gss-serv-krb5.c | 2 ++ monitor.c | 3 ++- monitor_wrap.c | 3 ++- 7 files changed, 22 insertions(+), 5 deletions(-) (limited to 'acconfig.h') diff --git a/ChangeLog b/ChangeLog index 47d19f53a..62c16684a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ 20040407 - (dtucker) [session.c] Flush stdout after displaying loginmsg. From f_mohr at yahoo.de. + - (bal) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Check to see + if Krb5 library exports krb5_init_etc() since some OSes (like MacOS/X) + are starting to restrict it as internal since it is not needed by + developers any more. (Patch based on Apple tree) + - (bal) [monitor.c monitor_wrap.c] monitor_wrap.c] moved zlib.h higher since + krb5 on MacOS/X conflicts. There may be a better solution, but this will + work for now. 20040406 - (dtucker) [acconfig.h configure.ac defines.h] Bug #820: don't use @@ -940,4 +947,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3302 2004/04/06 22:04:09 dtucker Exp $ +$Id: ChangeLog,v 1.3303 2004/04/07 04:16:11 mouring Exp $ diff --git a/acconfig.h b/acconfig.h index a1f4556f8..7e788b826 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,4 +1,4 @@ -/* $Id: acconfig.h,v 1.174 2004/04/06 11:31:13 dtucker Exp $ */ +/* $Id: acconfig.h,v 1.175 2004/04/07 04:16:11 mouring Exp $ */ /* * Copyright (c) 1999-2003 Damien Miller. All rights reserved. @@ -202,6 +202,9 @@ /* Define if you don't want to use lastlog in session.c */ #undef NO_SSH_LASTLOG +/* Definite if have krb5_init_ets */ +#undef KRB5_INIT_ETS + /* Define if you don't want to use utmp */ #undef DISABLE_UTMP diff --git a/auth-krb5.c b/auth-krb5.c index 859492478..baa1a6317 100644 --- a/auth-krb5.c +++ b/auth-krb5.c @@ -54,7 +54,9 @@ krb5_init(void *context) problem = krb5_init_context(&authctxt->krb5_ctx); if (problem) return (problem); +#ifdef KRB5_INIT_ETS krb5_init_ets(authctxt->krb5_ctx); +#endif } return (0); } diff --git a/configure.ac b/configure.ac index a06452bd9..fa5021cfa 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.210 2004/04/06 11:41:51 dtucker Exp $ +# $Id: configure.ac,v 1.211 2004/04/07 04:16:11 mouring Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -2240,6 +2240,7 @@ AC_ARG_WITH(kerberos5, LIBS="$LIBS $K5LIBS" AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS)) + AC_SEARCH_LIBS(krb5_init_ets, $K5LIBS, AC_DEFINE(KRB5_INIT_ETS)) ] ) diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c index 8ba3e7182..4e3598ead 100644 --- a/gss-serv-krb5.c +++ b/gss-serv-krb5.c @@ -65,7 +65,9 @@ ssh_gssapi_krb5_init() logit("Cannot initialize krb5 context"); return 0; } +#ifdef KRB5_INIT_ETS krb5_init_ets(krb_context); +#endif return 1; } diff --git a/monitor.c b/monitor.c index 30f7258a0..d44f92d59 100644 --- a/monitor.c +++ b/monitor.c @@ -33,11 +33,12 @@ RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $"); #include #endif +#include "zlib.h" /* XXX Moved due to conflict on MacOS/X */ + #include "ssh.h" #include "auth.h" #include "kex.h" #include "dh.h" -#include "zlib.h" #include "packet.h" #include "auth-options.h" #include "sshpty.h" diff --git a/monitor_wrap.c b/monitor_wrap.c index b1b1c3a61..9e0417bdc 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -30,6 +30,8 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $"); #include #include +#include "zlib.h" /* XXX Moved due to conflict on MacOS/X */ + #include "ssh.h" #include "dh.h" #include "kex.h" @@ -40,7 +42,6 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $"); #include "packet.h" #include "mac.h" #include "log.h" -#include "zlib.h" #include "monitor.h" #include "monitor_wrap.h" #include "xmalloc.h" -- cgit v1.2.3 From 3b908f65b4b668d20ef0d20c695cb053829bdaef Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 14 Apr 2004 15:26:39 +1000 Subject: - (dtucker) [acconfig.h configure.ac defines.h] Bug #673: check for 4-arg skeychallenge(), eg on NetBSD. ok mouring@ --- ChangeLog | 4 +++- acconfig.h | 5 ++++- configure.ac | 11 ++++++++++- defines.h | 7 ++++++- 4 files changed, 23 insertions(+), 4 deletions(-) (limited to 'acconfig.h') diff --git a/ChangeLog b/ChangeLog index 7712628cc..409c9bae5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 20040412 - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning 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@ 20040408 - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating @@ -961,4 +963,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3308 2004/04/14 03:04:35 dtucker Exp $ +$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 @@ -/* $Id: acconfig.h,v 1.175 2004/04/07 04:16:11 mouring Exp $ */ +/* $Id: acconfig.h,v 1.176 2004/04/14 05:26:39 dtucker Exp $ */ /* * Copyright (c) 1999-2003 Damien Miller. All rights reserved. @@ -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 diff --git a/configure.ac b/configure.ac index fa5021cfa..763c26275 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.211 2004/04/07 04:16:11 mouring Exp $ +# $Id: configure.ac,v 1.212 2004/04/14 05:26:39 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -743,6 +743,15 @@ int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); } 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 + #include ], + [(void)skeychallenge(NULL,"name","",0);], + [AC_MSG_RESULT(yes) + AC_DEFINE(SKEYCHALLENGE_4ARG)], + [AC_MSG_RESULT(no)] + ) fi ] ) diff --git a/defines.h b/defines.h index a4fdd2c83..f52dfd256 100644 --- a/defines.h +++ b/defines.h @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.113 2004/04/08 06:16:06 dtucker Exp $ */ +/* $Id: defines.h,v 1.114 2004/04/14 05:26:39 dtucker Exp $ */ /* Constants */ @@ -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. -- cgit v1.2.3 From 855ffbfc5a08d084ea994515c458f3272ad6d819 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 16 Apr 2004 09:22:40 +1000 Subject: Typo fix in comment --- acconfig.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'acconfig.h') diff --git a/acconfig.h b/acconfig.h index f1db83e43..f14353519 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,4 +1,4 @@ -/* $Id: acconfig.h,v 1.176 2004/04/14 05:26:39 dtucker Exp $ */ +/* $Id: acconfig.h,v 1.177 2004/04/15 23:22:40 dtucker Exp $ */ /* * Copyright (c) 1999-2003 Damien Miller. All rights reserved. @@ -205,7 +205,7 @@ /* Define if you don't want to use lastlog in session.c */ #undef NO_SSH_LASTLOG -/* Definite if have krb5_init_ets */ +/* Define if have krb5_init_ets */ #undef KRB5_INIT_ETS /* Define if you don't want to use utmp */ -- cgit v1.2.3