diff options
Diffstat (limited to 'debian/patches/gssapi.patch')
-rw-r--r-- | debian/patches/gssapi.patch | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch index 3f616af7d..29a689b0d 100644 --- a/debian/patches/gssapi.patch +++ b/debian/patches/gssapi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5d3dc7ea4c96cab9483d5389a3b04163771fdee2 Mon Sep 17 00:00:00 2001 | 1 | From 70b18066d3921277861e98902c9cf41a10ac6898 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Wilkinson <simon@sxw.org.uk> | 2 | From: Simon Wilkinson <simon@sxw.org.uk> |
3 | Date: Sun, 9 Feb 2014 16:09:48 +0000 | 3 | Date: Sun, 9 Feb 2014 16:09:48 +0000 |
4 | Subject: GSSAPI key exchange support | 4 | Subject: GSSAPI key exchange support |
@@ -17,7 +17,7 @@ have it merged into the main openssh package rather than having separate | |||
17 | security history. | 17 | security history. |
18 | 18 | ||
19 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242 | 19 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242 |
20 | Last-Updated: 2015-08-19 | 20 | Last-Updated: 2015-09-17 |
21 | 21 | ||
22 | Patch-Name: gssapi.patch | 22 | Patch-Name: gssapi.patch |
23 | --- | 23 | --- |
@@ -46,14 +46,14 @@ Patch-Name: gssapi.patch | |||
46 | servconf.h | 2 + | 46 | servconf.h | 2 + |
47 | ssh-gss.h | 41 ++++++- | 47 | ssh-gss.h | 41 ++++++- |
48 | ssh_config | 2 + | 48 | ssh_config | 2 + |
49 | ssh_config.5 | 34 +++++- | 49 | ssh_config.5 | 36 +++++- |
50 | sshconnect2.c | 124 +++++++++++++++++++- | 50 | sshconnect2.c | 124 +++++++++++++++++++- |
51 | sshd.c | 110 ++++++++++++++++++ | 51 | sshd.c | 110 ++++++++++++++++++ |
52 | sshd_config | 2 + | 52 | sshd_config | 2 + |
53 | sshd_config.5 | 11 ++ | 53 | sshd_config.5 | 11 ++ |
54 | sshkey.c | 3 +- | 54 | sshkey.c | 3 +- |
55 | sshkey.h | 1 + | 55 | sshkey.h | 1 + |
56 | 32 files changed, 1955 insertions(+), 46 deletions(-) | 56 | 32 files changed, 1957 insertions(+), 46 deletions(-) |
57 | create mode 100644 ChangeLog.gssapi | 57 | create mode 100644 ChangeLog.gssapi |
58 | create mode 100644 kexgssc.c | 58 | create mode 100644 kexgssc.c |
59 | create mode 100644 kexgsss.c | 59 | create mode 100644 kexgsss.c |
@@ -2540,10 +2540,10 @@ index 03a228f..228e5ab 100644 | |||
2540 | # CheckHostIP yes | 2540 | # CheckHostIP yes |
2541 | # AddressFamily any | 2541 | # AddressFamily any |
2542 | diff --git a/ssh_config.5 b/ssh_config.5 | 2542 | diff --git a/ssh_config.5 b/ssh_config.5 |
2543 | index 268a627..b840261 100644 | 2543 | index 268a627..59ce400 100644 |
2544 | --- a/ssh_config.5 | 2544 | --- a/ssh_config.5 |
2545 | +++ b/ssh_config.5 | 2545 | +++ b/ssh_config.5 |
2546 | @@ -744,11 +744,43 @@ Specifies whether user authentication based on GSSAPI is allowed. | 2546 | @@ -744,11 +744,45 @@ Specifies whether user authentication based on GSSAPI is allowed. |
2547 | The default is | 2547 | The default is |
2548 | .Dq no . | 2548 | .Dq no . |
2549 | Note that this option applies to protocol version 2 only. | 2549 | Note that this option applies to protocol version 2 only. |
@@ -2578,9 +2578,11 @@ index 268a627..b840261 100644 | |||
2578 | +.Dq no . | 2578 | +.Dq no . |
2579 | +.It Cm GSSAPITrustDns | 2579 | +.It Cm GSSAPITrustDns |
2580 | +Set to | 2580 | +Set to |
2581 | +.Dq yes to indicate that the DNS is trusted to securely canonicalize | 2581 | +.Dq yes |
2582 | +to indicate that the DNS is trusted to securely canonicalize | ||
2582 | +the name of the host being connected to. If | 2583 | +the name of the host being connected to. If |
2583 | +.Dq no, the hostname entered on the | 2584 | +.Dq no , |
2585 | +the hostname entered on the | ||
2584 | +command line will be passed untouched to the GSSAPI library. | 2586 | +command line will be passed untouched to the GSSAPI library. |
2585 | +The default is | 2587 | +The default is |
2586 | +.Dq no . | 2588 | +.Dq no . |