diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
commit | d59fd3e421aa81b8e5e118f3f806081df2aca879 (patch) | |
tree | 356a4e607edc979c625bb33db63c656d771478bd /contrib/cygwin | |
parent | 7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff) | |
parent | 45431c9b4677608680cd071768cbf156b316a7e8 (diff) |
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'contrib/cygwin')
-rw-r--r-- | contrib/cygwin/README | 2 | ||||
-rw-r--r-- | contrib/cygwin/ssh-host-config | 23 | ||||
-rw-r--r-- | contrib/cygwin/ssh-user-config | 8 |
3 files changed, 19 insertions, 14 deletions
diff --git a/contrib/cygwin/README b/contrib/cygwin/README index 71ea3455f..ec58964c9 100644 --- a/contrib/cygwin/README +++ b/contrib/cygwin/README | |||
@@ -1,4 +1,4 @@ | |||
1 | This package is the actual port of OpenSSH to Cygwin 1.3. | 1 | This package is the actual port of OpenSSH to Cygwin 1.5. |
2 | 2 | ||
3 | =========================================================================== | 3 | =========================================================================== |
4 | Important change since 3.4p1-2: | 4 | Important change since 3.4p1-2: |
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index 2c6db51e5..e9c56aea9 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config | |||
@@ -279,12 +279,14 @@ then | |||
279 | # Host * | 279 | # Host * |
280 | # ForwardAgent no | 280 | # ForwardAgent no |
281 | # ForwardX11 no | 281 | # ForwardX11 no |
282 | # RhostsAuthentication no | ||
283 | # RhostsRSAAuthentication no | 282 | # RhostsRSAAuthentication no |
284 | # RSAAuthentication yes | 283 | # RSAAuthentication yes |
285 | # PasswordAuthentication yes | 284 | # PasswordAuthentication yes |
285 | # HostbasedAuthentication no | ||
286 | # BatchMode no | 286 | # BatchMode no |
287 | # CheckHostIP yes | 287 | # CheckHostIP yes |
288 | # AddressFamily any | ||
289 | # ConnectTimeout 0 | ||
288 | # StrictHostKeyChecking ask | 290 | # StrictHostKeyChecking ask |
289 | # IdentityFile ~/.ssh/identity | 291 | # IdentityFile ~/.ssh/identity |
290 | # IdentityFile ~/.ssh/id_dsa | 292 | # IdentityFile ~/.ssh/id_dsa |
@@ -397,7 +399,7 @@ Port $port_number | |||
397 | #HostKey ${SYSCONFDIR}/ssh_host_dsa_key | 399 | #HostKey ${SYSCONFDIR}/ssh_host_dsa_key |
398 | 400 | ||
399 | # Lifetime and size of ephemeral version 1 server key | 401 | # Lifetime and size of ephemeral version 1 server key |
400 | #KeyRegenerationInterval 3600 | 402 | #KeyRegenerationInterval 1h |
401 | #ServerKeyBits 768 | 403 | #ServerKeyBits 768 |
402 | 404 | ||
403 | # Logging | 405 | # Logging |
@@ -407,7 +409,7 @@ Port $port_number | |||
407 | 409 | ||
408 | # Authentication: | 410 | # Authentication: |
409 | 411 | ||
410 | #LoginGraceTime 120 | 412 | #LoginGraceTime 2m |
411 | #PermitRootLogin yes | 413 | #PermitRootLogin yes |
412 | # The following setting overrides permission checks on host key files | 414 | # The following setting overrides permission checks on host key files |
413 | # and directories. For security reasons set this to "yes" when running | 415 | # and directories. For security reasons set this to "yes" when running |
@@ -418,10 +420,6 @@ StrictModes no | |||
418 | #PubkeyAuthentication yes | 420 | #PubkeyAuthentication yes |
419 | #AuthorizedKeysFile .ssh/authorized_keys | 421 | #AuthorizedKeysFile .ssh/authorized_keys |
420 | 422 | ||
421 | # rhosts authentication should not be used | ||
422 | #RhostsAuthentication no | ||
423 | # Don't read the user's ~/.rhosts and ~/.shosts files | ||
424 | #IgnoreRhosts yes | ||
425 | # For this to work you will also need host keys in ${SYSCONFDIR}/ssh_known_hosts | 423 | # For this to work you will also need host keys in ${SYSCONFDIR}/ssh_known_hosts |
426 | #RhostsRSAAuthentication no | 424 | #RhostsRSAAuthentication no |
427 | # similar for protocol version 2 | 425 | # similar for protocol version 2 |
@@ -429,6 +427,8 @@ StrictModes no | |||
429 | # Change to yes if you don't trust ~/.ssh/known_hosts for | 427 | # Change to yes if you don't trust ~/.ssh/known_hosts for |
430 | # RhostsRSAAuthentication and HostbasedAuthentication | 428 | # RhostsRSAAuthentication and HostbasedAuthentication |
431 | #IgnoreUserKnownHosts no | 429 | #IgnoreUserKnownHosts no |
430 | # Don't read the user's ~/.rhosts and ~/.shosts files | ||
431 | #IgnoreRhosts yes | ||
432 | 432 | ||
433 | # To disable tunneled clear text passwords, change to no here! | 433 | # To disable tunneled clear text passwords, change to no here! |
434 | #PasswordAuthentication yes | 434 | #PasswordAuthentication yes |
@@ -437,6 +437,8 @@ StrictModes no | |||
437 | # Change to no to disable s/key passwords | 437 | # Change to no to disable s/key passwords |
438 | #ChallengeResponseAuthentication yes | 438 | #ChallengeResponseAuthentication yes |
439 | 439 | ||
440 | #AllowTcpForwarding yes | ||
441 | #GatewayPorts no | ||
440 | #X11Forwarding no | 442 | #X11Forwarding no |
441 | #X11DisplayOffset 10 | 443 | #X11DisplayOffset 10 |
442 | #X11UseLocalhost yes | 444 | #X11UseLocalhost yes |
@@ -447,11 +449,14 @@ StrictModes no | |||
447 | UsePrivilegeSeparation $privsep_used | 449 | UsePrivilegeSeparation $privsep_used |
448 | #PermitUserEnvironment no | 450 | #PermitUserEnvironment no |
449 | #Compression yes | 451 | #Compression yes |
450 | 452 | #ClientAliveInterval 0 | |
453 | #ClientAliveCountMax 3 | ||
454 | #UseDNS yes | ||
455 | #PidFile /var/run/sshd.pid | ||
451 | #MaxStartups 10 | 456 | #MaxStartups 10 |
457 | |||
452 | # no default banner path | 458 | # no default banner path |
453 | #Banner /some/path | 459 | #Banner /some/path |
454 | #VerifyReverseMapping no | ||
455 | 460 | ||
456 | # override default of no subsystems | 461 | # override default of no subsystems |
457 | Subsystem sftp /usr/sbin/sftp-server | 462 | Subsystem sftp /usr/sbin/sftp-server |
diff --git a/contrib/cygwin/ssh-user-config b/contrib/cygwin/ssh-user-config index 5a76adbaf..4da113181 100644 --- a/contrib/cygwin/ssh-user-config +++ b/contrib/cygwin/ssh-user-config | |||
@@ -171,8 +171,8 @@ then | |||
171 | fi | 171 | fi |
172 | if request "Do you want to use this identity to login to this machine?" | 172 | if request "Do you want to use this identity to login to this machine?" |
173 | then | 173 | then |
174 | echo "Adding to ${pwdhome}/.ssh/authorized_keys2" | 174 | echo "Adding to ${pwdhome}/.ssh/authorized_keys" |
175 | cat "${pwdhome}/.ssh/id_rsa.pub" >> "${pwdhome}/.ssh/authorized_keys2" | 175 | cat "${pwdhome}/.ssh/id_rsa.pub" >> "${pwdhome}/.ssh/authorized_keys" |
176 | fi | 176 | fi |
177 | fi | 177 | fi |
178 | fi | 178 | fi |
@@ -190,8 +190,8 @@ then | |||
190 | fi | 190 | fi |
191 | if request "Do you want to use this identity to login to this machine?" | 191 | if request "Do you want to use this identity to login to this machine?" |
192 | then | 192 | then |
193 | echo "Adding to ${pwdhome}/.ssh/authorized_keys2" | 193 | echo "Adding to ${pwdhome}/.ssh/authorized_keys" |
194 | cat "${pwdhome}/.ssh/id_dsa.pub" >> "${pwdhome}/.ssh/authorized_keys2" | 194 | cat "${pwdhome}/.ssh/id_dsa.pub" >> "${pwdhome}/.ssh/authorized_keys" |
195 | fi | 195 | fi |
196 | fi | 196 | fi |
197 | fi | 197 | fi |