Privilege separation and PAM are now properly supported together, so remove

both debconf questions related to them and simply set it unconditionally in
newly generated sshd_config files (closes: #228838).

1 files changed, 84 insertions, 102 deletions

diff --git a/debian/po/pl.po b/debian/po/pl.po
index 2464c65f9..939abcc42 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-11-15 15:36+0000\n"
+"POT-Creation-Date: 2004-03-06 17:54+0000\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"
@@ -24,81 +24,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: note
-#. Description
-#: ../templates.master:3
-msgid "Privilege separation"
-msgstr "Separacja uprawnień"
-
-#. Type: note
-#. Description
-#: ../templates.master:3
-msgid ""
-"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."
-msgstr ""
-"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."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:19
-msgid "Enable Privilege separation"
-msgstr "Włączenie separacji uprawnień"
-
-#. Type: boolean
-#. Description
-#: ../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 "
-"reduces the impact of security holes in sshd."
-msgstr ""
-"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."
-
-#. Type: boolean
-#. Description
-#: ../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 "
-"fail, and PAM keyboard-interactive authentication won't work."
-msgstr ""
-"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)."
-
 #. Type: boolean
 #. Description
-#: ../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 know you need to use PAM features that won't work with this option, you "
-"should enable it."
-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 "
-"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'."
-
-#. Type: boolean
-#. Description
-#: ../templates.master:36
+#: ../templates.master:4
 msgid "Generate new configuration file"
 msgstr "Wygeneruj nowy plik konfiguracyjny"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:36
+#: ../templates.master:4
 msgid ""
 "This version of OpenSSH has a considerably changed configuration file from "
 "the version shipped in Debian 'Potato', which you appear to be upgrading "
@@ -114,7 +48,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:36
+#: ../templates.master:4
 msgid ""
 "Please note that this new configuration file will set the value of "
 "'PermitRootLogin' to yes (meaning that anyone knowing the root password can "
@@ -131,7 +65,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:36
+#: ../templates.master:4
 msgid ""
 "It is strongly recommended that you let me generate a new configuration file "
 "for you."
@@ -140,13 +74,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:55
+#: ../templates.master:23
 msgid "Allow SSH protocol 2 only"
 msgstr "Zezwalaj wyłącznie na wersję 2 protokołu SSH"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:55
+#: ../templates.master:23
 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 +94,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:55
+#: ../templates.master:23
 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."
@@ -171,7 +105,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:55
+#: ../templates.master:23
 msgid ""
 "If you later change your mind about this setting, README.Debian has "
 "instructions on what to do to your sshd_config file."
@@ -181,13 +115,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:69
+#: ../templates.master:37
 msgid "ssh2 keys merged in configuration files"
 msgstr "klucze ssh2 włączone do plików konfiguracyjnych"
 
 #. Type: note
 #. Description
-#: ../templates.master:69
+#: ../templates.master:37
 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,14 +133,14 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:78
+#: ../templates.master:46
 #, fuzzy
 msgid "Do you want to continue (and risk killing active ssh sessions)?"
 msgstr "Czy chcesz kontynuować (i ryzykować zabicie aktywnych sesji ssh) ?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:78
+#: ../templates.master:46
 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 "
@@ -218,7 +152,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:78
+#: ../templates.master:46
 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,14 +162,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:88
+#: ../templates.master:56
 msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
 msgstr ""
 "UWAGA: Przekazywanie (forwarding) X11 i Autoryzacji jest domyślnie wyłączone."
 
 #. Type: note
 #. Description
-#: ../templates.master:88
+#: ../templates.master:56
 msgid ""
 "For security reasons, the Debian version of ssh has ForwardX11 and "
 "ForwardAgent set to ``off'' by default."
@@ -245,7 +179,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:88
+#: ../templates.master:56
 msgid ""
 "You can enable it for servers you trust, either in one of the configuration "
 "files, or with the -X command line option."
@@ -255,20 +189,20 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:88
+#: ../templates.master:56
 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."
 
 #. Type: note
 #. Description
-#: ../templates.master:99
+#: ../templates.master:67
 msgid "Warning: rsh-server is installed --- probably not a good idea"
 msgstr ""
 "Uwaga: serwer rsh jest zainstalowany --- prawdopodobnie nienajlepszy pomysł"
 
 #. Type: note
 #. Description
-#: ../templates.master:99
+#: ../templates.master:67
 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."
@@ -279,14 +213,14 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:106
+#: ../templates.master:74
 msgid "Warning: telnetd is installed --- probably not a good idea"
 msgstr ""
 "Uwaga: telnetd jest zainstalowany --- prawdopodobnie nienajlepszy pomysł"
 
 #. Type: note
 #. Description
-#: ../templates.master:106
+#: ../templates.master:74
 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 "
@@ -300,13 +234,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:114
+#: ../templates.master:82
 msgid "Warning: you must create a new host key"
 msgstr "Uwaga: musisz utworzyć nowy klucz hosta"
 
 #. Type: note
 #. Description
-#: ../templates.master:114
+#: ../templates.master:82
 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 "
@@ -318,19 +252,19 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:114
+#: ../templates.master:82
 msgid "You will need to generate a new host key."
 msgstr "Będziesz musiał wygenerować nowy klucz hosta."
 
 #. Type: boolean
 #. Description
-#: ../templates.master:124
+#: ../templates.master:92
 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?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:124
+#: ../templates.master:92
 msgid ""
 "You have the option of installing the ssh-keysign helper with the SUID bit "
 "set."
@@ -340,7 +274,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:124
+#: ../templates.master:92
 msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
@@ -350,7 +284,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:124
+#: ../templates.master:92
 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"
@@ -361,20 +295,20 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:137
+#: ../templates.master:105
 #, fuzzy
 msgid "Do you want to run the sshd server?"
 msgstr "Czy chcesz uruchamiać serwer sshd ?"
 
 #. Type: boolean
 #. Description
-#: ../templates.master:137
+#: ../templates.master:105
 msgid "This package contains both the ssh client, and the sshd server."
 msgstr "Ten pakiet zawiera zarówno klienta ssh, jak i serwer sshd."
 
 #. Type: boolean
 #. Description
-#: ../templates.master:137
+#: ../templates.master:105
 msgid ""
 "Normally the sshd Secure Shell Server will be run to allow remote logins via "
 "ssh."
@@ -384,7 +318,7 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates.master:137
+#: ../templates.master:105
 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 "
@@ -396,13 +330,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:149
+#: ../templates.master:117
 msgid "Environment options on keys have been deprecated"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:149
+#: ../templates.master:117
 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 "
@@ -412,13 +346,61 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates.master:149
+#: ../templates.master:117
 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 "Privilege separation"
+#~ msgstr "Separacja uprawnień"
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "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."
+
+#~ msgid "Enable Privilege separation"
+#~ msgstr "Włączenie separacji uprawnień"
+
+#~ msgid ""
+#~ "This version of OpenSSH contains the new privilege separation option. "
+#~ "This significantly reduces the quantity of code that runs as root, and "
+#~ "therefore reduces the impact of security holes in sshd."
+#~ msgstr ""
+#~ "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."
+
+#~ msgid ""
+#~ "Unfortunately, privilege separation interacts badly with PAM. Any PAM "
+#~ "session modules that need to run as root (pam_mkhomedir, for example) "
+#~ "will fail, and PAM keyboard-interactive authentication won't work."
+#~ msgstr ""
+#~ "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)."
+
+#, 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 know you need to use PAM features that won't work with this "
+#~ "option, you should enable it."
+#~ 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 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'."
+
 #~ 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 "