diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-16 14:04:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-16 14:04:24 +0100 |
commit | 031d51614426a5d5ad42f971831df373f5d6e6d8 (patch) | |
tree | 6a66dc70fd3444ea8064f25256bd2fccdce6e3cd /debian/patches/gssapi.patch | |
parent | 43587d4ea4349c7b98edcde117f37e6ca2e1b674 (diff) | |
parent | 328b60656f29db6306994d7498dede386ec2d1c3 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.2p2):
- Only warn for missing identity files that were explicitly specified
(closes: #708275).
- Fix bug in contributed contrib/ssh-copy-id script that could result in
"rm *" being called on mktemp failure (closes: #708419).
Diffstat (limited to 'debian/patches/gssapi.patch')
-rw-r--r-- | debian/patches/gssapi.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch index ce50db505..416e2f16c 100644 --- a/debian/patches/gssapi.patch +++ b/debian/patches/gssapi.patch | |||
@@ -13,7 +13,7 @@ Description: GSSAPI key exchange support | |||
13 | security history. | 13 | security history. |
14 | Author: Simon Wilkinson <simon@sxw.org.uk> | 14 | Author: Simon Wilkinson <simon@sxw.org.uk> |
15 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242 | 15 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242 |
16 | Last-Updated: 2013-05-13 | 16 | Last-Updated: 2013-05-16 |
17 | 17 | ||
18 | Index: b/ChangeLog.gssapi | 18 | Index: b/ChangeLog.gssapi |
19 | =================================================================== | 19 | =================================================================== |
@@ -2327,7 +2327,7 @@ Index: b/readconf.c | |||
2327 | #endif | 2327 | #endif |
2328 | { "fallbacktorsh", oDeprecated }, | 2328 | { "fallbacktorsh", oDeprecated }, |
2329 | { "usersh", oDeprecated }, | 2329 | { "usersh", oDeprecated }, |
2330 | @@ -483,10 +494,30 @@ | 2330 | @@ -503,10 +514,30 @@ |
2331 | intptr = &options->gss_authentication; | 2331 | intptr = &options->gss_authentication; |
2332 | goto parse_flag; | 2332 | goto parse_flag; |
2333 | 2333 | ||
@@ -2358,7 +2358,7 @@ Index: b/readconf.c | |||
2358 | case oBatchMode: | 2358 | case oBatchMode: |
2359 | intptr = &options->batch_mode; | 2359 | intptr = &options->batch_mode; |
2360 | goto parse_flag; | 2360 | goto parse_flag; |
2361 | @@ -1139,7 +1170,12 @@ | 2361 | @@ -1158,7 +1189,12 @@ |
2362 | options->pubkey_authentication = -1; | 2362 | options->pubkey_authentication = -1; |
2363 | options->challenge_response_authentication = -1; | 2363 | options->challenge_response_authentication = -1; |
2364 | options->gss_authentication = -1; | 2364 | options->gss_authentication = -1; |
@@ -2371,7 +2371,7 @@ Index: b/readconf.c | |||
2371 | options->password_authentication = -1; | 2371 | options->password_authentication = -1; |
2372 | options->kbd_interactive_authentication = -1; | 2372 | options->kbd_interactive_authentication = -1; |
2373 | options->kbd_interactive_devices = NULL; | 2373 | options->kbd_interactive_devices = NULL; |
2374 | @@ -1239,8 +1275,14 @@ | 2374 | @@ -1258,8 +1294,14 @@ |
2375 | options->challenge_response_authentication = 1; | 2375 | options->challenge_response_authentication = 1; |
2376 | if (options->gss_authentication == -1) | 2376 | if (options->gss_authentication == -1) |
2377 | options->gss_authentication = 0; | 2377 | options->gss_authentication = 0; |