diff options
Diffstat (limited to 'debian/patches/auth-log-verbosity.patch')
-rw-r--r-- | debian/patches/auth-log-verbosity.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/debian/patches/auth-log-verbosity.patch b/debian/patches/auth-log-verbosity.patch index 206967bc9..a6a842ecd 100644 --- a/debian/patches/auth-log-verbosity.patch +++ b/debian/patches/auth-log-verbosity.patch | |||
@@ -2,7 +2,7 @@ Description: Quieten logs when multiple from= restrictions are used | |||
2 | Author: Colin Watson <cjwatson@debian.org> | 2 | Author: Colin Watson <cjwatson@debian.org> |
3 | Bug-Debian: http://bugs.debian.org/630606 | 3 | Bug-Debian: http://bugs.debian.org/630606 |
4 | Forwarded: no | 4 | Forwarded: no |
5 | Last-Update: 2013-05-07 | 5 | Last-Update: 2013-09-14 |
6 | 6 | ||
7 | Index: b/auth-options.c | 7 | Index: b/auth-options.c |
8 | =================================================================== | 8 | =================================================================== |
@@ -32,7 +32,7 @@ Index: b/auth-options.c | |||
32 | @@ -288,10 +299,13 @@ | 32 | @@ -288,10 +299,13 @@ |
33 | /* FALLTHROUGH */ | 33 | /* FALLTHROUGH */ |
34 | case 0: | 34 | case 0: |
35 | xfree(patterns); | 35 | free(patterns); |
36 | - logit("Authentication tried for %.100s with " | 36 | - logit("Authentication tried for %.100s with " |
37 | - "correct key but not from a permitted " | 37 | - "correct key but not from a permitted " |
38 | - "host (host=%.200s, ip=%.200s).", | 38 | - "host (host=%.200s, ip=%.200s).", |
@@ -47,7 +47,7 @@ Index: b/auth-options.c | |||
47 | auth_debug_add("Your host '%.200s' is not " | 47 | auth_debug_add("Your host '%.200s' is not " |
48 | "permitted to use this key for login.", | 48 | "permitted to use this key for login.", |
49 | remote_host); | 49 | remote_host); |
50 | @@ -512,11 +526,14 @@ | 50 | @@ -513,11 +527,14 @@ |
51 | break; | 51 | break; |
52 | case 0: | 52 | case 0: |
53 | /* no match */ | 53 | /* no match */ |
@@ -83,7 +83,7 @@ Index: b/auth-rsa.c | |||
83 | =================================================================== | 83 | =================================================================== |
84 | --- a/auth-rsa.c | 84 | --- a/auth-rsa.c |
85 | +++ b/auth-rsa.c | 85 | +++ b/auth-rsa.c |
86 | @@ -175,6 +175,8 @@ | 86 | @@ -174,6 +174,8 @@ |
87 | if ((f = auth_openkeyfile(file, pw, options.strict_modes)) == NULL) | 87 | if ((f = auth_openkeyfile(file, pw, options.strict_modes)) == NULL) |
88 | return 0; | 88 | return 0; |
89 | 89 | ||
@@ -96,7 +96,7 @@ Index: b/auth2-pubkey.c | |||
96 | =================================================================== | 96 | =================================================================== |
97 | --- a/auth2-pubkey.c | 97 | --- a/auth2-pubkey.c |
98 | +++ b/auth2-pubkey.c | 98 | +++ b/auth2-pubkey.c |
99 | @@ -217,6 +217,7 @@ | 99 | @@ -257,6 +257,7 @@ |
100 | restore_uid(); | 100 | restore_uid(); |
101 | return 0; | 101 | return 0; |
102 | } | 102 | } |
@@ -104,16 +104,15 @@ Index: b/auth2-pubkey.c | |||
104 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { | 104 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { |
105 | /* Skip leading whitespace. */ | 105 | /* Skip leading whitespace. */ |
106 | for (cp = line; *cp == ' ' || *cp == '\t'; cp++) | 106 | for (cp = line; *cp == ' ' || *cp == '\t'; cp++) |
107 | @@ -278,6 +279,8 @@ | 107 | @@ -318,6 +319,7 @@ |
108 | found_key = 0; | 108 | found_key = 0; |
109 | found = key_new(key_is_cert(key) ? KEY_UNSPEC : key->type); | ||
110 | 109 | ||
110 | found = NULL; | ||
111 | + auth_start_parse_options(); | 111 | + auth_start_parse_options(); |
112 | + | ||
113 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { | 112 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { |
114 | char *cp, *key_options = NULL; | 113 | char *cp, *key_options = NULL; |
115 | 114 | if (found != NULL) | |
116 | @@ -412,6 +415,7 @@ | 115 | @@ -453,6 +455,7 @@ |
117 | if (key_cert_check_authority(key, 0, 1, | 116 | if (key_cert_check_authority(key, 0, 1, |
118 | principals_file == NULL ? pw->pw_name : NULL, &reason) != 0) | 117 | principals_file == NULL ? pw->pw_name : NULL, &reason) != 0) |
119 | goto fail_reason; | 118 | goto fail_reason; |