tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

- tedu@cvs.openbsd.org 2007/03/20 03:56:12

Browse Source 
[readconf.c clientloop.c]
     remove some bogus *p tests from charles longeau
     ok deraadt millert
This commit is contained in:
Darren Tucker 2007-03-21 20:46:03 +11:00
parent 2812dc9285
commit 03b1cdbb44
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -19,6 +19,10 @@
the next key will expire when scanning for expired keys. Set the select the next key will expire when scanning for expired keys. Set the select
timeout to whichever of these two things happens next. With djm@, with & timeout to whichever of these two things happens next. With djm@, with &
ok deraadt@ markus@ ok deraadt@ markus@
- tedu@cvs.openbsd.org 2007/03/20 03:56:12
[readconf.c clientloop.c]
remove some bogus *p tests from charles longeau
ok deraadt millert
20070313 20070313
- (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include
@ -2848,4 +2852,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4643 2007/03/21 09:45:06 dtucker Exp $ $Id: ChangeLog,v 1.4644 2007/03/21 09:46:03 dtucker Exp $

9
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.178 2007/02/20 10:25:14 djm Exp $ */ /* $OpenBSD: clientloop.c,v 1.179 2007/03/20 03:56:12 tedu Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -935,7 +935,7 @@ process_cmdline(void)
cmd = s = read_passphrase("\r\nssh> ", RP_ECHO); cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
if (s == NULL) if (s == NULL)
goto out; goto out;
while (*s && isspace(*s)) while (isspace(*s))
s++; s++;
if (*s == '-') if (*s == '-')
s++; /* Skip cmdline '-', if any */ s++; /* Skip cmdline '-', if any */
@ -982,9 +982,8 @@ process_cmdline(void)
goto out; goto out;
} }
s++; while (isspace(*++s))
while (*s && isspace(*s)) ;
s++;
if (delete) { if (delete) {
cancel_port = 0; cancel_port = 0;

4
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.161 2007/01/21 01:45:35 stevesk Exp $ */ /* $OpenBSD: readconf.c,v 1.162 2007/03/20 03:56:12 tedu Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1224,7 +1224,7 @@ parse_forward(Forward *fwd, const char *fwdspec)
cp = p = xstrdup(fwdspec); cp = p = xstrdup(fwdspec);
/* skip leading spaces */ /* skip leading spaces */
while (*cp && isspace(*cp)) while (isspace(*cp))
cp++; cp++;
for (i = 0; i < 4; ++i) for (i = 0; i < 4; ++i)