summaryrefslogtreecommitdiff
path: root/auth2-pubkey.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-02-09 16:10:02 +0000
committerColin Watson <cjwatson@debian.org>2015-08-19 17:11:48 +0100
commitee78b163ac7fe57b819e8ddf84b32e67b6a950a3 (patch)
treee1533db1bf64c6e06ef5811581ae212317e83c65 /auth2-pubkey.c
parentdbde51cd7abb931b2d8635230bd77c9ec3b75074 (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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 5aa319ccc..1eee16168 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -561,6 +561,7 @@ process_principals(FILE *f, char *file, struct passwd *pw,
561 u_long linenum = 0; 561 u_long linenum = 0;
562 u_int i; 562 u_int i;
563 563
564 auth_start_parse_options();
564 while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { 565 while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
565 /* Skip leading whitespace. */ 566 /* Skip leading whitespace. */
566 for (cp = line; *cp == ' ' || *cp == '\t'; cp++) 567 for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
@@ -726,6 +727,7 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw)
726 found_key = 0; 727 found_key = 0;
727 728
728 found = NULL; 729 found = NULL;
730 auth_start_parse_options();
729 while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { 731 while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
730 char *cp, *key_options = NULL; 732 char *cp, *key_options = NULL;
731 if (found != NULL) 733 if (found != NULL)
@@ -872,6 +874,7 @@ user_cert_trusted_ca(struct passwd *pw, Key *key)
872 if (key_cert_check_authority(key, 0, 1, 874 if (key_cert_check_authority(key, 0, 1,
873 use_authorized_principals ? NULL : pw->pw_name, &reason) != 0) 875 use_authorized_principals ? NULL : pw->pw_name, &reason) != 0)
874 goto fail_reason; 876 goto fail_reason;
877 auth_start_parse_options();
875 if (auth_cert_options(key, pw) != 0) 878 if (auth_cert_options(key, pw) != 0)
876 goto out; 879 goto out;
877 880