summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2004-11-12 11:44:59 +0000
committerColin Watson <cjwatson@debian.org>2004-11-12 11:44:59 +0000
commit4a1259f3240a48fc2dbb0459a7b43d7675ac8ab8 (patch)
tree886047ec1ce55cd2f1ccce8a387745033a5f3a21 /debian
parent6c6f586d90208b998f6eff99866d3179ba3fa5c8 (diff)
Merge from HEAD:
Correct README.Debian's ForwardX11Trusted description (closes: #280190).
Diffstat (limited to 'debian')
-rw-r--r--debian/README.Debian2
-rw-r--r--debian/changelog1
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
index 4f076f898..db867e186 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -121,7 +121,7 @@ forwarded X11 connection can't become attacks on X clients on the remote
121machine. However, this has some problems in implementation - notably a 121machine. However, this has some problems in implementation - notably a
122very short timeout of the untrusted cookie - breaks large numbers of 122very short timeout of the untrusted cookie - breaks large numbers of
123existing setups, and generally seems immature. The Debian package 123existing setups, and generally seems immature. The Debian package
124therefore sets the default for this option to "no" (in ssh itself, 124therefore sets the default for this option to "yes" (in ssh itself,
125rather than in ssh_config). 125rather than in ssh_config).
126 126
127Fallback to RSH 127Fallback to RSH
diff --git a/debian/changelog b/debian/changelog
index 41cddd823..caeeeeff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openssh (1:3.8.1p1-13) UNRELEASED; urgency=low
3 * Enable threading for PAM, on Sam Hartman's advice (closes: #278394). 3 * Enable threading for PAM, on Sam Hartman's advice (closes: #278394).
4 * debconf template translations: 4 * debconf template translations:
5 - Update Dutch (thanks, cobaco; closes: #278715). 5 - Update Dutch (thanks, cobaco; closes: #278715).
6 * Correct README.Debian's ForwardX11Trusted description (closes: #280190).
6 7
7 -- Colin Watson <cjwatson@debian.org> Mon, 1 Nov 2004 18:09:08 +0000 8 -- Colin Watson <cjwatson@debian.org> Mon, 1 Nov 2004 18:09:08 +0000
8 9