diff options
| author | des <des@FreeBSD.org> | 2008-07-23 09:15:38 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2008-07-23 09:15:38 +0000 |
| commit | 367fd865463ff70d9176231cb7590e6e69b51b06 (patch) | |
| tree | 31274ced9514914f9504202c6e49c93d509e710d /readconf.c | |
| parent | e3cfeae816c1b89dbdb19357e2256b4b252fbf05 (diff) | |
| download | FreeBSD-src-367fd865463ff70d9176231cb7590e6e69b51b06.zip FreeBSD-src-367fd865463ff70d9176231cb7590e6e69b51b06.tar.gz | |
Vendor import of OpenSSH 4.6p1 for posterity's sake
Diffstat (limited to 'readconf.c')
| -rw-r--r-- | readconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.159 2006/08/03 03:34:42 deraadt Exp $ */ +/* $OpenBSD: readconf.c,v 1.161 2007/01/21 01:45:35 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -364,7 +364,7 @@ parse_time: if ((value = convtime(arg)) == -1) fatal("%s line %d: invalid time value.", filename, linenum); - if (*intptr == -1) + if (*activep && *intptr == -1) *intptr = value; break; @@ -545,7 +545,7 @@ parse_yesnoask: if (*intptr >= SSH_MAX_IDENTITY_FILES) fatal("%.200s line %d: Too many identity files specified (max %d).", filename, linenum, SSH_MAX_IDENTITY_FILES); - charptr = &options->identity_files[*intptr]; + charptr = &options->identity_files[*intptr]; *charptr = xstrdup(arg); *intptr = *intptr + 1; } |
