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