diff options
| author | jp161948 <none@none> | 2007-04-06 11:58:25 -0700 |
|---|---|---|
| committer | jp161948 <none@none> | 2007-04-06 11:58:25 -0700 |
| commit | aa9b2b45678db2ab95bb7806dd7cda60c1ea6f11 (patch) | |
| tree | 5ecffcf36300415d3b9c7c8715bc7da02e4efb97 /usr/src/cmd/ssh/libssh/common/readconf.c | |
| parent | 4fe01614e64281d82c5a22f0050e55f1e0bdbdae (diff) | |
| download | illumos-gate-aa9b2b45678db2ab95bb7806dd7cda60c1ea6f11.tar.gz | |
6506671 sshd should not fail on permissions check with pubkey auth if homedir is not available
6541995 honour Host directives when processing ConnectTimeout option
Diffstat (limited to 'usr/src/cmd/ssh/libssh/common/readconf.c')
| -rw-r--r-- | usr/src/cmd/ssh/libssh/common/readconf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/cmd/ssh/libssh/common/readconf.c b/usr/src/cmd/ssh/libssh/common/readconf.c index 678632a126..1458ba011a 100644 --- a/usr/src/cmd/ssh/libssh/common/readconf.c +++ b/usr/src/cmd/ssh/libssh/common/readconf.c @@ -330,7 +330,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; |