summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--auth2.c4
-rw-r--r--version.h4
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c58c5f11..8765f255 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,16 @@
<Lutz.Jaenicke@aet.TU-Cottbus.DE>
- (bal) double entry in configure.in. Pointed out by Lutz Jaenicke
<Lutz.Jaenicke@aet.TU-Cottbus.DE>
+ - (stevesk) OpenBSD sync:
+ - markus@cvs.openbsd.org 2001/02/08 11:20:01
+ [auth2.c]
+ strict checking
+ - markus@cvs.openbsd.org 2001/02/08 11:15:22
+ [version.h]
+ update to 2.3.2
+ - markus@cvs.openbsd.org 2001/02/08 11:12:30
+ [auth2.c]
+ fix typo
20010208
- (djm) Don't delete external askpass program in make uninstall target.
diff --git a/auth2.c b/auth2.c
index 9cfb3c1a..f2f4812e 100644
--- a/auth2.c
+++ b/auth2.c
@@ -305,7 +305,7 @@ userauth_reply(Authctxt *authctxt, int authenticated)
char *methods;
/* XXX todo: check if multiple auth methods are needed */
- if (authenticated) {
+ if (authenticated == 1) {
#ifdef WITH_AIXAUTHENTICATE
/* We don't have a pty yet, so just label the line as "ssh" */
if (loginsuccess(authctxt->user?authctxt->user:"NOUSER",
@@ -512,7 +512,7 @@ userauth_pubkey(Authctxt *authctxt)
packet_put_string(pkblob, blen);
packet_send();
packet_write_wait();
- authenticated = -1;
+ authctxt->postponed = 1;
}
}
if (authenticated != 1)
diff --git a/version.h b/version.h
index 591fbdfc..7e86a3e7 100644
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
-/* $OpenBSD: version.h,v 1.16 2001/01/08 22:29:05 markus Exp $ */
+/* $OpenBSD: version.h,v 1.17 2001/02/08 18:15:22 markus Exp $ */
-#define SSH_VERSION "OpenSSH_2.3.1p1"
+#define SSH_VERSION "OpenSSH_2.3.2p1"