16 files changed, 478 insertions, 607 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 5deac15be..ca928f9f0 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -34,10 +34,6 @@ Privilege separation is turned on by default, so if you decide you
 want it turned off, you need to add "UsePrivilegeSeparation no" to
 /etc/ssh/sshd_config
 
-NB! If you are running a 2.0 series Linux kernel, then privilege
-separation will not work at all, and your sshd will fail to start
-unless you explicitly turn privilege separation off.
-
 PermitRootLogin set to yes
 --------------------------
 
diff --git a/debian/changelog b/debian/changelog
index 32ab9b5f2..9672dc4a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+openssh (1:3.6.1p2-5) unstable; urgency=low
+
+  * Disable cmsg_type check for file descriptor passing when running on
+    Linux 2.0 (closes: #150976). Remove comments about non-functional
+    privilege separation on 2.0 from ssh/privsep_ask and ssh/privsep_tell
+    debconf questions and from README.Debian, since it should all now work.
+  * Fix "defails" typo in generated sshd_config (closes: #206484).
+  * Backport upstream patch to strip trailing whitespace (including
+    newlines) from configuration directives (closes: #192079).
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 27 Aug 2003 02:19:57 +0100
+
 openssh (1:3.6.1p2-4) unstable; urgency=low
 
   * getent can get just one key; no need to use grep (thanks, James Troup).
diff --git a/debian/po/da.po b/debian/po/da.po
index 0bb20e74b..56a83f826 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-27 17:26+0100\n"
+"POT-Creation-Date: 2003-08-27 02:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,20 +42,12 @@ msgstr ""
 "sshd_config."
 
 #. Description
-#: ../templates.master:3
-msgid ""
-"NB! If you are running a 2.0 series Linux kernel, then privilege separation "
-"will not work at all, and your sshd will fail to start unless you explicitly "
-"turn privilege separation off."
-msgstr ""
-
-#. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "Aktiver Privilegie adskillelse"
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -66,7 +58,7 @@ msgstr ""
 "derfor reducerer det impakten på sikkerheds huller i sshd."
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -77,13 +69,13 @@ msgstr ""
 "interaktive autentifikationer vil ikke virke."
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
+#, fuzzy
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
-"you are running 2.0 (in which case you *must* say no here or your sshd won't "
-"start at all) or know you need to use PAM features that won't work with this "
-"option, you should say yes here."
+"you know you need to use PAM features that won't work with this option, you "
+"should say yes here."
 msgstr ""
 "Siden du har bedt mig om at lave en sshd_config fil til dig, kan du vælge om "
 "du vil have privilegie adskillelse slået til eller ej. Medmindre du kører "
@@ -92,12 +84,12 @@ msgstr ""
 "med dette tilvalg, skal du sige ja her."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "Opret ny konfigurations fil"
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -112,7 +104,7 @@ msgstr ""
 "ændringer du lavede med den gamle version."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -127,7 +119,7 @@ msgstr ""
 "kan altid redigere sshd_config og slå det fra, hvis du ønsker."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -135,12 +127,12 @@ msgstr ""
 "Du rådes stærkt til at lade mig genere en ny konfigurations fil for dig."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "Tillad kun SSH protokol 2"
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -153,7 +145,7 @@ msgstr ""
 "(ssh klienten der kommer med \"potato\" er en af dem)."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -163,7 +155,7 @@ msgstr ""
 "tillader protokol 2 forbindelser."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -172,12 +164,12 @@ msgstr ""
 "instruktioner på hvad du skal gøre ved din sshd_config fil."
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr "ssh2-nøgler flettet i opsætningsfilerne"
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -189,12 +181,12 @@ msgstr ""
 "bagudkompatilitetens skyld."
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "Vil du fortsætte (og risikere at afbryde aktive ssh-forbindelser)?"
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -205,7 +197,7 @@ msgstr ""
 "opgradering via en ssh-forbindelse."
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -214,13 +206,13 @@ msgstr ""
 "'start-stop-daemon'-linjen i stop-afsnittet af filen."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "BEMÆRK: Videregivelse af X11 og adgangkontrol er som standard deaktiveret."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 #, fuzzy
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
@@ -230,7 +222,7 @@ msgstr ""
 "til 'off' som standard."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 #, fuzzy
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
@@ -240,17 +232,17 @@ msgstr ""
 "eller med kommandolinjetilvalget '-X'."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Advarsel: rsh-serveren er installeret --- sikkert ikke en god idé"
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -260,12 +252,12 @@ msgstr ""
 "rsh-server."
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Advarsel: telnetd er installeret --- sikkert ikke en god idé"
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -278,12 +270,12 @@ msgstr ""
 "adgangskoder og sessions-oplysninger ukrypteret over netværket."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "Advarsel: du skal oprette en ny værtsnøgle"
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 #, fuzzy
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
@@ -295,17 +287,17 @@ msgstr ""
 "fra den gamle (ikke-frie, 'non-free') SSH-installation."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr ""
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "Vil du have, at /usr/bin/ssh-keysign bliver installeret 'SUID root'?"
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
@@ -313,7 +305,7 @@ msgstr ""
 "Du har mulighed for at installere ssh-keysign hjælperen med SUID-flaget sat."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
@@ -322,7 +314,7 @@ msgstr ""
 "protokol 2's værtsnavn-baserede autentifikation."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
@@ -332,17 +324,17 @@ msgstr ""
 "reconfigure ssh"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "Do you want to run the sshd server ?"
 msgstr "Vil du køre sshd-serveren?"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Denne pakke indeholder både ssh-klienten og sshd-serveren."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -351,7 +343,7 @@ msgstr ""
 "og tillade fjerne brugere i at logge på via ssh."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -362,12 +354,12 @@ msgstr ""
 "via ssh, kan du nu deaktivere sshd."
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -376,7 +368,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
diff --git a/debian/po/de.po b/debian/po/de.po
index 0dc0dd75f..1e363835d 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-27 17:26+0100\n"
+"POT-Creation-Date: 2003-08-27 02:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,20 +38,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:3
-msgid ""
-"NB! If you are running a 2.0 series Linux kernel, then privilege separation "
-"will not work at all, and your sshd will fail to start unless you explicitly "
-"turn privilege separation off."
-msgstr ""
-
-#. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr ""
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -59,7 +51,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -67,22 +59,21 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
-"you are running 2.0 (in which case you *must* say no here or your sshd won't "
-"start at all) or know you need to use PAM features that won't work with this "
-"option, you should say yes here."
+"you know you need to use PAM features that won't work with this option, you "
+"should say yes here."
 msgstr ""
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr ""
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -92,7 +83,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -102,19 +93,19 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
 msgstr ""
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr ""
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -123,26 +114,26 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
 msgstr ""
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
 msgstr ""
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr ""
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -150,12 +141,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "Wollen Sie weitermachen (und das Killen der Session riskieren)?"
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -166,7 +157,7 @@ msgstr ""
 "dann ist das ein Problem."
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -176,12 +167,12 @@ msgstr ""
 "ergänzen."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "HINWEIS: Forwarden von X11 und Authorisierung ist abgeschaltet."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -190,7 +181,7 @@ msgstr ""
 "ForwardAgent auf \"off\" gesetzt."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -199,18 +190,18 @@ msgstr ""
 "Konfigurations Dateien oder per Kommando-Zeilen Option -X ändern."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "Weitere Details koennen Sie in /usr/share/doc/ssh/README.Debian finden."
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Warnung: rsh-server ist installiert --- möglicherweise"
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -219,12 +210,12 @@ msgstr ""
 "Sicherheit untergräbt. Wir empfehlen, das Paket zu entfernen."
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Warnung: telnetd ist installiert --- schlechte Idee"
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -236,12 +227,12 @@ msgstr ""
 "daß Login und Password unverschlüsselt durch das Netz gesendet werden."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "Warnung: Sie müssen einen neuen Host Key erzeugen"
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 #, fuzzy
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
@@ -254,48 +245,48 @@ msgstr ""
 "werden."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr ""
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr ""
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
 msgstr ""
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
 msgstr ""
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
 msgstr ""
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "Do you want to run the sshd server ?"
 msgstr "Möchten Sie den sshd Server starten?"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Das Paket enthält sowohl den Client als auch den sshd Server."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -303,7 +294,7 @@ msgstr ""
 "Normal wird der sshd Secure Shell Server für Remote Logins per ssh gestartet."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -314,12 +305,12 @@ msgstr ""
 "können Sie hier den sshd abschalten."
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -328,7 +319,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
diff --git a/debian/po/es.po b/debian/po/es.po
index f14f15efd..92cfbe2bd 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2-3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-27 17:26+0100\n"
+"POT-Creation-Date: 2003-08-27 02:20+0100\n"
 "PO-Revision-Date: 2003-06-21 15:30+0200\n"
 "Last-Translator: Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -42,22 +42,12 @@ msgstr ""
 "ssh/sshd_config."
 
 #. Description
-#: ../templates.master:3
-msgid ""
-"NB! If you are running a 2.0 series Linux kernel, then privilege separation "
-"will not work at all, and your sshd will fail to start unless you explicitly "
-"turn privilege separation off."
-msgstr ""
-"Nota: Si utiliza un núcleo Linux 2.0, la separación de privilegios fallará "
-"estrepitosamente y sshd no funcionará a no ser que la desactive."
-
-#. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "Activar separación de privilegios"
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -69,7 +59,7 @@ msgstr ""
 "seguridad en sshd."
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -81,13 +71,13 @@ msgstr ""
 "funcionarán."
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
+#, fuzzy
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
-"you are running 2.0 (in which case you *must* say no here or your sshd won't "
-"start at all) or know you need to use PAM features that won't work with this "
-"option, you should say yes here."
+"you know you need to use PAM features that won't work with this option, you "
+"should say yes here."
 msgstr ""
 "Puesto que ha elegido crear automáticamente el fichero sshd_config, puede "
 "decidir ahora si quiere activar la opción de separación de privilegios. A "
@@ -96,12 +86,12 @@ msgstr ""
 "funcionan con esta opción, debería responder sí a esta pregunta."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "Generar un nuevo fichero de configuración"
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -117,7 +107,7 @@ msgstr ""
 "antigua."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -133,7 +123,7 @@ msgstr ""
 "sshd_config y poner no si lo desea."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -142,12 +132,12 @@ msgstr ""
 "configuración ahora."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "Permitir sólo la versión 2 del protocolo SSH"
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -160,7 +150,7 @@ msgstr ""
 "clientes antiguos, como, por ejemplo, el incluido en \"potato\"."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -170,7 +160,7 @@ msgstr ""
 "mediante la versión 2 del protocolo."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -179,12 +169,12 @@ msgstr ""
 "instrucciones sobre cómo modificar en el fichero sshd_config."
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr "Las claves ssh2 ya se incluyen en los ficheros de configuración"
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -196,12 +186,12 @@ msgstr ""
 "mantener compatibilidad hacia atrás."
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "¿Desea continuar, aún a riesgo de matar las sesiones ssh activas?"
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -212,7 +202,7 @@ msgstr ""
 "no sea muy buena idea."
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -221,12 +211,12 @@ msgstr ""
 "stop-daemon', en la sección 'stop' del fichero."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "NOTA: Reenvío de X11 y Autorización desactivadas por defecto."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -235,7 +225,7 @@ msgstr ""
 "ForwardX11 y ForwardAgent desactivadas."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -244,17 +234,17 @@ msgstr ""
 "ficheros de configuración o con la opción -X en línea de comandos."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "Puede encontrar más detalles en /usr/share/doc/ssh/README.Debian."
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Aviso: tiene rsh-server instalado"
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -264,12 +254,12 @@ msgstr ""
 "paquete."
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Aviso: tiene telnetd instalado"
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -282,12 +272,12 @@ msgstr ""
 "no viajen sin cifrar por la red."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "Aviso: debe crear una nueva clave para su servidor"
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -298,17 +288,17 @@ msgstr ""
 "utilidad ssh-keygen incluida en el paquete ssh no libre."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr "Necesitará generar una nueva clave para su servidor."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "¿Quiere instalar /usr/lib/ssh-keysign SUID root?"
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
@@ -317,7 +307,7 @@ msgstr ""
 "root)."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
@@ -326,7 +316,7 @@ msgstr ""
 "de la versión 2 del protocolo SSH."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
@@ -335,17 +325,17 @@ msgstr ""
 "cambiar de opinión posteriormente ejecutando «dpkg-reconfigure ssh»."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "Do you want to run the sshd server ?"
 msgstr "¿Quiere ejecutar el servidor sshd?"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Este paquete contiene el cliente ssh y el servidor sshd."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -354,7 +344,7 @@ msgstr ""
 "permitir el acceso remoto mediante ssh."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -365,12 +355,12 @@ msgstr ""
 "sshd."
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr "Las opciones de entorno para las claves, en desuso"
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -383,7 +373,7 @@ msgstr ""
 "claves implicadas no funcionarán hasta que borre la opción."
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
@@ -392,3 +382,11 @@ msgstr ""
 "Para volver a activar esta opción, escriba \"PermitUserEnvironment yes\" en /"
 "etc/ssh/sshd_config al terminar la actualización, teniendo en cuenta el "
 "aviso de la página de manual de sshd_config(5)."
+
+#~ msgid ""
+#~ "NB! If you are running a 2.0 series Linux kernel, then privilege "
+#~ "separation will not work at all, and your sshd will fail to start unless "
+#~ "you explicitly turn privilege separation off."
+#~ msgstr ""
+#~ "Nota: Si utiliza un núcleo Linux 2.0, la separación de privilegios "
+#~ "fallará estrepitosamente y sshd no funcionará a no ser que la desactive."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 68647c3f9..d72a5d5d7 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh 3.6.1p2-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-27 17:26+0100\n"
+"POT-Creation-Date: 2003-08-27 02:20+0100\n"
 "PO-Revision-Date: 2003-05-22 10:34+0200\n"
 "Last-Translator: Denis Barbier <barbier@debian.org>\n"
 "Language-Team: French <Debian-l10n-french@lists.debian.org>\n"
@@ -40,23 +40,12 @@ msgstr ""
 "sshd_config."
 
 #. Description
-#: ../templates.master:3
-msgid ""
-"NB! If you are running a 2.0 series Linux kernel, then privilege separation "
-"will not work at all, and your sshd will fail to start unless you explicitly "
-"turn privilege separation off."
-msgstr ""
-"N. B. ! Si vous avez un noyau Linux de la série des 2.0, la séparation des "
-"privilèges ne fonctionne pas, et votre démon sshd ne se lancera que si vous "
-"avez explicitement désactivé la séparation des privilèges."
-
-#. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "Activer la séparation des privilèges"
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -68,7 +57,7 @@ msgstr ""
 "de sécurité dans sshd."
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -80,13 +69,13 @@ msgstr ""
 "l'authentification interactive au clavier ne fonctionnera pas."
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
+#, fuzzy
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
-"you are running 2.0 (in which case you *must* say no here or your sshd won't "
-"start at all) or know you need to use PAM features that won't work with this "
-"option, you should say yes here."
+"you know you need to use PAM features that won't work with this option, you "
+"should say yes here."
 msgstr ""
 "Comme vous souhaitez que je génère le fichier de configuration sshd_config à "
 "votre place, vous pouvez choisir d'activer ou non l'option de séparation des "
@@ -96,12 +85,12 @@ msgstr ""
 "est activée, dans le cas contraire vous devriez l'activer."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "Créer un nouveau fichier de configuration"
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -117,7 +106,7 @@ msgstr ""
 "aucun des réglages que vous avez faits sur l'ancienne version."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -134,7 +123,7 @@ msgstr ""
 "changer cela."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -143,12 +132,12 @@ msgstr ""
 "de configuration."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "Autoriser la version 2 du protocole SSH uniquement"
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -162,7 +151,7 @@ msgstr ""
 "la distribution Debian « Potato » en fait partie)."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -172,7 +161,7 @@ msgstr ""
 "utilisant la version 2 du protocole."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -182,12 +171,12 @@ msgstr ""
 "modifier le fichier sshd_config."
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr "Clés pour ssh2 fusionnées dans les fichiers de configuration"
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -199,13 +188,13 @@ msgstr ""
 "la compatibilité descendante."
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr ""
 "Voulez-vous continuer (et risquer de rompre les sessions ssh actives) ?"
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -216,7 +205,7 @@ msgstr ""
 "en train de faire cette mise à niveau à l'aide de ssh, ce serait regrettable."
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -226,13 +215,13 @@ msgstr ""
 "fichier."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "NOTE : suivi de session X11 et d'agent d'autorisation désactivés par défaut."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -241,7 +230,7 @@ msgstr ""
 "options ForwardX11 et ForwardAgent à « Off » par défaut."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -251,20 +240,20 @@ msgstr ""
 "de la ligne de commande."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "Vous trouverez plus d'informations dans /usr/share/doc/ssh/README.Debian."
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Attention : rsh-server est installé -- ce n'est probablement pas une bonne "
 "idée"
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -274,13 +263,13 @@ msgstr ""
 "paquet."
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 "Attention : telnetd est installé -- ce n'est probablement pas une bonne idée"
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -293,12 +282,12 @@ msgstr ""
 "de passe et noms d'utilisateurs ne passent pas en clair sur le réseau."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "Attention : vous devez créer une nouvelle clé d'hôte"
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -309,19 +298,19 @@ msgstr ""
 "keygen de l'installation précédente (non libre) de SSH."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr "Vous aurez besoin de générer une nouvelle clé d'hôte."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr ""
 "Voulez-vous que /usr/lib/ssh-keysign soit installé avec le bit SETUID "
 "activé ?"
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
@@ -329,7 +318,7 @@ msgstr ""
 "Vous avez la possibilité d'installer ssh-keysign avec le bit SETUID activé."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
@@ -339,7 +328,7 @@ msgstr ""
 "protocole SSH."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
@@ -349,17 +338,17 @@ msgstr ""
 "« dpkg-reconfigure ssh »."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "Do you want to run the sshd server ?"
 msgstr "Voulez-vous utiliser le serveur sshd ?"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Ce paquet contient à la fois le client ssh et le serveur sshd."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -368,7 +357,7 @@ msgstr ""
 "distantes via ssh."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -379,12 +368,12 @@ msgstr ""
 "ssh, vous pouvez désactiver sshd maintenant."
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr "Les options d'environnement sur les clés sont déconseillées"
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -398,7 +387,7 @@ msgstr ""
 "fonctionneront plus tant que l'option ne sera pas retirée."
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
@@ -407,3 +396,12 @@ msgstr ""
 "Pour la réactiver, veuillez indiquer «PermitUserEnvironment yes » dans /etc/"
 "ssh/sshd_config lorsque la mise à niveau est terminée. Veuillez tenir compte "
 "de l'avertissement donné dans la page de manuel sshd_config(5)."
+
+#~ msgid ""
+#~ "NB! If you are running a 2.0 series Linux kernel, then privilege "
+#~ "separation will not work at all, and your sshd will fail to start unless "
+#~ "you explicitly turn privilege separation off."
+#~ msgstr ""
+#~ "N. B. ! Si vous avez un noyau Linux de la série des 2.0, la séparation "
+#~ "des privilèges ne fonctionne pas, et votre démon sshd ne se lancera que "
+#~ "si vous avez explicitement désactivé la séparation des privilèges."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index c31072750..dcead1cdb 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-27 17:26+0100\n"
+"POT-Creation-Date: 2003-08-27 02:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,22 +40,12 @@ msgstr ""
 "sshd_conf ¤Ë¡ÖUsePrivilegeSeparation no¡×¤È¤¤¤¦¹Ô¤òÄɲà ¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. Description
-#: ../templates.master:3
-msgid ""
-"NB! If you are running a 2.0 series Linux kernel, then privilege separation "
-"will not work at all, and your sshd will fail to start unless you explicitly "
-"turn privilege separation off."
-msgstr ""
-"Ãí°Õ! Linux ¥«¡¼¥Í¥ë¤Î¥Ð¡¼¥¸¥ç¥ó 2.0 ·ÏÎó¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢Æø¢ ʬΥ¤ÏÁ´¤¯Æ°"
-"ºî¤·¤Þ¤»¤ó¡£ÌÀ¼¨Åª¤ËÆø¢Ê¬Î¥¤ò̵¸ú¤Ë¤·¤Ê¤¤¸Â¤ê¡¢sshd ¤Ïµ¯Æ°¤Ë¼ºÇÔ¤·¤Þ¤¹¡£"
-
-#. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "Æø¢Ê¬Î¥¤òÍ­¸ú¤Ë¤¹¤ë"
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -66,7 +56,7 @@ msgstr ""
 "¥­¥å¥ê¥Æ¥£¥Û¡¼¥ë¤Î±Æ¶Á¤ò¸º¤é¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -77,13 +67,13 @@ msgstr ""
 "PAM ¥­¡¼¥Ü¡¼¥ÉÂÐÏÃŪǧ¾Ú¤âÆ°ºî¤·¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
+#, fuzzy
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
-"you are running 2.0 (in which case you *must* say no here or your sshd won't "
-"start at all) or know you need to use PAM features that won't work with this "
-"option, you should say yes here."
+"you know you need to use PAM features that won't work with this option, you "
+"should say yes here."
 msgstr ""
 "¤¢¤Ê¤¿¤Ï sshd_config ¥Õ¥¡¥¤¥ë¤ò¼«Æ°À¸À®¤¹¤ë¤³¤È¤òÁªÂò¤·¤Þ¤·¤¿¤Î¤Ç¡¢ ¤³¤³¤ÇÆÃ"
 "¸¢Ê¬Î¥¤òÍ­¸ú¤Ë¤¹¤ë¤«¤·¤Ê¤¤¤«¤òÁªÂò¤Ç¤­¤Þ¤¹¡£2.0 ·ÏÎó¤Î ¥«¡¼¥Í¥ë¤ò»È¤Ã¤Æ¤¤¤ë"
@@ -91,12 +81,12 @@ msgstr ""
 "¤¦¤ÁÆø¢Ê¬Î¥¤È¶¦Â¸¤Ç¤­¤Ê¤¤µ¡Ç½¤ò »È¤¤¤¿¤¤¾ì¹ç°Ê³°¤Ï¡¢¡Ö¤Ï¤¤¡×¤òÁª¤Ö¤Ù¤­¤Ç¤¹¡£"
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "¿·¤·¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤òºî¤ê¤Þ¤¹"
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -112,7 +102,7 @@ msgstr ""
 "¤ó¡£"
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -126,19 +116,19 @@ msgstr ""
 "¤òÆɤó¤Ç²¼¤µ¤¤)¡¢sshd_config ¤òÊÔ½¸¤·¤Æ¡Öno¡×¤ËÀß Äꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
 msgstr "¿·¤·¤¤ÀßÄê¥Õ¥¡¥¤¥ë¤ò¼«Æ°À¸À®¤¹¤ë¤³¤È¤ò¶¯¤¯¤ª´«¤á¤·¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "SSH ¥×¥í¥È¥³¥ë 2 ¤Î¤ß¤òµö²Ä¤·¤Þ¤¹"
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -151,7 +141,7 @@ msgstr ""
 "ssh ¥¯¥é¥¤¥¢¥ó¥È¤âÀܳ¤Ç¤­¤Ê¤¯¤Ê¤ê¤Þ¤¹)¡£"
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -160,7 +150,7 @@ msgstr ""
 "¤½¤Î¥­¡¼¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -169,12 +159,12 @@ msgstr ""
 "¤¦¤ËÊѹ¹¤·¤¿¤é¤è¤¤¤«¤¬Ê¬¤«¤ê¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr "ssh2 ¥­¡¼¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤ËÅý¹ç¤µ¤ì¤Þ¤¹"
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -185,12 +175,12 @@ msgstr ""
 "¤Þ¤·¤¿¡£¸åÊý¸ß´¹À­¤òÊݤĤ¿¤á¤Ë¤Ï¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤¬É¬Í× ¤Ç¤¹¡£"
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "³¤±¤Æ¤¤¤¤¤Ç¤¹¤« (ÀܳÃæ¤Î ssh ¥»¥Ã¥·¥ç¥ó¤¬ÀÚ¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó)"
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -201,7 +191,7 @@ msgstr ""
 "¤¿¤Ç¤¹¡£"
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -210,12 +200,12 @@ msgstr ""
 "daemon ¤Î¹Ô¤Ë¡Ö--pidfile /var/run/sshd.pid¡×¤ÈÄɲä·¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "Ãí°Õ: X11 ¤Èǧ¾Ú¤Î¥Õ¥©¥ï¡¼¥Ç¥£¥ó¥°¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¶Ø»ß¤µ¤ì¤Þ¤¹"
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -224,7 +214,7 @@ msgstr ""
 "¥Õ¥©¥ë¥È¤Ç¤Ï¡Öoff¡×¤ËÀßÄꤵ¤ì¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -233,18 +223,18 @@ msgstr ""
 "ÍѤǤ­¤ë¥µ¡¼¥Ð¤ËÂФ·¤Æµö²Ä¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "¾ÜºÙ¤Ï /usr/share/doc/ssh/README.Debian ¤òÆɤó¤Ç²¼¤µ¤¤¡£"
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "·Ù¹ð: rsh-server ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤Ö¤óÎɤ¤¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -254,12 +244,12 @@ msgstr ""
 "¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "·Ù¹ð: telnetd ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤Ö¤óÎɤ¤¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -272,12 +262,12 @@ msgstr ""
 "Êó¤¬Î®¤ì¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "·Ù¹ð: ¿·¤·¤¤¥Û¥¹¥È¥­¡¼¤òºî¤é¤Ê¤¤¤È¤¤¤±¤Þ¤»¤ó"
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -288,17 +278,17 @@ msgstr ""
 "¤Ç¤Ï¤Ê¤¤) SSH ¤Ë¤Ï ssh-keygen ¥æ¡¼¥Æ¥£¥ê¥Æ¥£ ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr "¿·¤·¤¤¥Û¥¹¥È¥­¡¼¤òºî¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "/usr/bin/ssh-keysign ¤ò SUID root ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤«?"
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
@@ -307,7 +297,7 @@ msgstr ""
 "Áª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
@@ -316,7 +306,7 @@ msgstr ""
 "»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
@@ -325,17 +315,17 @@ msgstr ""
 "¤Ð¡¢dpkg-reconfigure ssh ¤ò¼Â¹Ô¤¹¤ë¤³¤È¤ÇÀßÄê¤òÊѹ¹ ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "Do you want to run the sshd server ?"
 msgstr "sshd ¥µ¡¼¥Ð¤ò¼Â¹Ô¤·¤Þ¤¹¤«?"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢ssh ¥¯¥é¥¤¥¢¥ó¥È¤È sshd ¥µ¡¼¥Ð¤ÎξÊý¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -344,7 +334,7 @@ msgstr ""
 "¤Ë¤¹¤ë¤¿¤á¤Ë¼Â¹Ô¤·¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -355,12 +345,12 @@ msgstr ""
 "¤ª¤­¤Þ¤¹¡£"
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr "¸°¤Î´Ä¶­¥ª¥×¥·¥ç¥ó¤Ï̵¸ú¤ËÀßÄꤵ¤ì¤Þ¤·¤¿"
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -373,7 +363,7 @@ msgstr ""
 "¤ÏÍøÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ ¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
@@ -382,3 +372,12 @@ msgstr ""
 "¤³¤Î¥ª¥×¥·¥ç¥ó¤òºÆ¤ÓÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É½ªÎ»¸å¤Ë¡¢ sshd_config(5) "
 "¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Î·Ù¹ð»ö¹à¤òÆɤó¤Ç¡¢ /etc/ssh/sshd_config ¥Õ¥¡¥¤¥ë¤Ë"
 "¡ÖPermitUserEnvironment yes¡×¤È ÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£"
+
+#~ msgid ""
+#~ "NB! If you are running a 2.0 series Linux kernel, then privilege "
+#~ "separation will not work at all, and your sshd will fail to start unless "
+#~ "you explicitly turn privilege separation off."
+#~ msgstr ""
+#~ "Ãí°Õ! Linux ¥«¡¼¥Í¥ë¤Î¥Ð¡¼¥¸¥ç¥ó 2.0 ·ÏÎó¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢Æø¢ ʬΥ¤ÏÁ´¤¯"
+#~ "Æ°ºî¤·¤Þ¤»¤ó¡£ÌÀ¼¨Åª¤ËÆø¢Ê¬Î¥¤ò̵¸ú¤Ë¤·¤Ê¤¤¸Â¤ê¡¢sshd ¤Ïµ¯Æ°¤Ë¼ºÇÔ¤·¤Þ"
+#~ "¤¹¡£"
diff --git a/debian/po/pl.po b/debian/po/pl.po
index f483a3ada..6910ceaf7 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-27 17:26+0100\n"
+"POT-Creation-Date: 2003-08-27 02:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,23 +41,12 @@ msgstr ""
 "sshd_config."
 
 #. Description
-#: ../templates.master:3
-msgid ""
-"NB! If you are running a 2.0 series Linux kernel, then privilege separation "
-"will not work at all, and your sshd will fail to start unless you explicitly "
-"turn privilege separation off."
-msgstr ""
-"UWAGA! Je¿eli u¿ywasz j±dra Linux'a z serii 2.0, to separacja uprawnieñ w "
-"ogóle nie bêdzie dzia³aæ i sshd nie wystartuje dopóki w³asnorêcznie nie "
-"wy³±czysz separacji uprawnieñ w /etc/ssh/sshd_config."
-
-#. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "W³±czenie separacji uprawnieñ"
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -68,7 +57,7 @@ msgstr ""
 "efekty luk bezpieczeñstwa w sshd."
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -80,13 +69,13 @@ msgstr ""
 "(keyboard-interactive authentication)."
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
+#, fuzzy
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
-"you are running 2.0 (in which case you *must* say no here or your sshd won't "
-"start at all) or know you need to use PAM features that won't work with this "
-"option, you should say yes here."
+"you know you need to use PAM features that won't work with this option, you "
+"should say yes here."
 msgstr ""
 "Zdecydowa³e¶ siê na to abym wygenerowa³ dla ciebie plik sshd_config, i "
 "mo¿esz wybraæ czy chcesz w³±czyæ Separacjê Uprawnieñ, czy te¿ nie. Je¶li nie "
@@ -96,12 +85,12 @@ msgstr ""
 "'tak'."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "Wygeneruj nowy plik konfiguracyjny"
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -116,7 +105,7 @@ msgstr ""
 "przez ciebie w starej wersji zmian."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -132,7 +121,7 @@ msgstr ""
 "zgadzasz."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -140,12 +129,12 @@ msgstr ""
 "Jest bardzo wskazane aby¶ pozwoli³ mi wygenerowaæ nowy plik konfiguracyjny."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "Zezwalaj wy³±cznie na wersjê 2 protoko³u SSH"
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -158,7 +147,7 @@ msgstr ""
 "wersjom klientów (dotyczy to np. klienta ssh do³±czanego do \"potato\")."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -168,7 +157,7 @@ msgstr ""
 "protoko³u."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -177,12 +166,12 @@ msgstr ""
 "zmieniæ w sshd_config znajduj± siê w README.Debian."
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr "klucze ssh2 w³±czone do plików konfiguracyjnych"
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -193,12 +182,12 @@ msgstr ""
 "potrzebne. Bêd± one jednak odczytywane aby zachowaæ wsteczn± kompatybilno¶æ."
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "Czy chcesz kontynuowaæ (i ryzykowaæ zabicie aktywnych sesji ssh) ?"
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -209,7 +198,7 @@ msgstr ""
 "(tm)."
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -218,13 +207,13 @@ msgstr ""
 "stop-daemon w sekcji stop tego pliku."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "UWAGA: Przekazywanie (forwarding) X11 i Autoryzacji jest domy¶lnie wy³±czone."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -233,7 +222,7 @@ msgstr ""
 "ustawione  domy¶lnie na 'off'."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -242,18 +231,18 @@ msgstr ""
 "przy pomocy opcji -X z linii komend."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr "Wiêcej szczegó³ów znajdziesz w /usr/share/doc/ssh/README.Debian."
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Uwaga: serwer rsh jest zainstalowany --- prawdopodobnie nienajlepszy pomys³"
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -263,13 +252,13 @@ msgstr ""
 "pakiet."
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 "Uwaga: telnetd jest zainstalowany --- prawdopodobnie nienajlepszy pomys³"
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -282,12 +271,12 @@ msgstr ""
 "danych sesji przez sieæ."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "Uwaga: musisz utworzyæ nowy klucz hosta"
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -298,17 +287,17 @@ msgstr ""
 "polecenia ssh-keygen ze starego SSH (non-free)."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr "Bêdziesz musia³ wygenerowaæ nowy klucz hosta."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "Czy chcesz aby /usr/lib/ssh-keysign by³ zainstalowany jako SUID root?"
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
@@ -317,7 +306,7 @@ msgstr ""
 "bitem SETUID."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
@@ -326,7 +315,7 @@ msgstr ""
 "autentykacji drugiej wersji protoko³u SSH."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
@@ -336,17 +325,17 @@ msgstr ""
 "reconfigure ssh"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "Do you want to run the sshd server ?"
 msgstr "Czy chcesz uruchamiaæ serwer sshd ?"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Ten pakiet zawiera zarówno klienta ssh, jak i serwer sshd."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -355,7 +344,7 @@ msgstr ""
 "zdalny dostêp przez ssh."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -366,12 +355,12 @@ msgstr ""
 "to mo¿esz teraz wy³±czyæ serwer sshd."
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -380,9 +369,18 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
 "sshd_config(5) manual page."
 msgstr ""
+
+#~ msgid ""
+#~ "NB! If you are running a 2.0 series Linux kernel, then privilege "
+#~ "separation will not work at all, and your sshd will fail to start unless "
+#~ "you explicitly turn privilege separation off."
+#~ msgstr ""
+#~ "UWAGA! Je¿eli u¿ywasz j±dra Linux'a z serii 2.0, to separacja uprawnieñ w "
+#~ "ogóle nie bêdzie dzia³aæ i sshd nie wystartuje dopóki w³asnorêcznie nie "
+#~ "wy³±czysz separacji uprawnieñ w /etc/ssh/sshd_config."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 84a07a973..1c5c4b7c6 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openssh-3.5p1-4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-27 17:26+0100\n"
+"POT-Creation-Date: 2003-08-27 02:20+0100\n"
 "PO-Revision-Date: 2003-03-08 16:56+0300\n"
 "Last-Translator: André Luís Lopes <andrelop@ig.com.br>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -40,24 +40,12 @@ msgstr ""
 "\"UsePrivilegeSeparation no\" ao arquivo /etc/ssh/sshd_config."
 
 #. Description
-#: ../templates.master:3
-msgid ""
-"NB! If you are running a 2.0 series Linux kernel, then privilege separation "
-"will not work at all, and your sshd will fail to start unless you explicitly "
-"turn privilege separation off."
-msgstr ""
-"NB ! Caso você esteja executando um kernel Linux da séria 2.0 o recurso de "
-"separação de privilégios não funcionará e seu daemon sshd irá falhar ao "
-"iniciar a menos que você explicitamente desabilite o recurso de separação de "
-"privilégios."
-
-#. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr "Habilitar Separação de Privilégios"
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -68,7 +56,7 @@ msgstr ""
 "root e portanto reduz o impacto de falhas de segurança no sshd."
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -80,13 +68,13 @@ msgstr ""
 "teclado do PAM não funcionará."
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
+#, fuzzy
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
-"you are running 2.0 (in which case you *must* say no here or your sshd won't "
-"start at all) or know you need to use PAM features that won't work with this "
-"option, you should say yes here."
+"you know you need to use PAM features that won't work with this option, you "
+"should say yes here."
 msgstr ""
 "Uma vez que você optou por permitir que o debconf gere o arquivo sshd_config "
 "para você, é possível escolher se você deseja ter ou não o recurso de "
@@ -97,12 +85,12 @@ msgstr ""
 "você deve responder sim aqui."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr "Gerar novo arquivo de configuração"
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -119,7 +107,7 @@ msgstr ""
 "anterior."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -137,7 +125,7 @@ msgstr ""
 "concorde com o mantenedor do OpenSSH."
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -146,12 +134,12 @@ msgstr ""
 "será gerado automaticamente para você."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr "Permitir somente protocolo SSH versão 2"
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -166,7 +154,7 @@ msgstr ""
 "afetada.)"
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
@@ -176,7 +164,7 @@ msgstr ""
 "protocolo 2."
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -186,12 +174,12 @@ msgstr ""
 "arquivo de configuração sshd_config."
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr "Chaves ssh2 incluídas nos arquivos de configuração"
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -203,12 +191,12 @@ msgstr ""
 "para manter a compatibilidade com versões anteriores."
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "Deseja continuar (e arriscar acabar com sessões ssh ativas) ?"
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -219,7 +207,7 @@ msgstr ""
 "atualização através de uma sessão ssh, isto seria uma Coisa Ruim(tm)."
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -228,12 +216,12 @@ msgstr ""
 "start-stop-daemon na seção stop deste arquivo."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "NOTA: Encaminhamento de X11 e Autorização desabilitados por padrão."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -242,7 +230,7 @@ msgstr ""
 "ForwardAgent definidas como ``off'' por padrão."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -251,18 +239,18 @@ msgstr ""
 "arquivos de configuração, ou com a opção de linha de comando -X."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "Maiores detalhes podem ser encontrados em /usr/share/doc/ssh/README.Debian."
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "Aviso: rsh-server está instalado --- provavelmente não é uma boa idéia"
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -272,12 +260,12 @@ msgstr ""
 "remover este pacote."
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "Aviso: telnetd está instalado --- provavelmente não é uma boa idéia"
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -290,12 +278,12 @@ msgstr ""
 "e informações de sessão através da rede."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "Aviso: você deve criar uma nova host key"
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -306,17 +294,17 @@ msgstr ""
 "o utilitário ssh-keygen da antiga (non-free) instalação SSH."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr "Você precisará gerar uma nova host key."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "Deseja que que /usr/lib/ssh-keysign seja instalado SUID root ?"
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
@@ -325,7 +313,7 @@ msgstr ""
 "definido."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
@@ -334,7 +322,7 @@ msgstr ""
 "usar a autenticação baseada em host do protocolo SSH 2."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
@@ -344,17 +332,17 @@ msgstr ""
 "comando : dpkg-reconfigure ssh"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "Do you want to run the sshd server ?"
 msgstr "Você quer executar o servidor sshd ?"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Este pacote contém ambos o cliente ssh e o servidor sshd."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -363,7 +351,7 @@ msgstr ""
 "remotos via ssh."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -374,12 +362,12 @@ msgstr ""
 "desabilitar o sshd aqui."
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr "Opções ed ambiente sobre chaves estão obsoletas"
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -393,7 +381,7 @@ msgstr ""
 "removida."
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
@@ -402,3 +390,13 @@ msgstr ""
 "Para reabilitar esta opção, defina a opção \"PermitUserEnvironment yes\" no "
 "arquivo /et/ssh/sshd_config depois da a atualização terminar, atentando para "
 "o aviso na página de manual do sshd_config(5)."
+
+#~ msgid ""
+#~ "NB! If you are running a 2.0 series Linux kernel, then privilege "
+#~ "separation will not work at all, and your sshd will fail to start unless "
+#~ "you explicitly turn privilege separation off."
+#~ msgstr ""
+#~ "NB ! Caso você esteja executando um kernel Linux da séria 2.0 o recurso "
+#~ "de separação de privilégios não funcionará e seu daemon sshd irá falhar "
+#~ "ao iniciar a menos que você explicitamente desabilite o recurso de "
+#~ "separação de privilégios."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 0c41608c4..bb33e63a1 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-27 17:26+0100\n"
+"POT-Creation-Date: 2003-08-27 02:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,20 +38,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:3
-msgid ""
-"NB! If you are running a 2.0 series Linux kernel, then privilege separation "
-"will not work at all, and your sshd will fail to start unless you explicitly "
-"turn privilege separation off."
-msgstr ""
-
-#. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr ""
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -59,7 +51,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -67,22 +59,21 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
-"you are running 2.0 (in which case you *must* say no here or your sshd won't "
-"start at all) or know you need to use PAM features that won't work with this "
-"option, you should say yes here."
+"you know you need to use PAM features that won't work with this option, you "
+"should say yes here."
 msgstr ""
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr ""
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -92,7 +83,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -102,19 +93,19 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
 msgstr ""
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr ""
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -123,26 +114,26 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
 msgstr ""
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
 msgstr ""
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr ""
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -150,12 +141,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr "÷Ù ÈÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ (ÒÉÓËÕÑ ÐÏÔÅÒÑÔØ ÁËÔÉ×ÎÙÅ ssh-ÓÏÅÄÉÎÅÎÉÑ)?"
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -166,7 +157,7 @@ msgstr ""
 "ÓÅÓÓÉÀ, ÔÏ ÜÔÏ ðÌÏÈÁÑ ÷ÅÝØ (tm)."
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
@@ -175,12 +166,12 @@ msgstr ""
 "start-stop-daemon × ÒÁÚÄÅÌÅ stop ÜÔÏÇÏ ÆÁÊÌÁ."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr "ðòéíåþáîéå: æÏÒ×ÁÒÄÉÎÇ X11 É Authorization ÚÁÐÒÅÝÅÎ ÐÏ ÕÍÏÌÞÁÎÉÀ."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -189,7 +180,7 @@ msgstr ""
 "ForwardAgent ÕÓÔÁÎÏ×ÌÅÎÎÙÍÉ × ``off'' ÐÏ ÕÍÏÌÞÁÎÉÀ."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -198,18 +189,18 @@ msgstr ""
 "ÎÁÓÔÒÏÅÞÎÙÈ ÆÁÊÌÏ×, ÉÌÉ ÐÁÒÁÍÅÔÒÏÍ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ -X."
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 "äÏÐÏÌÎÉÔÅÌØÕÀ ÉÎÆÏÒÍÁÃÉÀ ÍÏÖÎÏ ÎÁÊÔÉ × /usr/share/doc/ssh/README.Debian"
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕÓÔÁÎÏ×ÌÅÎ rsh-server --- ×ÉÄÉÍÏ, ÎÅ ÏÞÅÎØ ÈÏÒÏÛÏ"
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
@@ -218,12 +209,12 @@ msgstr ""
 "ÈÏÔÉÔÅ ÐÏ×ÙÓÉÔØ ÕÓÔÁÎÁ×ÌÉ×ÁÑ ssh. òÅËÏÍÅÎÄÕÅÔÓÑ ÕÄÁÌÉÔØ ÜÔÏÔ ÐÁËÅÔ."
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÕÓÔÁÎÏ×ÌÅÎ telnetd --- ×ÉÄÉÍÏ, ÎÅ ÏÞÅÎØ ÈÏÒÏÛÏ"
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -236,12 +227,12 @@ msgstr ""
 "ÐÏÌØÚÏ×ÁÔÅÌÅÊ É ÐÒÏÞÕÀ ÉÎÆÏÒÍÁÃÉÀ × telnet-ÓÅÓÓÉÑÈ."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ×Ù ÄÏÌÖÎÙ ÓÏÚÄÁÔØ ÎÏ×ÙÊ ËÌÀÞ ÍÁÛÉÎÙ."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -252,18 +243,18 @@ msgstr ""
 "keygen ÏÔ ÓÔÁÒÏÊ (ÎÅÓ×ÏÂÏÄÎÏÊ) ÉÎÓÔÁÌÌÑÃÉÉ SSH."
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr "÷ÁÍ ÎÁÄÏ ÂÕÄÅÔ ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÎÏ×ÙÊ ËÌÀÞ ÈÏÓÔÁ."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 #, fuzzy
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr "èÏÔÉÔÅ ÕÓÔÁÎÏ×ÉÔØ /usr/bin/ssh ËÁË SUID root?"
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 #, fuzzy
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
@@ -272,7 +263,7 @@ msgstr ""
 "÷Ù  ÉÍÅÅÔÅ  ×ÏÚÍÏÖÎÏÓÔØ  ÕÓÔÁÎÏ×ÉÔØ /usr/bin/ssh Ó ÕÓÔÁÎÏ×ÌÅÎÎÙÍ ÂÉÔÏÍ SUID."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 #, fuzzy
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
@@ -283,7 +274,7 @@ msgstr ""
 "ÔÒÁÄÉÃÉÏÎÎÏÅ ÐÏ×ÅÄÅÎÉÅ."
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 #, fuzzy
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
@@ -296,17 +287,17 @@ msgstr ""
 "ÕÓÔÁÎÏ×ÌÅÎÎÙÈ ×ÁÍÉ ÐÒÁ×ÉÌ ÆÁÊÒ×ÏÌÁ."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "Do you want to run the sshd server ?"
 msgstr "èÏÔÉÔÅ ÚÁÐÕÓÔÉÔØ ÓÅÒ×ÅÒ sshd?"
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ É ssh-ËÌÉÅÎÔ, É ssh-ÓÅÒ×ÅÒ."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -315,7 +306,7 @@ msgstr ""
 "ÒÅÇÉÓÔÒÁÃÉÉ × ÓÉÓÔÅÍÅ ÞÅÒÅÚ ssh."
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -326,12 +317,12 @@ msgstr ""
 "ÔÏ ×Ù ÍÏÖÅÔÅ ÓÅÊÞÁÓ ÚÁÐÒÅÔÉÔØ sshd."
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -340,7 +331,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 8cfe6abe9..42e6a9522 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-07-27 17:26+0100\n"
+"POT-Creation-Date: 2003-08-27 02:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,20 +38,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:3
-msgid ""
-"NB! If you are running a 2.0 series Linux kernel, then privilege separation "
-"will not work at all, and your sshd will fail to start unless you explicitly "
-"turn privilege separation off."
-msgstr ""
-
-#. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid "Enable Privilege separation"
 msgstr ""
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "This version of OpenSSH contains the new privilege separation option. This "
 "significantly reduces the quantity of code that runs as root, and therefore "
@@ -59,7 +51,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
 "session modules that need to run as root (pam_mkhomedir, for example) will "
@@ -67,22 +59,21 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:23
+#: ../templates.master:19
 msgid ""
 "Since you've opted to have me generate an sshd_config file for you, you can "
 "choose whether or not to have Privilege Separation turned on or not. Unless "
-"you are running 2.0 (in which case you *must* say no here or your sshd won't "
-"start at all) or know you need to use PAM features that won't work with this "
-"option, you should say yes here."
+"you know you need to use PAM features that won't work with this option, you "
+"should say yes here."
 msgstr ""
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid "Generate new configuration file"
 msgstr ""
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -92,7 +83,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -102,19 +93,19 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:41
+#: ../templates.master:36
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
 msgstr ""
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid "Allow SSH protocol 2 only"
 msgstr ""
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "This version of OpenSSH supports version 2 of the ssh protocol, which is "
 "much more secure.  Disabling ssh 1 is encouraged, however this will slow "
@@ -123,26 +114,26 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "Also please note that keys used for protocol 1 are different so you will not "
 "be able to use them if you only allow protocol 2 connections."
 msgstr ""
 
 #. Description
-#: ../templates.master:60
+#: ../templates.master:55
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
 msgstr ""
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid "ssh2 keys merged in configuration files"
 msgstr ""
 
 #. Description
-#: ../templates.master:74
+#: ../templates.master:69
 msgid ""
 "As of version 3 OpenSSH no longer uses separate files for ssh1 and ssh2 "
 "keys. This means the authorized_keys2 and known_hosts2 files are no longer "
@@ -150,12 +141,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid "Do you want to continue (and risk killing active ssh sessions) ?"
 msgstr ""
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "The version of /etc/init.d/ssh that you have installed, is likely to kill "
 "all running sshd instances.  If you are doing this upgrade via an ssh "
@@ -163,55 +154,55 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:83
+#: ../templates.master:78
 msgid ""
 "You can fix this by adding \"--pidfile /var/run/sshd.pid\" to the start-stop-"
 "daemon line in the stop section of the file."
 msgstr ""
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
 msgstr ""
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
 msgstr ""
 
 #. Description
-#: ../templates.master:93
+#: ../templates.master:88
 msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
 msgstr ""
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 
 #. Description
-#: ../templates.master:104
+#: ../templates.master:99
 msgid ""
 "having rsh-server installed undermines the security that you were probably "
 "wanting to obtain by installing ssh.  I'd advise you to remove that package."
 msgstr ""
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 
 #. Description
-#: ../templates.master:111
+#: ../templates.master:106
 msgid ""
 "I'd advise you to either remove the telnetd package (if you don't actually "
 "need to offer telnet access) or install telnetd-ssl so that there is at "
@@ -220,12 +211,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "Warning: you must create a new host key"
 msgstr ""
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid ""
 "There is an old /etc/ssh/ssh_host_key, which is IDEA encrypted. OpenSSH can "
 "not handle this host key file, and I can't find the ssh-keygen utility from "
@@ -233,55 +224,55 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:119
+#: ../templates.master:114
 msgid "You will need to generate a new host key."
 msgstr ""
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
 msgstr ""
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
 msgstr ""
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
 msgstr ""
 
 #. Description
-#: ../templates.master:129
+#: ../templates.master:124
 msgid ""
 "If in doubt, I suggest you install it with SUID.  If it causes problems you "
 "can change your mind later by running:   dpkg-reconfigure ssh"
 msgstr ""
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "Do you want to run the sshd server ?"
 msgstr ""
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr ""
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
 msgstr ""
 
 #. Description
-#: ../templates.master:142
+#: ../templates.master:137
 msgid ""
 "If you are only interested in using the ssh client for outbound connections "
 "on this machine, and don't want to log into it at all using ssh, then you "
@@ -289,12 +280,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "This version of OpenSSH disables the environment option for public keys by "
 "default, in order to avoid certain attacks (for example, LD_PRELOAD). If you "
@@ -303,7 +294,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../templates.master:154
+#: ../templates.master:149
 msgid ""
 "To re-enable this option, set \"PermitUserEnvironment yes\" in /etc/ssh/"
 "sshd_config after the upgrade is complete, taking note of the warning in the "
diff --git a/debian/postinst b/debian/postinst
index 292023999..af0f8a21c 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -71,7 +71,7 @@ create_sshdconfig() {
 
         cat <<EOF > /etc/ssh/sshd_config
 # Package generated configuration file
-# See the sshd(8) manpage for defails
+# See the sshd(8) manpage for details
 
 # What ports, IPs and protocols we listen for
 Port 22
diff --git a/debian/templates b/debian/templates
index 738a91bed..41507ecaf 100644
--- a/debian/templates
+++ b/debian/templates
@@ -12,10 +12,6 @@ Description: Privilege separation
  Privilege separation is turned on by default, so if you decide you want it
  turned off, you need to add "UsePrivilegeSeparation no" to
  /etc/ssh/sshd_config.
- .
- NB! If you are running a 2.0 series Linux kernel, then privilege
- separation will not work at all, and your sshd will fail to start unless
- you explicitly turn privilege separation off.
 Description-es: Separación de privilegios
  Esta versión de OpenSSH incluye una nueva opción de separación de
  privilegios que reduce significativamente la cantidad de código que se
@@ -30,9 +26,6 @@ Description-es: Separación de privilegios
  La separación de privilegios está activa por defecto, por lo que si decide
  desactivarla, tiene que añadir "UsePrivilegeSeparation no" al fichero
  /etc/ssh/sshd_config.
- .
- Nota: Si utiliza un núcleo Linux 2.0, la separación de privilegios fallará
- estrepitosamente y sshd no funcionará a no ser que la desactive.
 Description-fr: Séparation des privilèges
  Cette version d'OpenSSH est livrée avec la nouvelle option de séparation
  des privilèges. Cela réduit de manière significative la quantité de code
@@ -47,10 +40,6 @@ Description-fr: Séparation des privilèges
  La séparation des privilèges est activée par défaut ; si vous souhaitez la
  désactiver, vous devez ajouter « UsePrivilegeSeparation no » dans
  /etc/ssh/sshd_config.
- .
- N. B. ! Si vous avez un noyau Linux de la série des 2.0, la séparation des
- privilèges ne fonctionne pas, et votre démon sshd ne se lancera que si
- vous avez explicitement désactivé la séparation des privilèges.
 Description-ja: Æø¢¤ÎʬΥ
  ËܥС¼¥¸¥ç¥ó¤Î OpenSSH ¤Ï¡¢¿·¤·¤¤Æø¢Ê¬Î¥¥ª¥×¥·¥ç¥ó¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
  ¤³¤ì¤Ë¤è¤Ã¤Æ¡¢root ¸¢¸Â¤Ç¼Â¹Ô¤µ¤ì¤ë¥³¡¼¥É¤ÎÎ̤òÂçÉý¤Ë¸º¤é¤¹¤³¤È¤¬
@@ -63,10 +52,6 @@ Description-ja: Æø¢¤ÎʬΥ
  Æø¢Ê¬Î¥¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£Ìµ¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢
  /etc/ssh/sshd_conf ¤Ë¡ÖUsePrivilegeSeparation no¡×¤È¤¤¤¦¹Ô¤òÄɲÃ
  ¤·¤Æ¤¯¤À¤µ¤¤¡£
- .
- Ãí°Õ! Linux ¥«¡¼¥Í¥ë¤Î¥Ð¡¼¥¸¥ç¥ó 2.0 ·ÏÎó¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢Æø¢
- ʬΥ¤ÏÁ´¤¯Æ°ºî¤·¤Þ¤»¤ó¡£ÌÀ¼¨Åª¤ËÆø¢Ê¬Î¥¤ò̵¸ú¤Ë¤·¤Ê¤¤¸Â¤ê¡¢sshd
- ¤Ïµ¯Æ°¤Ë¼ºÇÔ¤·¤Þ¤¹¡£
 Description-pl: Separacja uprawnieñ
  Ta wersja OpenSSH zawiera now± opcjê separacji uprawnieñ. Znacz±co
  zmniejsza ona ilo¶æ kodu, który jest uruchamiany jako root i co za tym
@@ -80,10 +65,6 @@ Description-pl: Separacja uprawnieñ
  Separacja uprawnieñ jest domy¶lnie w³±czona, wiêc je¶li zdecydujesz siê j±
  wy³±czyæ, musisz dodaæ "UsePrivilegeSeparation no" do pliku
  /etc/ssh/sshd_config.
- .
- UWAGA! Je¿eli u¿ywasz j±dra Linux'a z serii 2.0, to separacja uprawnieñ w
- ogóle nie bêdzie dzia³aæ i sshd nie wystartuje dopóki w³asnorêcznie nie
- wy³±czysz separacji uprawnieñ w /etc/ssh/sshd_config.
 Description-pt_BR: Separação de Previlégios
  Esta versão do OpenSSH contém a nova opção de separação de privilégios.
  Esta opção reduz significativamente a quantidade de código que é executada
@@ -97,11 +78,6 @@ Description-pt_BR: Separação de Previlégios
  A separação de previlégios está habilitado por padrão, portanto caso você
  decida que deseja desabilitá-la você precisará adicionar a linha
  "UsePrivilegeSeparation no" ao arquivo /etc/ssh/sshd_config.
- .
- NB ! Caso você esteja executando um kernel Linux da séria 2.0 o recurso de
- separação de privilégios não funcionará e seu daemon sshd irá falhar ao
- iniciar a menos que você explicitamente desabilite o recurso de separação
- de privilégios.
 
 Template: ssh/privsep_ask
 Type: boolean
@@ -117,103 +93,8 @@ Description: Enable Privilege separation
  .
  Since you've opted to have me generate an sshd_config file for you, you
  can choose whether or not to have Privilege Separation turned on or not.
- Unless you are running 2.0 (in which case you *must* say no here or your
- sshd won't start at all) or know you need to use PAM features that won't
- work with this option, you should say yes here.
-Description-da: Aktiver Privilegie adskillelse
- Denne version af OpenSSH indeholder den nye privilegie adskillelses
- mulighed. Det reducerer markant mængden af kode der kører som root, og
- derfor reducerer det impakten på sikkerheds huller i sshd.
- .
- Desværre, arbejder det ikke godt sammen med PAM. Ethvert PAM session modul
- der skal køres som root (pam_mkhomedir, f.eks.) vil fejle, og PAM
- tastatur-interaktive autentifikationer vil ikke virke.
- .
- Siden du har bedt mig om at lave en sshd_config fil til dig, kan du vælge
- om du vil have privilegie adskillelse slået til eller ej. Medmindre du
- kører 2.0 (i hvilket tilfælde du *skal* sige nej her, ellers vil din sshd
- slet ikke starte) eller ved at du skal bruge PAM funktioner som ikke vil
- virke med dette tilvalg, skal du sige ja her.
-Description-es: Activar separación de privilegios
- Esta versión de OpenSSH incluye una nueva opción de separación de
- privilegios que reduce significativamente la cantidad de código que se
- ejecuta como root, por lo que reduce el impacto de posibles agujeros de
- seguridad en sshd.
- .
- Desafortunadamente, la separación de privilegios no funciona correctamente
- con PAM. Cualquier módulo PAM que necesite ejecutarse como root (como, por
- ejemplo, pam_mkhomedir) y la autentificación interactiva PAM con teclado
- no funcionarán.
- .
- Puesto que ha elegido crear automáticamente el fichero sshd_config, puede
- decidir ahora si quiere activar la opción de separación de privilegios. A
- menos que utilice la versión 2.0 (en cuyo caso debe responer no aquí o
- sshd no arrancará) o sepa que necesita usar ciertas características de PAM
- que funcionan con esta opción, debería responder sí a esta pregunta.
-Description-fr: Activer la séparation des privilèges
- Cette version d'OpenSSH est livrée avec la nouvelle option de séparation
- des privilèges. Cela réduit de manière significative la quantité de code
- s'exécutant en tant que super-utilisateur, et donc réduit l'impact des
- trous de sécurité dans sshd.
- .
- Malheureusement, la séparation des privilèges interagit mal avec PAM. Tous
- les modules de session PAM qui doivent être exécutés en tant que
- super-utilisateur (pam_mkhomedir, par exemple) ne s'exécuteront pas, et
- l'authentification interactive au clavier ne fonctionnera pas.
- .
- Comme vous souhaitez que je génère le fichier de configuration sshd_config
- à votre place, vous pouvez choisir d'activer ou non l'option de séparation
- des privilèges. Si vous utilisez un noyau 2.0 (dans ce cas vous *devez*
- désactiver cette option ou alors sshd ne se lancera pas) ou bien si vous
- avez besoin de fonctionnalités PAM, cela ne fonctionnera pas si cette
- option est activée, dans le cas contraire vous devriez l'activer.
-Description-ja: Æø¢Ê¬Î¥¤òÍ­¸ú¤Ë¤¹¤ë
- ËܥС¼¥¸¥ç¥ó¤Î OpenSSH ¤Ï¡¢¿·¤·¤¤Æø¢Ê¬Î¥¥ª¥×¥·¥ç¥ó¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
- ¤³¤ì¤Ë¤è¤Ã¤Æ¡¢root ¸¢¸Â¤Ç¼Â¹Ô¤µ¤ì¤ë¥³¡¼¥É¤ÎÎ̤òÂçÉý¤Ë¸º¤é¤¹¤³¤È¤¬
- ¤Ç¤­¡¢sshd ¤Î¥»¥­¥å¥ê¥Æ¥£¥Û¡¼¥ë¤Î±Æ¶Á¤ò¸º¤é¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
- .
- »ÄÇ°¤Ê¤³¤È¤Ë¡¢Æø¢Ê¬Î¥¤Ï PAM ¤Ë°­±Æ¶Á¤òÍ¿¤¨¤Þ¤¹¡£root ¤Ç¼Â¹Ô¤µ¤ì¤ë Á´¤Æ¤Î
- PAM ¥»¥Ã¥·¥ç¥ó¥â¥¸¥å¡¼¥ë (Î㤨¤Ð pam_mkhomedir) ¤ÏÆ°¤«¤Ê¤¯
- ¤Ê¤ê¤Þ¤¹¡£¤Þ¤¿¡¢PAM ¥­¡¼¥Ü¡¼¥ÉÂÐÏÃŪǧ¾Ú¤âÆ°ºî¤·¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
- .
- ¤¢¤Ê¤¿¤Ï sshd_config ¥Õ¥¡¥¤¥ë¤ò¼«Æ°À¸À®¤¹¤ë¤³¤È¤òÁªÂò¤·¤Þ¤·¤¿¤Î¤Ç¡¢
- ¤³¤³¤ÇÆø¢Ê¬Î¥¤òÍ­¸ú¤Ë¤¹¤ë¤«¤·¤Ê¤¤¤«¤òÁªÂò¤Ç¤­¤Þ¤¹¡£2.0 ·ÏÎó¤Î
- ¥«¡¼¥Í¥ë¤ò»È¤Ã¤Æ¤¤¤ë¤« (¤³¤Î¾ì¹ç¤Ë¤Ï¡Ö¤¤¤¤¤¨¡×¤òÁª¤Ð¤Ê¤¤¤È sshd
- ¤Ïµ¯Æ°¤¹¤é¤·¤Þ¤»¤ó)¡¢PAM ¤Îµ¡Ç½¤Î¤¦¤ÁÆø¢Ê¬Î¥¤È¶¦Â¸¤Ç¤­¤Ê¤¤µ¡Ç½¤ò
- »È¤¤¤¿¤¤¾ì¹ç°Ê³°¤Ï¡¢¡Ö¤Ï¤¤¡×¤òÁª¤Ö¤Ù¤­¤Ç¤¹¡£
-Description-pl: W³±czenie separacji uprawnieñ
- Ta wersja OpenSSH zawiera now± opcjê separacji uprawnieñ. Znacz±co
- zmniejsza ona ilo¶æ kodu, który jest uruchamiany jako root i co za tym
- idzie redukuje efekty luk bezpieczeñstwa w sshd.
- .
- Niestety separacja uprawnieñ ¼le reaguje z PAMem. Jakikolwiek modu³ sesji
- PAM, który musi byæ uruchamiany jako root (pam_mkhomedir, na przyk³ad)
- zawiedzie. Nie bêdzie dzia³aæ równie¿ interaktywna autentykacja z
- klawiatury (keyboard-interactive authentication).
- .
- Zdecydowa³e¶ siê na to abym wygenerowa³ dla ciebie plik sshd_config, i
- mo¿esz wybraæ czy chcesz w³±czyæ Separacjê Uprawnieñ, czy te¿ nie. Je¶li
- nie u¿ywasz j±dra z serii 2.0 (w którym to przypadku *musisz* odpowiedzieæ
- tutaj 'nie' albo sshd w ogóle nie ruszy) i je¶li nie musisz korzystaæ z
- mo¿liwo¶ci PAMa, które nie bêd± dzia³a³y z t± opcj±, powiniene¶
- odpowiedzieæ tutaj 'tak'.
-Description-pt_BR: Habilitar Separação de Privilégios
- Esta versão do OpenSSH contém a nova opção de separação de privilégios.
- Esta opção reduz significativamente a quantidade de código que é executada
- como root e portanto reduz o impacto de falhas de segurança no sshd.
- .
- Infelizmente, a separação de privilégios interage de maneira ruim com o
- PAM. Quaisquer módulos de sessão PAM que precisem ser executados como root
- (pam_mkhomedir, por exemplo) irão falhar e autenticação interativa com
- teclado do PAM não funcionará.
- .
- Uma vez que você optou por permitir que o debconf gere o arquivo
- sshd_config para você, é possível escolher se você deseja ter ou não o
- recurso de separação de privilégios habilitada. A menos que você esteja
- executando um kernel Linux da série 2.0 (neste caso você *deve* responder
- negativamente a esta pergunta ou seu daemon sshd não será iniciado) ou
- saiba que você precisa utilizar recursos do PAM que não funcionam com esta
- opção habilitada você deve responder sim aqui.
+ Unless you know you need to use PAM features that won't work with this
+ option, you should say yes here.
 
 Template: ssh/new_config
 Type: boolean
diff --git a/debian/templates.master b/debian/templates.master
index 3f0ccd079..a4005fd38 100644
--- a/debian/templates.master
+++ b/debian/templates.master
@@ -12,10 +12,6 @@ _Description: Privilege separation
  Privilege separation is turned on by default, so if you decide you want it
  turned off, you need to add "UsePrivilegeSeparation no" to
  /etc/ssh/sshd_config.
- .
- NB! If you are running a 2.0 series Linux kernel, then privilege
- separation will not work at all, and your sshd will fail to start unless
- you explicitly turn privilege separation off.
 
 Template: ssh/privsep_ask
 Type: boolean
@@ -31,9 +27,8 @@ _Description: Enable Privilege separation
  .
  Since you've opted to have me generate an sshd_config file for you, you
  can choose whether or not to have Privilege Separation turned on or not.
- Unless you are running 2.0 (in which case you *must* say no here or your
- sshd won't start at all) or know you need to use PAM features that won't
- work with this option, you should say yes here.
+ Unless you know you need to use PAM features that won't work with this
+ option, you should say yes here.
 
 Template: ssh/new_config
 Type: boolean
diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 641ce721e..6508c9e47 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -27,10 +27,34 @@
 RCSID("$OpenBSD: monitor_fdpass.c,v 1.4 2002/06/26 14:50:04 deraadt Exp $");
 
 #include <sys/uio.h>
+#include <sys/utsname.h>
 
 #include "log.h"
 #include "monitor_fdpass.h"
 
+static int
+cmsg_type_is_broken(void)
+{
+        static int broken_cmsg_type = -1;
+
+        if (broken_cmsg_type != -1)
+                return broken_cmsg_type;
+        else {
+                struct utsname uts;
+                /* If uname() fails, play safe and assume that cmsg_type
+                 * isn't broken.
+                 */
+                if (!uname(&uts) &&
+                    strcmp(uts.sysname, "Linux") == 0 &&
+                    strncmp(uts.release, "2.0.", 4) == 0)
+                        broken_cmsg_type = 1;
+                else
+                        broken_cmsg_type = 0;
+        }
+
+        return broken_cmsg_type;
+}
+
 void
 mm_send_fd(int socket, int fd)
 {
@@ -113,7 +137,7 @@ mm_receive_fd(int socket)
                 fatal("%s: no fd", __func__);
 #else
         cmsg = CMSG_FIRSTHDR(&msg);
-        if (cmsg->cmsg_type != SCM_RIGHTS)
+        if (!cmsg_type_is_broken() && cmsg->cmsg_type != SCM_RIGHTS)
                 fatal("%s: expected type %d got %d", __func__,
                     SCM_RIGHTS, cmsg->cmsg_type);
         fd = (*(int *)CMSG_DATA(cmsg));
diff --git a/readconf.c b/readconf.c
index 18f7dae8a..899ff3f0e 100644
--- a/readconf.c
+++ b/readconf.c
@@ -286,6 +286,13 @@ process_config_line(Options *options, const char *host,
         u_short fwd_port, fwd_host_port;
         char sfwd_host_port[6];
 
+        /* Strip trailing whitespace */
+        for(len = strlen(line) - 1; len > 0; len--) {
+                if (strchr(WHITESPACE, line[len]) == NULL)
+                        break;
+                line[len] = '\0';
+        }
+
         s = line;
         /* Get the keyword. (Each line is supposed to begin with a keyword). */
         keyword = strdelim(&s);