diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 11:47:26 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 11:47:26 +0100 |
commit | 2ea3f720daeb1ca9f765365fce3a9546961fe624 (patch) | |
tree | c4fb7d1f51fa51e7677232de806aae150e29e2ac /debian/patches/auth-log-verbosity.patch | |
parent | f5efcd3450bbf8261915e0c4a6f851229dddaa79 (diff) | |
parent | ecebda56da46a03dafff923d91c382f31faa9eec (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.2).
- Add support for multiple required authentication in SSH protocol 2 via
an AuthenticationMethods option (closes: #195716).
- Fix Sophie Germain formula in moduli(5) (closes: #698612).
- Update ssh-copy-id to Phil Hands' greatly revised version (closes:
#99785, #322228, #620428; LP: #518883, #835901, #1074798).
Diffstat (limited to 'debian/patches/auth-log-verbosity.patch')
-rw-r--r-- | debian/patches/auth-log-verbosity.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/auth-log-verbosity.patch b/debian/patches/auth-log-verbosity.patch index bc2602306..206967bc9 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: 2011-07-28 | 5 | Last-Update: 2013-05-07 |
6 | 6 | ||
7 | Index: b/auth-options.c | 7 | Index: b/auth-options.c |
8 | =================================================================== | 8 | =================================================================== |
@@ -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 | @@ -211,6 +211,7 @@ | 99 | @@ -217,6 +217,7 @@ |
100 | restore_uid(); | 100 | restore_uid(); |
101 | return 0; | 101 | return 0; |
102 | } | 102 | } |
@@ -104,7 +104,7 @@ 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 | @@ -281,6 +282,8 @@ | 107 | @@ -278,6 +279,8 @@ |
108 | found_key = 0; | 108 | found_key = 0; |
109 | found = key_new(key_is_cert(key) ? KEY_UNSPEC : key->type); | 109 | found = key_new(key_is_cert(key) ? KEY_UNSPEC : key->type); |
110 | 110 | ||
@@ -113,7 +113,7 @@ Index: b/auth2-pubkey.c | |||
113 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { | 113 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { |
114 | char *cp, *key_options = NULL; | 114 | char *cp, *key_options = NULL; |
115 | 115 | ||
116 | @@ -417,6 +420,7 @@ | 116 | @@ -412,6 +415,7 @@ |
117 | if (key_cert_check_authority(key, 0, 1, | 117 | if (key_cert_check_authority(key, 0, 1, |
118 | principals_file == NULL ? pw->pw_name : NULL, &reason) != 0) | 118 | principals_file == NULL ? pw->pw_name : NULL, &reason) != 0) |
119 | goto fail_reason; | 119 | goto fail_reason; |