diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-09 16:10:02 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-12-23 11:25:03 +0000 |
commit | 69e0307a3bc73d5d360c19aeb61133c126cf63bf (patch) | |
tree | a3d962cb76a4751a44b7e72bdbb9e1cc2b66efd6 /auth2-pubkey.c | |
parent | cb15899de8dc5d2e8b3869d743307d252af69643 (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 20f3309e1..add77136e 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -566,6 +566,7 @@ process_principals(FILE *f, char *file, struct passwd *pw, | |||
566 | u_long linenum = 0; | 566 | u_long linenum = 0; |
567 | u_int i; | 567 | u_int i; |
568 | 568 | ||
569 | auth_start_parse_options(); | ||
569 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { | 570 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { |
570 | /* Skip leading whitespace. */ | 571 | /* Skip leading whitespace. */ |
571 | for (cp = line; *cp == ' ' || *cp == '\t'; cp++) | 572 | for (cp = line; *cp == ' ' || *cp == '\t'; cp++) |
@@ -764,6 +765,7 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw) | |||
764 | found_key = 0; | 765 | found_key = 0; |
765 | 766 | ||
766 | found = NULL; | 767 | found = NULL; |
768 | auth_start_parse_options(); | ||
767 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { | 769 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { |
768 | char *cp, *key_options = NULL, *fp = NULL; | 770 | char *cp, *key_options = NULL, *fp = NULL; |
769 | const char *reason = NULL; | 771 | const char *reason = NULL; |
@@ -911,6 +913,7 @@ user_cert_trusted_ca(struct passwd *pw, Key *key) | |||
911 | if (key_cert_check_authority(key, 0, 1, | 913 | if (key_cert_check_authority(key, 0, 1, |
912 | use_authorized_principals ? NULL : pw->pw_name, &reason) != 0) | 914 | use_authorized_principals ? NULL : pw->pw_name, &reason) != 0) |
913 | goto fail_reason; | 915 | goto fail_reason; |
916 | auth_start_parse_options(); | ||
914 | if (auth_cert_options(key, pw, &reason) != 0) | 917 | if (auth_cert_options(key, pw, &reason) != 0) |
915 | goto fail_reason; | 918 | goto fail_reason; |
916 | 919 | ||