Merge from branch-V_3_6_1_P2-7-unstable:

  cvs up -jV_3_6_1_P2-10 -jV_3_6_1_P2-12

8 files changed, 881 insertions, 31 deletions

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index a1ad34a8d..a1c0a9234 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -38,7 +38,7 @@ if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
   exit 1
 fi
 
-{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys"
+{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1
 
 cat <<EOF
 Now try logging into the machine, with "ssh '$1'", and check in:
diff --git a/debian/changelog b/debian/changelog
index 0f4269038..f32d19477 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,26 @@ openssh (1:3.7.1p2-1) UNRELEASED; urgency=low
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 23 Sep 2003 19:22:38 +0100
 
+openssh (1:3.6.1p2-12) unstable; urgency=low
+
+  * Update Spanish debconf template translation (thanks, Javier
+    Fernández-Sanguino Peña; closes: #228242).
+  * Add debconf template translations:
+    - Czech (thanks, Miroslav Kure; closes: #230110).
+    - Simplified Chinese (thanks, Hiei Xu; closes: #230726).
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 11 Feb 2004 09:37:57 +0000
+
+openssh (1:3.6.1p2-11) unstable; urgency=low
+
+  * Comment out pam_limits in default configuration, for now at least
+    (closes: #198254).
+  * Use invoke-rc.d (if it exists) to run the init script.
+  * Backport format string bug fix in sshconnect.c (closes: #225238).
+  * ssh-copy-id exits if ssh fails (closes: #215252).
+
+ -- Colin Watson <cjwatson@debian.org>  Sun,  4 Jan 2004 18:59:21 +0000
+
 openssh (1:3.6.1p2-10) unstable; urgency=low
 
   * Use --retry in init script when restarting rather than sleeping, to make
diff --git a/debian/po/cs.po b/debian/po/cs.po
new file mode 100644
index 000000000..c5229040e
--- /dev/null
+++ b/debian/po/cs.po
@@ -0,0 +1,408 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openssh\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-11-15 15:36+0000\n"
+"PO-Revision-Date: 2004-01-28 15:10+0100\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <provoz@debian.cz>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates.master:3
+msgid "Privilege separation"
+msgstr "Odd�len� privilegi�"
+
+#. 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 ""
+"Odd�len� privilegi� je standardn� zapnuto. Pokud se rozhodnete jej vypnout, "
+"mus�te do /etc/ssh/sshd_config p�idat ��dek \"UsePrivilegeSeparation no\"."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:19
+msgid "Enable Privilege separation"
+msgstr "Povolit odd�len� privilegi�"
+
+#. 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 ""
+"Tato verze OpenSSH obsahuje novou volbu odd�len� privilegi�, ��m� se zna�n� "
+"sni�uje mno�stv� k�du, kter� b�� s pr�vy u�ivatele root, a t�m p�dem "
+"zmen�uje dopad bezpe�nostn�ch d�r v 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 ""
+"Bohu�el, odd�len� privilegi� se �patn� sn�� se syst�mem PAM. Libovoln� PAM "
+"session modul, kter� mus� b�t spu�t�n jako root (nap�. pam_mkhomedir), sel�e "
+"a tak� nebude fungovat autentizace vyu��vaj�c� kl�vesnici."
+
+#. Type: boolean
+#. Description
+#: ../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 know you need to use PAM features that won't work with this option, you "
+"should enable it."
+msgstr ""
+"Proto�e jste se rozhodli, abych vytvo�il soubor sshd_config, m��ete si "
+"vybrat, jestli chcete povolit nebo zak�zat odd�len� privilegi�. Pokud si "
+"nejste jist�, �e pot�ebujete pou��vat PAM moduly, kter� s touto volbou "
+"nebudou fungovat, m�li byste odd�len� privilegi� povolit."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:36
+msgid "Generate new configuration file"
+msgstr "Generovat nov� konfigura�n� soubor"
+
+#. Type: boolean
+#. Description
+#: ../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 "
+"from. I can now generate you a new configuration file (/etc/ssh/sshd."
+"config), which will work with the new server version, but will not contain "
+"any customisations you made with the old version."
+msgstr ""
+"Tato verze OpenSSH m� oproti verzi dod�van� s Debianem 2.2, kterou nyn� "
+"pravd�podobn� aktualizujete, zna�n� odli�n� konfigura�n� soubor. Nyn� mohu "
+"vytvo�it nov� konfigura�n� soubor (/etc/ssh/sshd.config), kter� bude "
+"pracovat s novou verz�, ale nebude obsahovat ��dn� �pravy, kter� jste "
+"provedli ve star� verzi."
+
+#. Type: boolean
+#. Description
+#: ../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 "
+"ssh directly in as root). It is the opinion of the maintainer that this is "
+"the correct default (see README.Debian for more details), but you can always "
+"edit sshd_config and set it to no if you wish."
+msgstr ""
+"V nov�m konfigura�n�m souboru bude parametr PermitRootLogin nastaven na "
+"hodnotu 'yes'. To znamen�, �e se kdokoliv se znalost� rootova hesla m��e "
+"p�ihl�sit rovnou jako root. Pokud se chcete vr�tit ke star�mu chov�n�, sta�� "
+"v sshd_config nastavit tento parametr na hodnotu 'no'. V�ce v README.Debian."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:36
+msgid ""
+"It is strongly recommended that you let me generate a new configuration file "
+"for you."
+msgstr "Je v�ele doporu�eno nechat m� vyrobit konfigura�n� soubor."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:55
+msgid "Allow SSH protocol 2 only"
+msgstr "Povolit pouze SSH protokol verze 2"
+
+#. Type: boolean
+#. Description
+#: ../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 "
+"things down on low end machines and might prevent older clients from "
+"connecting (the ssh client shipped with \"potato\" is affected)."
+msgstr ""
+"Tato verze OpenSSH podporuje ssh protokol ve verzi 2, kter� je mnohem "
+"bezpe�n�j��. Je dobr� ssh verze 1 zak�zat, nicm�n� na slab��ch po��ta��ch se "
+"projev� zpomalen� a tak� t�m znemo�n�te p�ihl�en� star��ch klient� "
+"(nap��klad t�ch z Debianu 2.2)."
+
+#. Type: boolean
+#. Description
+#: ../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 ""
+"Tak� si v�imn�te, �e kl��e protokolu verze 1 jsou odli�n� a pokud povol�te "
+"pouze protokol verze 2, nebudete je moci pou��t. "
+
+#. Type: boolean
+#. Description
+#: ../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 ""
+"Pokud se pozd�ji rozhodnete jinak, v README.Debian se nach�z� p�esn� n�vod, "
+"jak upravit soubor sshd_config."
+
+#. Type: note
+#. Description
+#: ../templates.master:69
+msgid "ssh2 keys merged in configuration files"
+msgstr "Kl��e ssh2 v konfigura�n�ch souborech byly spojeny"
+
+#. Type: note
+#. Description
+#: ../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 "
+"needed. They will still be read in order to maintain backwards compatibility"
+msgstr ""
+"OpenSSH verze 3 ji� nepou��v� odd�len� soubory pro kl��e verze ssh1 a ssh2. "
+"To znamen�, �e soubory authorized_keys2 a known_hosts2 ji� nejsou pot�eba, "
+"ov�em z d�vod� zachov�n� zp�tn� kompatibility jsou st�le na��t�ny."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:78
+msgid "Do you want to continue (and risk killing active ssh sessions)?"
+msgstr "Chcete pokra�ovat (a riskovat ukon�en� aktivn�ch ssh spojen�)?"
+
+#. Type: boolean
+#. Description
+#: ../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 "
+"session, that would be a Bad Thing(tm)."
+msgstr ""
+"St�vaj�c� verze /etc/init.d/ssh pravd�padobn� pozab�j� v�echny b��c� "
+"instance sshd. Pokud tuto aktualizaci prov�d�te p�es ssh, byla by to �patn� "
+"V�c(tm)."
+
+#. Type: boolean
+#. Description
+#: ../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 ""
+"M��ete to spravit p�id�n�m \"--pidfile /var/run/sshd.pid\" do sekce stop na "
+"��dek se start-stop-daemon."
+
+#. Type: note
+#. Description
+#: ../templates.master:88
+msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
+msgstr "POZN�MKA: Autorizace a p�esm�rov�n� X11 je standardn� vypnuto."
+
+#. Type: note
+#. Description
+#: ../templates.master:88
+msgid ""
+"For security reasons, the Debian version of ssh has ForwardX11 and "
+"ForwardAgent set to ``off'' by default."
+msgstr ""
+"Z bezpe�nostn�ch d�vod� m� verze ssh v Debianu standardn� nastaven� "
+"ForwardX11 a ForwardAgent na hodnotu \"off\"."
+
+#. Type: note
+#. Description
+#: ../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 ""
+"Pro servery, kter�m d�v��ujete, m��ete tyto parametry povolit v jednom z "
+"konfigura�n�ch soubor�, nebo z p��kazov� ��dky parametrem -X."
+
+#. Type: note
+#. Description
+#: ../templates.master:88
+msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
+msgstr "V�ce naleznete v /usr/share/doc/ssh/README.Debian"
+
+#. Type: note
+#. Description
+#: ../templates.master:99
+msgid "Warning: rsh-server is installed --- probably not a good idea"
+msgstr "Varov�n�: je nainstalov�n rsh-server --- to nen� dobr� n�pad"
+
+#. Type: note
+#. Description
+#: ../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 ""
+"nainstalov�n�m rsh-server si bour�te bezpe�nost, kterou jste pravd�podobn� "
+"cht�li dos�hnout instalac� ssh. Doporu�ujeme tento bal�k odstranit."
+
+#. Type: note
+#. Description
+#: ../templates.master:106
+msgid "Warning: telnetd is installed --- probably not a good idea"
+msgstr "Varov�n�: je nainstalov�n telnetd --- to nen� dobr� n�pad"
+
+#. Type: note
+#. Description
+#: ../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 "
+"least some chance that telnet sessions will not be sending unencrypted login/"
+"password and session information over the network."
+msgstr ""
+"Doporu�ujeme bu� odstranit bal�k telnetd (pokud telnet p��stup "
+"nepot�ebujete), nebo nainstalovat telnetd-ssl, kde je alespo� n�jak� �ance, "
+"�e spojen� nebudou po s�ti zas�lat neza�ifrovan� jm�na/hesla/informace."
+
+#. Type: note
+#. Description
+#: ../templates.master:114
+msgid "Warning: you must create a new host key"
+msgstr "Varov�n�: mus�te vytvo�it nov� serverov� kl��"
+
+#. Type: note
+#. Description
+#: ../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 "
+"the old (non-free) SSH installation."
+msgstr ""
+"V /etc/ssh/ssh_host_key se nach�z� star� kl�� �ifrovan� algoritmem IDEA. "
+"OpenSSH neum� tento soubor zpracovat a nemohu naj�t utilitu ssh-keygen ze "
+"star� (nesvobodn�) instalace SSH."
+
+#. Type: note
+#. Description
+#: ../templates.master:114
+msgid "You will need to generate a new host key."
+msgstr "Mus�te vygenerovat nov� serverov� kl��"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:124
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "Chcete /usr/lib/ssh-keysign nainstalovat jako SUID root?"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:124
+msgid ""
+"You have the option of installing the ssh-keysign helper with the SUID bit "
+"set."
+msgstr ""
+"M��ete si vybrat, zda chcete nainstalovat ssh-keysign s nastaven�m SUID "
+"bitem."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:124
+msgid ""
+"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
+"based authentication."
+msgstr ""
+"Pokud nastav�te ssh-keysign SUID, m��ete pou��vat 'host-based' autentizaci "
+"protokolu verze 2."
+
+#. Type: boolean
+#. Description
+#: ../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 ""
+"Pokud jste na pochyb�ch, doporu�ujeme SUID bit povolit. Pokud zaznamen�te "
+"probl�my, m��ete nastaven� zm�nit spu�t�n�m:   dpkg-reconfigure ssh"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:137
+msgid "Do you want to run the sshd server?"
+msgstr "Chcete spustit sshd server?"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:137
+msgid "This package contains both the ssh client, and the sshd server."
+msgstr "Tento bal�k obsahuje jak klienta ssh, tak server sshd."
+
+#. Type: boolean
+#. Description
+#: ../templates.master:137
+msgid ""
+"Normally the sshd Secure Shell Server will be run to allow remote logins via "
+"ssh."
+msgstr ""
+"Obvykle se sshd (Secure Shell Server) spou�t�, aby se vzd�len� u�ivatel� "
+"mohli p�ihla�ovat p�es ssh."
+
+#. Type: boolean
+#. Description
+#: ../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 "
+"can disable sshd here."
+msgstr ""
+"Pokud na tomto po��ta�i chcete vyu��vat pouze ssh klienta pro odchoz� "
+"spojen�, m��ete zde sshd zak�zat."
+
+#. Type: note
+#. Description
+#: ../templates.master:149
+msgid "Environment options on keys have been deprecated"
+msgstr "Volby prost�ed� spojen� s kl��i jsou zak�z�ny"
+
+#. Type: note
+#. Description
+#: ../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 "
+"are using this option in an authorized_keys file, beware that the keys in "
+"question will no longer work until the option is removed."
+msgstr ""
+"Pro zamezen� ur�it�ch typ� �tok� (nap�. LD_PRELOAD), tato verze OpenSSH "
+"standardn� zabra�uje pou��vat volbu prost�ed� u ve�ejn�ch kl���. Pokud tuto "
+"volbu pou��v�te v souboru authorized_keys, tak posti�en� kl��e nebudou "
+"fungovat, dokud jim tuto volbu nesma�ete."
+
+#. Type: note
+#. Description
+#: ../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 ""
+"Pro znovupovolen� t�to volby si po aktualizaci p�e�t�te varov�n� v manu�lov� "
+"str�nce sshd_config(5) a v souboru /etc/ssh/sshd_config zadejte "
+"\"PermitUserEnvironment yes\"."
diff --git a/debian/po/es.po b/debian/po/es.po
index f8cb11799..3fd16d4c2 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -1,25 +1,40 @@
 #
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
+# openssh debconf translation to spanish
+# Copyright (C) 2003 Software in the Public Interest
+# This file is distributed under the same license as the XXXX package.
+#
+# Changes:
+# - Initial translation
+#    Carlos Valdivia Yag�e <valyag@dat,etsit.upm.es>, 2003
+# - Revision
+#    Javier Fernandez-Sanguino Pe�a <jfs@computer.org>, 2004
+#
+#
+#  Traductores, si no conoce el formato PO, merece la pena leer la 
+#  documentaci�n de gettext, especialmente las secciones dedicadas a este
+#  formato, por ejemplo ejecutando:
 #         info -n '(gettext)PO Files'
 #         info -n '(gettext)Header Entry'
 #
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Equipo de traducci�n al espa�ol, por favor lean antes de traducir
+# los siguientes documentos:
+# 
+# - El proyecto de traducci�n de Debian al espa�ol
+#   http://www.debian.org/intl/spanish/coordinacion
+#   especialmente las notas de traducci�n en
+#   http://www.debian.org/intl/spanish/notas
 #
-#    Developers do not need to manually edit POT or PO files.
-#
-# Carlos Valdivia Yag�e <valyag@dat,etsit.upm.es>, 2003
+# - La gu�a de traducci�n de po's de debconf:
+#   /usr/share/doc/po-debconf/README-trans
+#   o http://www.debian.org/intl/l10n/po-debconf/README-trans
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openssh 3.6.1p2-9\n"
+"Project-Id-Version: openssh 3.6.1p2-11\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2003-11-15 15:36+0000\n"
-"PO-Revision-Date: 2003-09-20 16:40+0200\n"
-"Last-Translator: Carlos Valdivia Yag�e <valyag@dat.etsit.upm.es>\n"
+"PO-Revision-Date: 2004-01-17 17:47+0200\n"
+"Last-Translator: Javier Fernandez-Sanguino Pe�a <jfs@computer.org>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
@@ -40,7 +55,7 @@ msgid ""
 "sshd_config."
 msgstr ""
 "La separaci�n de privilegios est� activa por defecto, por lo que si decide "
-"desactivarla, tiene que a�adir \"UsePrivilegeSeparation no\" al fichero /etc/"
+"desactivarla, tiene que a�adir �UsePrivilegeSeparation no� al fichero /etc/"
 "ssh/sshd_config."
 
 #. Type: boolean
@@ -72,7 +87,7 @@ msgid ""
 msgstr ""
 "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 "
+"ejemplo, pam_mkhomedir) y la autenticaci�n interactiva PAM con teclado no "
 "funcionar�n."
 
 #. Type: boolean
@@ -106,7 +121,7 @@ msgid ""
 "any customisations you made with the old version."
 msgstr ""
 "Esta versi�n de OpenSSH tiene un fichero de configuraci�n considerablemente "
-"diferente del incluido en Debian Potato, que es la versi�n desde la que "
+"diferente del incluido en Debian 'Potato', que es la versi�n desde la que "
 "parece estar actualizando. Puede crear autom�ticamente un nuevo fichero de "
 "configuraci�n (/etc/ssh/sshd_config), que funcionar� con la nueva versi�n "
 "del servidor, pero no incuir� las modificaciones que hiciera en la versi�n "
@@ -123,7 +138,7 @@ msgid ""
 "edit sshd_config and set it to no if you wish."
 msgstr ""
 "Adem�s, recuerde que este nuevo fichero de configuraci�n dir� s� en la "
-"opci�n 'PermitRootLogin', por lo que cualquiera que conozca la contrase�a de "
+"opci�n �PermitRootLogin�, por lo que cualquiera que conozca la contrase�a de "
 "root podr� entrar mediante ssh directamente como root. En opini�n del "
 "mantenedor �sta es la opci�n predeterminada m�s adecuada (puede leer README."
 "Debian si quiere conocer m�s detalles), pero siempre puede editar "
@@ -157,7 +172,7 @@ msgstr ""
 "Esta versi�n de OpenSSH soporta la versi�n 2 del protocolo ssh, que es mucho "
 "m�s segura que la anterior. Se recomienda desactivar la versi�n 1, aunque "
 "funcionar� m�s lento en m�quinas modestas y puede impedir que se conecten "
-"clientes antiguos, como, por ejemplo, el incluido en \"potato\"."
+"clientes antiguos, como, por ejemplo, el incluido en �potato�."
 
 #. Type: boolean
 #. Description
@@ -224,7 +239,7 @@ 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 ""
-"Puede arreglarlo a�adiendo \"--pidfile /var/run/sshd.pid\" a la l�nea 'start-"
+"Puede arreglarlo a�adiendo �--pidfile /var/run/sshd.pid� a la l�nea 'start-"
 "stop-daemon', en la secci�n 'stop' del fichero."
 
 #. Type: note
@@ -263,7 +278,8 @@ msgstr "Puede encontrar m�s detalles en /usr/share/doc/ssh/README.Debian."
 #. Description
 #: ../templates.master:99
 msgid "Warning: rsh-server is installed --- probably not a good idea"
-msgstr "Aviso: tiene rsh-server instalado"
+msgstr ""
+"Aviso: tiene rsh-server instalado (seguramente, esto no es una buena idea)"
 
 #. Type: note
 #. Description
@@ -280,7 +296,7 @@ msgstr ""
 #. Description
 #: ../templates.master:106
 msgid "Warning: telnetd is installed --- probably not a good idea"
-msgstr "Aviso: tiene telnetd instalado"
+msgstr "Aviso: tiene telnetd instalado (posiblemente no es una buena idea)"
 
 #. Type: note
 #. Description
@@ -343,8 +359,8 @@ msgid ""
 "If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
 "based authentication."
 msgstr ""
-"Si hace ssh-keysign SUID, podr� usar la autentificiaci�n basada en servidor "
-"de la versi�n 2 del protocolo SSH."
+"Si hace ssh-keysign SUID, podr� usar la autenticaci�n basada en servidor de "
+"la versi�n 2 del protocolo SSH."
 
 #. Type: boolean
 #. Description
@@ -418,7 +434,7 @@ msgid ""
 "sshd_config after the upgrade is complete, taking note of the warning in the "
 "sshd_config(5) manual page."
 msgstr ""
-"Para volver a activar esta opci�n, escriba \"PermitUserEnvironment yes\" en /"
+"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)."
 
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
new file mode 100644
index 000000000..965cb6c9c
--- /dev/null
+++ b/debian/po/zh_CN.po
@@ -0,0 +1,393 @@
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openssh 3.6.1p2-11\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-11-15 15:36+0000\n"
+"PO-Revision-Date: 2004-02-02 18:48+1300\n"
+"Last-Translator: Hiei Xu <nicky@mail.edu.cn>\n"
+"Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates.master:3
+msgid "Privilege separation"
+msgstr "权限分离"
+
+#. 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 ""
+"权限分离选项是默认打开的。如果想要关闭此选项，您需要在 /etc/ssh/sshd_config "
+"文件中添加一行“UsePrivilegeSeparation no”。"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:19
+msgid "Enable Privilege separation"
+msgstr "启用权限分离"
+
+#. 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 ""
+"这个版本的 OpenSSH 包含了一个新的权限分离的选项，目的是为了减少以 root 运行的"
+"代码数目，进而减少了 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 ""
+"不幸的是，权限分离和 PAM 同时使用会很糟糕。任何需要以 root 运行的 PAM 会话模"
+"块 (如 pam_mkhomedir) 都会失败，而且 PAM 键盘交互式认证都不起作用。"
+
+#. Type: boolean
+#. Description
+#: ../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 know you need to use PAM features that won't work with this option, you "
+"should enable it."
+msgstr ""
+"因为您选择了让我为您生成 sshd_config 文件，您可以选择是否打开权限分离选项。除"
+"非您知道需要使用 PAM 这个不能和权限分离同时工作的功能，否则就应该启用它。"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:36
+msgid "Generate new configuration file"
+msgstr "生成新的配置文件"
+
+#. Type: boolean
+#. Description
+#: ../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 "
+"from. I can now generate you a new configuration file (/etc/ssh/sshd."
+"config), which will work with the new server version, but will not contain "
+"any customisations you made with the old version."
+msgstr ""
+"看来您正在从 Debian “Potato”升级，当前版本和 Debian “Potato”所带的 OpenSSH 版"
+"本的配置文件对比有了相当多的改变。我现在可以生成适用于新服务器版本的新配置文"
+"件 (/etc/ssh/sshd_config)，但是它不会保留您为旧版本定制的任何配置。"
+
+#. Type: boolean
+#. Description
+#: ../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 "
+"ssh directly in as root). It is the opinion of the maintainer that this is "
+"the correct default (see README.Debian for more details), but you can always "
+"edit sshd_config and set it to no if you wish."
+msgstr ""
+"请注意新的配置文件将会把“PermitRootLogin”的值设置为 yes，(这意味着任何一个知"
+"道 root 密码的人都可以直接以 root 登录)。维护者认为这是一个正确的默认值 (详情"
+"请阅读 README.Debian)，但如果您希望，也可以编辑 sshd_config 文件将其设置为 "
+"no。"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:36
+msgid ""
+"It is strongly recommended that you let me generate a new configuration file "
+"for you."
+msgstr "强烈建议让我为您生成一份新的配置文件。"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:55
+msgid "Allow SSH protocol 2 only"
+msgstr "只允许 SSH 协议 2 (ssh2)。"
+
+#. Type: boolean
+#. Description
+#: ../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 "
+"things down on low end machines and might prevent older clients from "
+"connecting (the ssh client shipped with \"potato\" is affected)."
+msgstr ""
+"这个版本的 OpenSSH 支持更加安全的第二版本 ssh 协议。我们鼓励您禁用 ssh 1，然"
+"而这会降低低端机器速度，并且会阻止老版客户端的连接(“potato”所带的 ssh 客户端"
+"会受到影响)。"
+
+#. Type: boolean
+#. Description
+#: ../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 ""
+"也请注意协议 1 所用的密钥是不同的，因此如果您只允许协议 2 连接将会导致不能使"
+"用它们。"
+
+#. Type: boolean
+#. Description
+#: ../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 ""
+"如果您稍后想改变这个设置，README.Debian 上有说明告诉您如何修改 sshd_Config 文"
+"件。"
+
+#. Type: note
+#. Description
+#: ../templates.master:69
+msgid "ssh2 keys merged in configuration files"
+msgstr "ssh2 密钥被合并到配置文件"
+
+#. Type: note
+#. Description
+#: ../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 "
+"needed. They will still be read in order to maintain backwards compatibility"
+msgstr ""
+"在 OpenSSH 第 3 版不再为 ssh1 和 ssh2 的密钥使用不同的文件。这意味着 "
+"authorized_keys2 和 known_hosts2 文件将不再需要。但为了保持向后兼容性，它们仍"
+"会被读取。"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:78
+msgid "Do you want to continue (and risk killing active ssh sessions)?"
+msgstr "您要继续吗(会有杀死活动的 ssh 会话的危险)？"
+
+#. Type: boolean
+#. Description
+#: ../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 "
+"session, that would be a Bad Thing(tm)."
+msgstr ""
+"您安装的 /etc/init.d/ssh 版本很可能会杀死所有运行中的 sshd 例程。如果您是在通"
+"过 ssh 会话进行这项升级，那可真是件糟糕的事情(tm)。"
+
+#. Type: boolean
+#. Description
+#: ../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 ""
+"您可以通过添加“--pidfile /var/run/sshd.pid”到这个文件的 stop 部分的 start-"
+"stop-daemon 行来修正这个问题。"
+
+#. Type: note
+#. Description
+#: ../templates.master:88
+msgid "NOTE: Forwarding of X11 and Authorization disabled by default."
+msgstr "注意：X11 转发和认证默认被禁止。"
+
+#. Type: note
+#. Description
+#: ../templates.master:88
+msgid ""
+"For security reasons, the Debian version of ssh has ForwardX11 and "
+"ForwardAgent set to ``off'' by default."
+msgstr ""
+"因为安全性原因，默认情况下 Debian 版本的 ssh 将 ForwardX11 和 ForwardAgent 设"
+"置为 off。"
+
+#. Type: note
+#. Description
+#: ../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 ""
+"您可以为信赖的服务器启用这个选项，可以通过其中之一的配置文件或者使用 -X 命令"
+"行选项来实现。"
+
+#. Type: note
+#. Description
+#: ../templates.master:88
+msgid "More details can be found in /usr/share/doc/ssh/README.Debian"
+msgstr "更多细节可以在 /usr/share/doc/ssh/README.Debian 找到"
+
+#. Type: note
+#. Description
+#: ../templates.master:99
+msgid "Warning: rsh-server is installed --- probably not a good idea"
+msgstr "警告：已经安装了 rsh 服务器 --- 可能不是个好主意"
+
+#. Type: note
+#. Description
+#: ../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 ""
+"安装 rsh 服务器很可能会降低您想要通过安装 ssh 得到的安全性。我建议您删除这个"
+"包。"
+
+#. Type: note
+#. Description
+#: ../templates.master:106
+msgid "Warning: telnetd is installed --- probably not a good idea"
+msgstr "警告：已经安装了 telnetd 服务器 --- 可能不是个好主意"
+
+#. Type: note
+#. Description
+#: ../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 "
+"least some chance that telnet sessions will not be sending unencrypted login/"
+"password and session information over the network."
+msgstr ""
+"我建议您删除 telnetd 包(如果您不是真的需要提供 telnet 访问)，或者安装 "
+"telnetd-ssl，这样至少有时候 telnet 会话不会将未加密的 登录名/密码 和会话信息"
+"通过网络发送。"
+
+#. Type: note
+#. Description
+#: ../templates.master:114
+msgid "Warning: you must create a new host key"
+msgstr "警告：您必须创建一个新的主机密钥"
+
+#. Type: note
+#. Description
+#: ../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 "
+"the old (non-free) SSH installation."
+msgstr ""
+"/etc/ssh/ssh_host_key 是由 IDEA 加密的旧密钥文件。OpenSSH 不能处理这种密钥文"
+"件，我也无法找到旧的(非自由的) SSH 安装所带的 ssh-keygen 密钥生成工具。"
+
+#. Type: note
+#. Description
+#: ../templates.master:114
+msgid "You will need to generate a new host key."
+msgstr "您需要创建一个新的主机密钥。"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:124
+msgid "Do you want /usr/lib/ssh-keysign to be installed SUID root?"
+msgstr "您要将 /usr/lib/ssh-keysign 安装为 SUID root 程序吗？"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:124
+msgid ""
+"You have the option of installing the ssh-keysign helper with the SUID bit "
+"set."
+msgstr "您使用为 ssh-keysign 帮助者程序设置 SUID 位的选项。"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:124
+msgid ""
+"If you make ssh-keysign SUID, you will be able to use SSH's Protocol 2 host-"
+"based authentication."
+msgstr ""
+"如果您为 ssh-keysign 设置了 SUID，您将可以使用 SSH 协议 2 的基于主机的认证方"
+"式。"
+
+#. Type: boolean
+#. Description
+#: ../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 ""
+"如果有疑问，我建议您将它安装为 SUID。如果它带来麻烦，您可以通过运行：dpkg-"
+"reconfigure ssh 来改变主意"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:137
+msgid "Do you want to run the sshd server?"
+msgstr "您要运行 sshd 服务器吗？"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:137
+msgid "This package contains both the ssh client, and the sshd server."
+msgstr "这个软件包内含 ssh 客户端和 sshd 服务器。"
+
+#. Type: boolean
+#. Description
+#: ../templates.master:137
+msgid ""
+"Normally the sshd Secure Shell Server will be run to allow remote logins via "
+"ssh."
+msgstr "通常 sshd 安全 Shell 服务器都会运行以便允许通过 ssh 进行远程登录。"
+
+#. Type: boolean
+#. Description
+#: ../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 "
+"can disable sshd here."
+msgstr ""
+"如果您只要在这台机器上使用 ssh 客户端对外连接，完全不想通过 ssh 登录到本机，"
+"那么您可以在这里禁用 sshd 服务器。"
+
+#. Type: note
+#. Description
+#: ../templates.master:149
+msgid "Environment options on keys have been deprecated"
+msgstr "密钥的环境选项已被废弃"
+
+#. Type: note
+#. Description
+#: ../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 "
+"are using this option in an authorized_keys file, beware that the keys in "
+"question will no longer work until the option is removed."
+msgstr ""
+"为了避免一些攻击(如 LD_PRELOAD)，这个版本的 OpenSSH 默认禁用了公钥上的环境选"
+"项。如果您在某个授权密钥(authorized_keys)文件中用了这个参数，请注意除非删除了"
+"此选项，否则这个可疑的密钥将不再起作用。"
+
+#. Type: note
+#. Description
+#: ../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 ""
+"要重新启用这个选项，升级完成后请在 /etc/ssh/sshd_config 中加入一"
+"行：“PermitUserEnvironment yes”。请注意 sshd_config(5) 手册页中提到的警告。"
diff --git a/debian/postinst b/debian/postinst
index af0f8a21c..f3d4cf6d5 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -289,7 +289,11 @@ fix_conffile_permissions() {
 setup_startup() {
         db_get ssh/run_sshd
         if [ "$RET" = "false" ] ; then
-                /etc/init.d/ssh stop 2>&1 >/dev/null
+                if [ -x /usr/sbin/invoke-rc.d ]; then
+                        invoke-rc.d --quiet ssh stop
+                else
+                        /etc/init.d/ssh stop
+                fi
                 touch /etc/ssh/sshd_not_to_be_run
         else
                 rm -f /etc/ssh/sshd_not_to_be_run 2>/dev/null
@@ -298,9 +302,13 @@ setup_startup() {
 
 
 setup_init() {
-        if [ -e /etc/init.d/ssh ]; then
+        if [ -x /etc/init.d/ssh ]; then
                 update-rc.d ssh defaults >/dev/null
-                /etc/init.d/ssh restart
+                if [ -x /usr/sbin/invoke-rc.d ]; then
+                        invoke-rc.d ssh restart
+                else
+                        /etc/init.d/ssh restart
+                fi
         fi
 }
 
diff --git a/debian/prerm b/debian/prerm
index 8ed7e07ec..5c1aa1351 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -20,8 +20,12 @@ case "$1" in
         update-alternatives --quiet --remove rsh /usr/bin/ssh
         update-alternatives --quiet --remove rlogin /usr/bin/slogin
         update-alternatives --quiet --remove rcp /usr/bin/scp
-        if [ -e /etc/init.d/ssh ]; then
-                /etc/init.d/ssh stop
+        if [ -x /etc/init.d/ssh ]; then
+                if [ -x /usr/sbin/invoke-rc.d ]; then
+                        invoke-rc.d ssh stop
+                else
+                        /etc/init.d/ssh stop
+                fi
         fi
 #       install-info --quiet --remove /usr/info/ssh-askpass.info.gz
         ;;
diff --git a/debian/ssh.pam b/debian/ssh.pam
index 8882053df..81c18371e 100644
--- a/debian/ssh.pam
+++ b/debian/ssh.pam
@@ -22,8 +22,9 @@ session    optional     pam_motd.so # [1]
 # Print the status of the user's mailbox upon successful login.
 session    optional     pam_mail.so standard noenv # [1]
 
-# Set up user limits from /etc/security/limits.conf.
-session    required     pam_limits.so
+# Set up user limits. Uncomment this and read /etc/security/limits.conf to
+# enable this functionality.
+# session    required     pam_limits.so
 
 # Standard Un*x password updating.
 @include common-password