summaryrefslogtreecommitdiff
path: root/debian/patches/auth-log-verbosity.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/auth-log-verbosity.patch')
-rw-r--r--debian/patches/auth-log-verbosity.patch47
1 files changed, 29 insertions, 18 deletions
diff --git a/debian/patches/auth-log-verbosity.patch b/debian/patches/auth-log-verbosity.patch
index a6a842ecd..5d98b81a2 100644
--- a/debian/patches/auth-log-verbosity.patch
+++ b/debian/patches/auth-log-verbosity.patch
@@ -1,14 +1,25 @@
1Description: Quieten logs when multiple from= restrictions are used 1From ec5991d73abdc0b3c43ea9f8a0e99da045e7beb1 Mon Sep 17 00:00:00 2001
2Author: Colin Watson <cjwatson@debian.org> 2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:02 +0000
4Subject: Quieten logs when multiple from= restrictions are used
5
3Bug-Debian: http://bugs.debian.org/630606 6Bug-Debian: http://bugs.debian.org/630606
4Forwarded: no 7Forwarded: no
5Last-Update: 2013-09-14 8Last-Update: 2013-09-14
6 9
7Index: b/auth-options.c 10Patch-Name: auth-log-verbosity.patch
8=================================================================== 11---
12 auth-options.c | 35 ++++++++++++++++++++++++++---------
13 auth-options.h | 1 +
14 auth-rsa.c | 2 ++
15 auth2-pubkey.c | 3 +++
16 4 files changed, 32 insertions(+), 9 deletions(-)
17
18diff --git a/auth-options.c b/auth-options.c
19index 12e2e1d..15c00d0 100644
9--- a/auth-options.c 20--- a/auth-options.c
10+++ b/auth-options.c 21+++ b/auth-options.c
11@@ -58,9 +58,20 @@ 22@@ -58,9 +58,20 @@ int forced_tun_device = -1;
12 /* "principals=" option. */ 23 /* "principals=" option. */
13 char *authorized_principals = NULL; 24 char *authorized_principals = NULL;
14 25
@@ -29,7 +40,7 @@ Index: b/auth-options.c
29 auth_clear_options(void) 40 auth_clear_options(void)
30 { 41 {
31 no_agent_forwarding_flag = 0; 42 no_agent_forwarding_flag = 0;
32@@ -288,10 +299,13 @@ 43@@ -288,10 +299,13 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
33 /* FALLTHROUGH */ 44 /* FALLTHROUGH */
34 case 0: 45 case 0:
35 free(patterns); 46 free(patterns);
@@ -47,7 +58,7 @@ Index: b/auth-options.c
47 auth_debug_add("Your host '%.200s' is not " 58 auth_debug_add("Your host '%.200s' is not "
48 "permitted to use this key for login.", 59 "permitted to use this key for login.",
49 remote_host); 60 remote_host);
50@@ -513,11 +527,14 @@ 61@@ -513,11 +527,14 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw,
51 break; 62 break;
52 case 0: 63 case 0:
53 /* no match */ 64 /* no match */
@@ -67,11 +78,11 @@ Index: b/auth-options.c
67 auth_debug_add("Your address '%.200s' " 78 auth_debug_add("Your address '%.200s' "
68 "is not permitted to use this " 79 "is not permitted to use this "
69 "certificate for login.", 80 "certificate for login.",
70Index: b/auth-options.h 81diff --git a/auth-options.h b/auth-options.h
71=================================================================== 82index 7455c94..a3f0a02 100644
72--- a/auth-options.h 83--- a/auth-options.h
73+++ b/auth-options.h 84+++ b/auth-options.h
74@@ -33,6 +33,7 @@ 85@@ -33,6 +33,7 @@ extern int forced_tun_device;
75 extern int key_is_cert_authority; 86 extern int key_is_cert_authority;
76 extern char *authorized_principals; 87 extern char *authorized_principals;
77 88
@@ -79,11 +90,11 @@ Index: b/auth-options.h
79 int auth_parse_options(struct passwd *, char *, char *, u_long); 90 int auth_parse_options(struct passwd *, char *, char *, u_long);
80 void auth_clear_options(void); 91 void auth_clear_options(void);
81 int auth_cert_options(Key *, struct passwd *); 92 int auth_cert_options(Key *, struct passwd *);
82Index: b/auth-rsa.c 93diff --git a/auth-rsa.c b/auth-rsa.c
83=================================================================== 94index 6ed152c..9b139c9 100644
84--- a/auth-rsa.c 95--- a/auth-rsa.c
85+++ b/auth-rsa.c 96+++ b/auth-rsa.c
86@@ -174,6 +174,8 @@ 97@@ -174,6 +174,8 @@ rsa_key_allowed_in_file(struct passwd *pw, char *file,
87 if ((f = auth_openkeyfile(file, pw, options.strict_modes)) == NULL) 98 if ((f = auth_openkeyfile(file, pw, options.strict_modes)) == NULL)
88 return 0; 99 return 0;
89 100
@@ -92,11 +103,11 @@ Index: b/auth-rsa.c
92 /* 103 /*
93 * Go though the accepted keys, looking for the current key. If 104 * Go though the accepted keys, looking for the current key. If
94 * found, perform a challenge-response dialog to verify that the 105 * found, perform a challenge-response dialog to verify that the
95Index: b/auth2-pubkey.c 106diff --git a/auth2-pubkey.c b/auth2-pubkey.c
96=================================================================== 107index 12eb8a6..7c0ceee 100644
97--- a/auth2-pubkey.c 108--- a/auth2-pubkey.c
98+++ b/auth2-pubkey.c 109+++ b/auth2-pubkey.c
99@@ -257,6 +257,7 @@ 110@@ -257,6 +257,7 @@ match_principals_file(char *file, struct passwd *pw, struct KeyCert *cert)
100 restore_uid(); 111 restore_uid();
101 return 0; 112 return 0;
102 } 113 }
@@ -104,7 +115,7 @@ Index: b/auth2-pubkey.c
104 while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { 115 while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
105 /* Skip leading whitespace. */ 116 /* Skip leading whitespace. */
106 for (cp = line; *cp == ' ' || *cp == '\t'; cp++) 117 for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
107@@ -318,6 +319,7 @@ 118@@ -318,6 +319,7 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw)
108 found_key = 0; 119 found_key = 0;
109 120
110 found = NULL; 121 found = NULL;
@@ -112,7 +123,7 @@ Index: b/auth2-pubkey.c
112 while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { 123 while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
113 char *cp, *key_options = NULL; 124 char *cp, *key_options = NULL;
114 if (found != NULL) 125 if (found != NULL)
115@@ -453,6 +455,7 @@ 126@@ -453,6 +455,7 @@ user_cert_trusted_ca(struct passwd *pw, Key *key)
116 if (key_cert_check_authority(key, 0, 1, 127 if (key_cert_check_authority(key, 0, 1,
117 principals_file == NULL ? pw->pw_name : NULL, &reason) != 0) 128 principals_file == NULL ? pw->pw_name : NULL, &reason) != 0)
118 goto fail_reason; 129 goto fail_reason;