diff options
author | Damien Miller <djm@mindrot.org> | 1999-11-18 09:28:11 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-11-18 09:28:11 +1100 |
commit | 81428f9d10e81d9fe2e4af10df0c4e38d1192d70 (patch) | |
tree | b19982baa6558d387f3537ef67d64a5f6a38ebd0 | |
parent | 10f6f6ba9ee14d306f8780edee8a10640c1643e0 (diff) |
- Merged OpenBSD CVS changes
- [scp.c] foregroundproc() in scp
- [sshconnect.h] include fingerprint.h
- [sshd.c] bugfix: the log() for passwd-auth escaped during logging
changes.
- Added openssh.com info to README
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | README | 6 | ||||
-rw-r--r-- | scp.c | 26 | ||||
-rw-r--r-- | sshconnect.c | 3 | ||||
-rw-r--r-- | sshd.c | 8 |
5 files changed, 41 insertions, 10 deletions
@@ -1,3 +1,11 @@ +19991118 + - Merged OpenBSD CVS changes + - [scp.c] foregroundproc() in scp + - [sshconnect.h] include fingerprint.h + - [sshd.c] bugfix: the log() for passwd-auth escaped during logging + changes. + - Added openssh.com info to README + 19991117 - Merged OpenBSD CVS changes - [ChangeLog.Ylonen] noone needs this anymore @@ -5,7 +5,8 @@ all patent-encumbered algorithms removed, all known security bugs fixed, new features reintroduced and many other clean-ups. More information about SSH itself can be found in the file README.Ylonen. OpenSSH has been created by Aaron Cambell, Bob Beck, Markus Friedl, -Niels Provos, Theo de Raadt, and Dug Song. +Niels Provos, Theo de Raadt, and Dug Song. It has a homepage at +http://www.openssh.com/ This port consists of the re-introduction of autoconf support, PAM support (for Linux and Solaris), EGD[1] support, and replacements for @@ -47,7 +48,8 @@ Internet Business Solutions Credits - -The OpenBSD team +Aaron Cambell, Bob Beck, Markus Friedl, Niels Provos, +Theo de Raadt, and Dug Song - Creators of OpenSSH 'jonchen' - the original author of PAM support of SSH Dan Brosemer <odin@linuxfreak.com> - Autoconf and build fixes & Debian scripts Nalin Dahyabhai <nalin.dahyabhai@pobox.com> - PAM environment patch @@ -42,11 +42,11 @@ and ssh has the necessary privileges.) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scp.c,v 1.6 1999/11/13 02:22:46 damien Exp $ + * $Id: scp.c,v 1.7 1999/11/17 22:28:11 damien Exp $ */ #include "includes.h" -RCSID("$Id: scp.c,v 1.6 1999/11/13 02:22:46 damien Exp $"); +RCSID("$Id: scp.c,v 1.7 1999/11/17 22:28:11 damien Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -976,7 +976,7 @@ run_err(const char *fmt, ...) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scp.c,v 1.6 1999/11/13 02:22:46 damien Exp $ + * $Id: scp.c,v 1.7 1999/11/17 22:28:11 damien Exp $ */ char * @@ -1112,6 +1112,19 @@ updateprogressmeter(void) errno = save_errno; } +int +foregroundproc() +{ + static pid_t pgrp = -1; + int ctty_pgrp; + + if (pgrp == -1) + pgrp = getpgrp(); + + return((ioctl(STDOUT_FILENO, TIOCGPGRP, &ctty_pgrp) != -1 && + ctty_pgrp == pgrp)); +} + void progressmeter(int flag) { @@ -1129,6 +1142,9 @@ progressmeter(int flag) lastupdate = start; lastsize = 0; } + if (foregroundproc() == 0) + return; + (void)gettimeofday(&now, (struct timezone *)0); cursize = statbytes; if (totalbytes != 0) { @@ -1145,10 +1161,10 @@ progressmeter(int flag) if (barlength > 0) { i = barlength * ratio / 100; snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), - "|%.*s%*s|", i, + "|%.*s%*s|", i, "*****************************************************************************" "*****************************************************************************", - barlength - i, ""); + barlength - i, ""); } i = 0; diff --git a/sshconnect.c b/sshconnect.c index be0a6c4b..74d41e62 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -15,7 +15,7 @@ login (authentication) dialog. */ #include "includes.h" -RCSID("$Id: sshconnect.c,v 1.10 1999/11/17 06:29:08 damien Exp $"); +RCSID("$Id: sshconnect.c,v 1.11 1999/11/17 22:28:11 damien Exp $"); #ifdef HAVE_OPENSSL #include <openssl/bn.h> @@ -36,6 +36,7 @@ RCSID("$Id: sshconnect.c,v 1.10 1999/11/17 06:29:08 damien Exp $"); #include "uidswap.h" #include "compat.h" #include "readconf.h" +#include "fingerprint.h" /* Session id for the current session. */ unsigned char session_id[16]; @@ -18,7 +18,7 @@ agent connections. */ #include "includes.h" -RCSID("$Id: sshd.c,v 1.22 1999/11/17 06:29:08 damien Exp $"); +RCSID("$Id: sshd.c,v 1.23 1999/11/17 22:28:11 damien Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -1422,11 +1422,12 @@ do_authloop(struct passwd *pw) n = BN_new(); packet_get_bignum(n, &nlen); packet_integrity_check(plen, nlen, type); + authenticated = auth_rsa(pw, n); - BN_clear_free(n); log("RSA authentication %s for %.100s.", authenticated ? "accepted" : "failed", pw->pw_name); + BN_clear_free(n); break; case SSH_CMSG_AUTH_PASSWORD: @@ -1459,6 +1460,9 @@ do_authloop(struct passwd *pw) #else /* HAVE_LIBPAM */ /* Try authentication with the password. */ authenticated = auth_password(pw, password); + log("Password authentication %s for %.100s.", + authenticated ? "accepted" : "failed", + pw->pw_name); memset(password, 0, strlen(password)); xfree(password); |