diff options
author | Colin Watson <cjwatson@debian.org> | 2012-05-18 12:16:05 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-05-18 12:16:05 +0100 |
commit | dabbdfacc9f6995b0739772a47704186dcf34ea5 (patch) | |
tree | 0a0b306a637bc85eb719261b74884f0b9573ec41 /debian/patches/auth-log-verbosity.patch | |
parent | 1e0d51b642cac9a6bfb719e6320905625aa5f943 (diff) | |
parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) |
* New upstream release (http://www.openssh.org/txt/release-6.0).
- Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
(closes: #643312, #650512).
- Add a new privilege separation sandbox implementation for Linux's new
seccomp sandbox, automatically enabled on platforms that support it.
(Note: privilege separation sandboxing is still experimental.)
Diffstat (limited to 'debian/patches/auth-log-verbosity.patch')
-rw-r--r-- | debian/patches/auth-log-verbosity.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/auth-log-verbosity.patch b/debian/patches/auth-log-verbosity.patch index da940d9fa..bc2602306 100644 --- a/debian/patches/auth-log-verbosity.patch +++ b/debian/patches/auth-log-verbosity.patch | |||
@@ -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 | @@ -526,11 +540,14 @@ | 50 | @@ -512,11 +526,14 @@ |
51 | break; | 51 | break; |
52 | case 0: | 52 | case 0: |
53 | /* no match */ | 53 | /* no match */ |
@@ -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 | @@ -280,6 +281,8 @@ | 107 | @@ -281,6 +282,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 | @@ -416,6 +419,7 @@ | 116 | @@ -417,6 +420,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; |