diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-04-05 11:13:30 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-04-05 11:13:30 +1100 |
commit | 2b3a03ea3f92dce71134b9c2aa90d975dc59bb57 (patch) | |
tree | a234e7fd8cb6dde9f7cece91c437f79d6d42fa6e /sshconnect2.c | |
parent | 2fefe034731c1a08b9a6b4106df200ad0f0d1ba7 (diff) |
- dtucker@cvs.openbsd.org 2013/02/17 23:16:57
[readconf.c ssh.c readconf.h sshconnect2.c]
Keep track of which IndentityFile options were manually supplied and which
were default options, and don't warn if the latter are missing.
ok markus@
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index d6af0b940..58015c0d3 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.191 2013/02/15 00:21:01 dtucker Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -1384,7 +1384,7 @@ pubkey_prepare(Authctxt *authctxt) | |||
1384 | id = xcalloc(1, sizeof(*id)); | 1384 | id = xcalloc(1, sizeof(*id)); |
1385 | id->key = key; | 1385 | id->key = key; |
1386 | id->filename = xstrdup(options.identity_files[i]); | 1386 | id->filename = xstrdup(options.identity_files[i]); |
1387 | id->userprovided = 1; | 1387 | id->userprovided = options.identity_file_userprovided[i]; |
1388 | TAILQ_INSERT_TAIL(&files, id, next); | 1388 | TAILQ_INSERT_TAIL(&files, id, next); |
1389 | } | 1389 | } |
1390 | /* Prefer PKCS11 keys that are explicitly listed */ | 1390 | /* Prefer PKCS11 keys that are explicitly listed */ |