diff options
Diffstat (limited to 'debian/patches/debian-config.patch')
| -rw-r--r-- | debian/patches/debian-config.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch index ee3b297..f3840d9 100644 --- a/debian/patches/debian-config.patch +++ b/debian/patches/debian-config.patch @@ -1,4 +1,4 @@ -From 8b067a754bdeac8fcdab1fbb2010651cf07b1b61 Mon Sep 17 00:00:00 2001 +From f0e3f2f89d93cc90cd2e03acb5294fba07058b27 Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwatson@debian.org> Date: Sun, 9 Feb 2014 16:10:18 +0000 Subject: Various Debian-specific configuration changes @@ -48,10 +48,10 @@ Patch-Name: debian-config.patch 7 files changed, 100 insertions(+), 10 deletions(-) diff --git a/readconf.c b/readconf.c -index eaca29ace..1b64b7af5 100644 +index d3c3056ef..90bf74f32 100644 --- a/readconf.c +++ b/readconf.c -@@ -2739,7 +2739,7 @@ fill_default_options(Options * options) +@@ -2773,7 +2773,7 @@ fill_default_options(Options * options) if (options->forward_x11 == -1) options->forward_x11 = 0; if (options->forward_x11_trusted == -1) @@ -73,10 +73,10 @@ index 7afc28072..02b122a85 100644 # This may be necessary if /usr/src and/or /usr/obj are group-writable, diff --git a/ssh.1 b/ssh.1 -index c8c5558e5..0697ec77d 100644 +index 3ad246c27..9ca6e18e2 100644 --- a/ssh.1 +++ b/ssh.1 -@@ -861,6 +861,16 @@ directive in +@@ -863,6 +863,16 @@ directive in .Xr ssh_config 5 for more information. .Pp @@ -93,7 +93,7 @@ index c8c5558e5..0697ec77d 100644 .It Fl x Disables X11 forwarding. .Pp -@@ -869,6 +879,20 @@ Enables trusted X11 forwarding. +@@ -871,6 +881,20 @@ Enables trusted X11 forwarding. Trusted X11 forwardings are not subjected to the X11 SECURITY extension controls. .Pp @@ -140,7 +140,7 @@ index 16197d15d..92d06ef38 100644 + HashKnownHosts yes + GSSAPIAuthentication yes diff --git a/ssh_config.5 b/ssh_config.5 -index cb1bba1a7..091b933b4 100644 +index 86258eb4f..9adc0fdb7 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -71,6 +71,29 @@ Since the first obtained value for each parameter is used, more @@ -173,7 +173,7 @@ index cb1bba1a7..091b933b4 100644 The file contains keyword-argument pairs, one per line. Lines starting with .Ql # -@@ -901,11 +924,12 @@ elapsed. +@@ -903,11 +926,12 @@ elapsed. .It Cm ForwardX11Trusted If this option is set to .Cm yes , @@ -246,7 +246,7 @@ index ecfe8d026..677f97d5d 100644 # Example of overriding settings on a per-user basis #Match User anoncvs diff --git a/sshd_config.5 b/sshd_config.5 -index 9d33cb472..1f6c42523 100644 +index e177e4af8..2887ed531 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -56,6 +56,35 @@ Arguments may optionally be enclosed in double quotes @@ -285,7 +285,7 @@ index 9d33cb472..1f6c42523 100644 The possible keywords and their meanings are as follows (note that keywords are case-insensitive and arguments are case-sensitive): -@@ -1840,7 +1869,7 @@ Overrides the default path to the +@@ -1865,7 +1894,7 @@ Overrides the default path to the .Cm sshd-session binary that is invoked to handle each connection. The default is |