diff options
author | Colin Watson <cjwatson@debian.org> | 2014-02-09 16:10:02 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-08-07 12:18:43 +0100 |
commit | b4b79ae5a16f73426b54c6394a29b2b49da4dc16 (patch) | |
tree | b2bf8e0ef9f910938b7c081b345b44680b667508 /auth2-pubkey.c | |
parent | 9d9a37bb0c2d7546253ff2b0b67e314d8475bfc7 (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 41b34aed2..aace7ca15 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++) |
@@ -731,6 +732,7 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw) | |||
731 | found_key = 0; | 732 | found_key = 0; |
732 | 733 | ||
733 | found = NULL; | 734 | found = NULL; |
735 | auth_start_parse_options(); | ||
734 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { | 736 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { |
735 | char *cp, *key_options = NULL; | 737 | char *cp, *key_options = NULL; |
736 | if (found != NULL) | 738 | if (found != NULL) |
@@ -878,6 +880,7 @@ user_cert_trusted_ca(struct passwd *pw, Key *key) | |||
878 | if (key_cert_check_authority(key, 0, 1, | 880 | if (key_cert_check_authority(key, 0, 1, |
879 | use_authorized_principals ? NULL : pw->pw_name, &reason) != 0) | 881 | use_authorized_principals ? NULL : pw->pw_name, &reason) != 0) |
880 | goto fail_reason; | 882 | goto fail_reason; |
883 | auth_start_parse_options(); | ||
881 | if (auth_cert_options(key, pw) != 0) | 884 | if (auth_cert_options(key, pw) != 0) |
882 | goto out; | 885 | goto out; |
883 | 886 | ||