From 661f63b7d2a89d91c29691ba8d01b825600e6789 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sat, 30 Aug 2008 07:32:37 +1000 Subject: - (dtucker) [openbsd-compat/bsd-poll.c] correctly check for number of FDs larger than FD_SETSIZE (OpenSSH only ever uses poll with one fd). Patch from Nicholas Marriott. --- openbsd-compat/bsd-poll.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'openbsd-compat') diff --git a/openbsd-compat/bsd-poll.c b/openbsd-compat/bsd-poll.c index 284db3a1f..f899d7a24 100644 --- a/openbsd-compat/bsd-poll.c +++ b/openbsd-compat/bsd-poll.c @@ -1,4 +1,4 @@ -/* $Id: bsd-poll.c,v 1.3 2008/04/04 05:16:36 djm Exp $ */ +/* $Id: bsd-poll.c,v 1.4 2008/08/29 21:32:38 dtucker Exp $ */ /* * Copyright (c) 2004, 2005, 2007 Darren Tucker (dtucker at zip com au). @@ -46,11 +46,12 @@ poll(struct pollfd *fds, nfds_t nfds, int timeout) struct timeval tv, *tvp = NULL; for (i = 0; i < nfds; i++) { + fd = fds[i].fd; if (fd >= FD_SETSIZE) { errno = EINVAL; return -1; } - maxfd = MAX(maxfd, fds[i].fd); + maxfd = MAX(maxfd, fd); } nmemb = howmany(maxfd + 1 , NFDBITS); -- cgit v1.2.3 From 351529ce3089bbfdc65488961016153c4e8fee03 Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Wed, 7 Jan 2009 10:04:12 -0800 Subject: - (tim) [configure.ac defines.h openbsd-compat/port-uw.c openbsd-compat/xcrypt.c] Add SECUREWARE support to OpenServer 6 SVR5 ABI. OK djm@ dtucker@ --- ChangeLog | 7 ++++++- configure.ac | 9 +++++++-- defines.h | 4 ++-- openbsd-compat/port-uw.c | 4 ++-- openbsd-compat/xcrypt.c | 2 +- 5 files changed, 18 insertions(+), 8 deletions(-) (limited to 'openbsd-compat') diff --git a/ChangeLog b/ChangeLog index 93e72b3cd..6d7c7c538 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +20090107 + - (tim) [configure.ac defines.h openbsd-compat/port-uw.c + openbsd-compat/xcrypt.c] Add SECUREWARE support to OpenServer 6 SVR5 ABI. + OK djm@ dtucker@ + 20081209 - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2008/12/09 02:38:18 @@ -4989,5 +4994,5 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5155 2008/12/09 03:12:33 djm Exp $ +$Id: ChangeLog,v 1.5156 2009/01/07 18:04:12 tim Exp $ diff --git a/configure.ac b/configure.ac index 43732abb8..df834baca 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.411 2008/12/07 22:35:36 djm Exp $ +# $Id: configure.ac,v 1.412 2009/01/07 18:04:12 tim Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) -AC_REVISION($Revision: 1.411 $) +AC_REVISION($Revision: 1.412 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -741,6 +741,11 @@ mips-sony-bsd|mips-sony-newsos4) AC_DEFINE(BROKEN_LIBIAF, 1, [ia_uinfo routines not supported by OS yet]) AC_DEFINE(BROKEN_UPDWTMPX) + AC_CHECK_LIB(prot, getluid,[ LIBS="$LIBS -lprot" + AC_CHECK_FUNCS(getluid setluid,,,-lprot) + AC_DEFINE(HAVE_SECUREWARE) + AC_DEFINE(DISABLE_SHADOW) + ],,) ;; *) AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*") ;; diff --git a/defines.h b/defines.h index a8203ebbb..610e149cf 100644 --- a/defines.h +++ b/defines.h @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.151 2008/07/04 13:10:49 djm Exp $ */ +/* $Id: defines.h,v 1.152 2009/01/07 18:04:12 tim Exp $ */ /* Constants */ @@ -698,7 +698,7 @@ struct winsize { # define CUSTOM_SYS_AUTH_PASSWD 1 #endif -#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) +#if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(HAVE_SECUREWARE) # define CUSTOM_SYS_AUTH_PASSWD 1 #endif #if defined(HAVE_LIBIAF) && defined(HAVE_SET_ID) && !defined(BROKEN_LIBIAF) diff --git a/openbsd-compat/port-uw.c b/openbsd-compat/port-uw.c index ebc229a6a..be9905a6a 100644 --- a/openbsd-compat/port-uw.c +++ b/openbsd-compat/port-uw.c @@ -25,7 +25,7 @@ #include "includes.h" -#ifdef HAVE_LIBIAF +#if defined(HAVE_LIBIAF) && !defined(HAVE_SECUREWARE) #include #ifdef HAVE_CRYPT_H # include @@ -145,5 +145,5 @@ get_iaf_password(struct passwd *pw) fatal("ia_openinfo: Unable to open the shadow passwd file"); } #endif /* USE_LIBIAF */ -#endif /* HAVE_LIBIAF */ +#endif /* HAVE_LIBIAF and not HAVE_SECUREWARE */ diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index d8636bb39..6291e2884 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c @@ -28,7 +28,7 @@ #include #include -# ifdef HAVE_CRYPT_H +# if defined(HAVE_CRYPT_H) && !defined(HAVE_SECUREWARE) # include # endif -- cgit v1.2.3 From 3f94aaf38c815f0aa72c3c7bf40491c8d456e929 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 16 Feb 2009 15:21:39 +1100 Subject: - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh] [regress/putty-kex.sh regress/putty-transfer.sh] Downgrade disabled interop tests from FATAL error to a warning. Allows some interop tests to proceed if others are missing necessary prerequisites. --- ChangeLog | 8 +++++++- openbsd-compat/xmmap.c | 5 +++-- regress/conch-ciphers.sh | 3 ++- regress/putty-ciphers.sh | 3 ++- regress/putty-kex.sh | 3 ++- regress/putty-transfer.sh | 3 ++- 6 files changed, 18 insertions(+), 7 deletions(-) (limited to 'openbsd-compat') diff --git a/ChangeLog b/ChangeLog index d4b454fc3..2fff9e388 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20090216 + - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh] + [regress/putty-kex.sh regress/putty-transfer.sh] Downgrade disabled + interop tests from FATAL error to a warning. Allows some interop + tests to proceed if others are missing necessary prerequisites. + 20090214 - (djm) OpenBSD CVS Sync - dtucker@cvs.openbsd.org 2009/02/02 11:15:14 @@ -5163,5 +5169,5 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5195 2009/02/14 07:00:52 djm Exp $ +$Id: ChangeLog,v 1.5196 2009/02/16 04:21:39 djm Exp $ diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c index 23efe3888..04c6babc2 100644 --- a/openbsd-compat/xmmap.c +++ b/openbsd-compat/xmmap.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $Id: xmmap.c,v 1.14 2007/06/11 02:52:24 djm Exp $ */ +/* $Id: xmmap.c,v 1.15 2009/02/16 04:21:40 djm Exp $ */ #include "includes.h" @@ -71,7 +71,8 @@ xmmap(size_t size) fatal("mkstemp(\"%s\"): %s", MM_SWAP_TEMPLATE, strerror(errno)); unlink(tmpname); - ftruncate(tmpfd, size); + if (ftruncate(tmpfd, size) != 0) + fatal("%s: ftruncate: %s", __func__, strerror(errno)); address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, tmpfd, (off_t)0); close(tmpfd); diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh index 84b190618..5b65cd993 100644 --- a/regress/conch-ciphers.sh +++ b/regress/conch-ciphers.sh @@ -7,7 +7,8 @@ DATA=/bin/ls COPY=${OBJ}/copy if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then - fatal "conch interop tests not enabled" + echo "conch interop tests not enabled" + exit 0 fi start_sshd diff --git a/regress/putty-ciphers.sh b/regress/putty-ciphers.sh index 441053627..928ea60d2 100644 --- a/regress/putty-ciphers.sh +++ b/regress/putty-ciphers.sh @@ -7,7 +7,8 @@ DATA=/bin/ls COPY=${OBJ}/copy if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then - fatal "putty interop tests not enabled" + echo "putty interop tests not enabled" + exit 0 fi for c in aes blowfish 3des arcfour aes128-ctr aes192-ctr aes256-ctr ; do diff --git a/regress/putty-kex.sh b/regress/putty-kex.sh index 2534b8575..293885a8a 100644 --- a/regress/putty-kex.sh +++ b/regress/putty-kex.sh @@ -7,7 +7,8 @@ DATA=/bin/ls COPY=${OBJ}/copy if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then - fatal "putty interop tests not enabled" + echo "putty interop tests not enabled" + exit 0 fi for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ; do diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh index 6b21f3be7..9e1e1550a 100644 --- a/regress/putty-transfer.sh +++ b/regress/putty-transfer.sh @@ -7,7 +7,8 @@ DATA=/bin/ls COPY=${OBJ}/copy if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then - fatal "putty interop tests not enabled" + echo "putty interop tests not enabled" + exit 0 fi # XXX support protocol 1 too -- cgit v1.2.3