diff options
Diffstat (limited to 'debian/patches/gssapi.patch')
-rw-r--r-- | debian/patches/gssapi.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch index 3d6dfac9a..4ab9ca373 100644 --- a/debian/patches/gssapi.patch +++ b/debian/patches/gssapi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 233e78235070e871b658c8f289e600bd52a99711 Mon Sep 17 00:00:00 2001 | 1 | From 09c4d9b7d41ab3c9973f07e0109e931f57c59c43 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 |
@@ -2540,7 +2540,7 @@ 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 5b0975f..b2dc49b 100644 | 2543 | index a47f3ca..cac8cda 100644 |
2544 | --- a/ssh_config.5 | 2544 | --- a/ssh_config.5 |
2545 | +++ b/ssh_config.5 | 2545 | +++ b/ssh_config.5 |
2546 | @@ -749,11 +749,45 @@ Specifies whether user authentication based on GSSAPI is allowed. | 2546 | @@ -749,11 +749,45 @@ Specifies whether user authentication based on GSSAPI is allowed. |
@@ -2793,7 +2793,7 @@ index 7751031..e2ea826 100644 | |||
2793 | 2793 | ||
2794 | int | 2794 | int |
2795 | diff --git a/sshd.c b/sshd.c | 2795 | diff --git a/sshd.c b/sshd.c |
2796 | index c7dd8cb..32adb1f 100644 | 2796 | index 65ef7e8..839c2e0 100644 |
2797 | --- a/sshd.c | 2797 | --- a/sshd.c |
2798 | +++ b/sshd.c | 2798 | +++ b/sshd.c |
2799 | @@ -126,6 +126,10 @@ | 2799 | @@ -126,6 +126,10 @@ |
@@ -2959,7 +2959,7 @@ index 4d77f05..64786c9 100644 | |||
2959 | # Set this to 'yes' to enable PAM authentication, account processing, | 2959 | # Set this to 'yes' to enable PAM authentication, account processing, |
2960 | # and session processing. If this is enabled, PAM authentication will | 2960 | # and session processing. If this is enabled, PAM authentication will |
2961 | diff --git a/sshd_config.5 b/sshd_config.5 | 2961 | diff --git a/sshd_config.5 b/sshd_config.5 |
2962 | index 58e277f..712f620 100644 | 2962 | index b18d340..5491c89 100644 |
2963 | --- a/sshd_config.5 | 2963 | --- a/sshd_config.5 |
2964 | +++ b/sshd_config.5 | 2964 | +++ b/sshd_config.5 |
2965 | @@ -621,6 +621,12 @@ Specifies whether user authentication based on GSSAPI is allowed. | 2965 | @@ -621,6 +621,12 @@ Specifies whether user authentication based on GSSAPI is allowed. |
@@ -2988,7 +2988,7 @@ index 58e277f..712f620 100644 | |||
2988 | Specifies the key types that will be accepted for hostbased authentication | 2988 | Specifies the key types that will be accepted for hostbased authentication |
2989 | as a comma-separated pattern list. | 2989 | as a comma-separated pattern list. |
2990 | diff --git a/sshkey.c b/sshkey.c | 2990 | diff --git a/sshkey.c b/sshkey.c |
2991 | index dbb16e2..14b6dc3 100644 | 2991 | index 32dd8f2..5368e7c 100644 |
2992 | --- a/sshkey.c | 2992 | --- a/sshkey.c |
2993 | +++ b/sshkey.c | 2993 | +++ b/sshkey.c |
2994 | @@ -112,6 +112,7 @@ static const struct keytype keytypes[] = { | 2994 | @@ -112,6 +112,7 @@ static const struct keytype keytypes[] = { |