diff options
author | Darren Tucker <dtucker@zip.com.au> | 2007-02-19 22:12:53 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2007-02-19 22:12:53 +1100 |
commit | cb0e1753c74fdd4dff390f9e8fec16995b1cce53 (patch) | |
tree | d5ba494f4e2b22b2b0bf3eb3b1d4db43d0955ba9 | |
parent | c58b5b07420555a12f895b4316b96498d44f02c6 (diff) |
- stevesk@cvs.openbsd.org 2007/01/21 01:45:35
[readconf.c]
spaces
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -18,6 +18,9 @@ | |||
18 | - stevesk@cvs.openbsd.org 2007/01/21 01:41:54 | 18 | - stevesk@cvs.openbsd.org 2007/01/21 01:41:54 |
19 | [auth-skey.c kex.c ssh-keygen.c session.c clientloop.c] | 19 | [auth-skey.c kex.c ssh-keygen.c session.c clientloop.c] |
20 | spaces | 20 | spaces |
21 | - stevesk@cvs.openbsd.org 2007/01/21 01:45:35 | ||
22 | [readconf.c] | ||
23 | spaces | ||
21 | 24 | ||
22 | 20070128 | 25 | 20070128 |
23 | - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52) | 26 | - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52) |
@@ -2713,4 +2716,4 @@ | |||
2713 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 2716 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
2714 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 2717 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
2715 | 2718 | ||
2716 | $Id: ChangeLog,v 1.4612 2007/02/19 11:12:23 dtucker Exp $ | 2719 | $Id: ChangeLog,v 1.4613 2007/02/19 11:12:53 dtucker Exp $ |
diff --git a/readconf.c b/readconf.c index 10bdb4b43..2485146a0 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.160 2007/01/17 23:22:52 dtucker Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.161 2007/01/21 01:45:35 stevesk 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 |
@@ -545,7 +545,7 @@ parse_yesnoask: | |||
545 | if (*intptr >= SSH_MAX_IDENTITY_FILES) | 545 | if (*intptr >= SSH_MAX_IDENTITY_FILES) |
546 | fatal("%.200s line %d: Too many identity files specified (max %d).", | 546 | fatal("%.200s line %d: Too many identity files specified (max %d).", |
547 | filename, linenum, SSH_MAX_IDENTITY_FILES); | 547 | filename, linenum, SSH_MAX_IDENTITY_FILES); |
548 | charptr = &options->identity_files[*intptr]; | 548 | charptr = &options->identity_files[*intptr]; |
549 | *charptr = xstrdup(arg); | 549 | *charptr = xstrdup(arg); |
550 | *intptr = *intptr + 1; | 550 | *intptr = *intptr + 1; |
551 | } | 551 | } |