summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--clientloop.c9
-rw-r--r--readconf.c4
3 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index baa58bc8a..b181a8cae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,10 @@
19 the next key will expire when scanning for expired keys. Set the select 19 the next key will expire when scanning for expired keys. Set the select
20 timeout to whichever of these two things happens next. With djm@, with & 20 timeout to whichever of these two things happens next. With djm@, with &
21 ok deraadt@ markus@ 21 ok deraadt@ markus@
22 - tedu@cvs.openbsd.org 2007/03/20 03:56:12
23 [readconf.c clientloop.c]
24 remove some bogus *p tests from charles longeau
25 ok deraadt millert
22 26
2320070313 2720070313
24 - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include 28 - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include
@@ -2848,4 +2852,4 @@
2848 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2852 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2849 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2853 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2850 2854
2851$Id: ChangeLog,v 1.4643 2007/03/21 09:45:06 dtucker Exp $ 2855$Id: ChangeLog,v 1.4644 2007/03/21 09:46:03 dtucker Exp $
diff --git a/clientloop.c b/clientloop.c
index c7362caa8..1aeb412a9 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.178 2007/02/20 10:25:14 djm Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.179 2007/03/20 03:56:12 tedu Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -935,7 +935,7 @@ process_cmdline(void)
935 cmd = s = read_passphrase("\r\nssh> ", RP_ECHO); 935 cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
936 if (s == NULL) 936 if (s == NULL)
937 goto out; 937 goto out;
938 while (*s && isspace(*s)) 938 while (isspace(*s))
939 s++; 939 s++;
940 if (*s == '-') 940 if (*s == '-')
941 s++; /* Skip cmdline '-', if any */ 941 s++; /* Skip cmdline '-', if any */
@@ -982,9 +982,8 @@ process_cmdline(void)
982 goto out; 982 goto out;
983 } 983 }
984 984
985 s++; 985 while (isspace(*++s))
986 while (*s && isspace(*s)) 986 ;
987 s++;
988 987
989 if (delete) { 988 if (delete) {
990 cancel_port = 0; 989 cancel_port = 0;
diff --git a/readconf.c b/readconf.c
index 2485146a0..d57d4551d 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.c,v 1.161 2007/01/21 01:45:35 stevesk Exp $ */ 1/* $OpenBSD: readconf.c,v 1.162 2007/03/20 03:56:12 tedu Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1224,7 +1224,7 @@ parse_forward(Forward *fwd, const char *fwdspec)
1224 cp = p = xstrdup(fwdspec); 1224 cp = p = xstrdup(fwdspec);
1225 1225
1226 /* skip leading spaces */ 1226 /* skip leading spaces */
1227 while (*cp && isspace(*cp)) 1227 while (isspace(*cp))
1228 cp++; 1228 cp++;
1229 1229
1230 for (i = 0; i < 4; ++i) 1230 for (i = 0; i < 4; ++i)