- 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
diff --git a/ChangeLog b/ChangeLog
index f42fdc7..7364548 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/README b/README
index f19e953..7a33935 100644
--- a/README
+++ b/README
@@ -5,7 +5,8 @@
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 @@
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
diff --git a/scp.c b/scp.c
index 2850f76..e156f7b 100644
--- a/scp.c
+++ b/scp.c
@@ -42,11 +42,11 @@
* 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 @@
* 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 @@
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 @@
lastupdate = start;
lastsize = 0;
}
+ if (foregroundproc() == 0)
+ return;
+
(void)gettimeofday(&now, (struct timezone *)0);
cursize = statbytes;
if (totalbytes != 0) {
@@ -1145,10 +1161,10 @@
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 be0a6c4..74d41e6 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -15,7 +15,7 @@
*/
#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 @@
#include "uidswap.h"
#include "compat.h"
#include "readconf.h"
+#include "fingerprint.h"
/* Session id for the current session. */
unsigned char session_id[16];
diff --git a/sshd.c b/sshd.c
index a40324c..9e33f69 100644
--- a/sshd.c
+++ b/sshd.c
@@ -18,7 +18,7 @@
*/
#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 @@
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 @@
#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);