diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-09 16:10:02 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-08-19 16:33:32 +0100 |
commit | c9c2ebb4680ea6872218b1e4519fe31a2043a27a (patch) | |
tree | c69410030e0bdf2684c6ed17b46b42f54f9aca77 /auth2-pubkey.c | |
parent | 5cbcc7353649b84b5a7528e583458ee9473fd527 (diff) |
Quieten logs when multiple from= restrictions are used
Bug-Debian: http://bugs.debian.org/630606
Forwarded: no
Last-Update: 2013-09-14
Patch-Name: auth-log-verbosity.patch
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index d943efa1e..0bda5c9dd 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -282,6 +282,7 @@ match_principals_file(char *file, struct passwd *pw, struct sshkey_cert *cert) | |||
282 | restore_uid(); | 282 | restore_uid(); |
283 | return 0; | 283 | return 0; |
284 | } | 284 | } |
285 | auth_start_parse_options(); | ||
285 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { | 286 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { |
286 | /* Skip leading whitespace. */ | 287 | /* Skip leading whitespace. */ |
287 | for (cp = line; *cp == ' ' || *cp == '\t'; cp++) | 288 | for (cp = line; *cp == ' ' || *cp == '\t'; cp++) |
@@ -343,6 +344,7 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw) | |||
343 | found_key = 0; | 344 | found_key = 0; |
344 | 345 | ||
345 | found = NULL; | 346 | found = NULL; |
347 | auth_start_parse_options(); | ||
346 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { | 348 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { |
347 | char *cp, *key_options = NULL; | 349 | char *cp, *key_options = NULL; |
348 | if (found != NULL) | 350 | if (found != NULL) |
@@ -482,6 +484,7 @@ user_cert_trusted_ca(struct passwd *pw, Key *key) | |||
482 | if (key_cert_check_authority(key, 0, 1, | 484 | if (key_cert_check_authority(key, 0, 1, |
483 | principals_file == NULL ? pw->pw_name : NULL, &reason) != 0) | 485 | principals_file == NULL ? pw->pw_name : NULL, &reason) != 0) |
484 | goto fail_reason; | 486 | goto fail_reason; |
487 | auth_start_parse_options(); | ||
485 | if (auth_cert_options(key, pw) != 0) | 488 | if (auth_cert_options(key, pw) != 0) |
486 | goto out; | 489 | goto out; |
487 | 490 | ||