Commit Graph

19 Commits

Author SHA1 Message Date
christos 1f7a577d0e re-add removed files. 2008-04-06 23:39:05 +00:00
christos cbdb6c7a40 resolve conflicts. 2008-04-06 23:38:19 +00:00
christos 2cf8149db2 resurect files that we need and make things compile again. 2007-03-10 23:05:24 +00:00
christos 06993fb381 resolve conflicts. 2007-03-10 22:52:04 +00:00
christos 229f040cb9 We need this again. 2006-09-28 21:23:13 +00:00
christos c5a8b87f73 Resolve conflicts 2006-09-28 21:22:14 +00:00
christos dd8ccf5b99 Add a namespace.h to rename the most conflict inducing names from libssh.
Idea from thorpej.
2006-02-13 16:49:33 +00:00
christos fab0e5bf66 resolve conflicts 2006-02-04 22:32:13 +00:00
christos 453555bc8b PR/31243: Mark Davies: sshd uses pipes rather than socketpairs, making bash
not execute .bashrc. Since socketpairs work on all NetBSD systems, make it
the default.
2005-09-09 12:20:12 +00:00
christos d6e447b0f6 Add PAM hooks from portable OpenSSH. 2005-02-13 18:14:04 +00:00
christos 8b8ab8547b Resolve conflicts. 2005-02-13 05:57:25 +00:00
christos 83da2f6968 don't throw const away for no reason. 2004-12-11 06:58:20 +00:00
itojun af34a358ff sync w/ 3.1 as of 2002/3/8. configuration file directory is still /etc
(openbsd usr.bin/ssh is using /etc/ssh)
2002-03-08 02:00:50 +00:00
itojun 69d60502fe upgrade to openssh 2.9, around 2001/6/24 (from openbsd usr.bin/ssh).
- authorized_keys2 and known_hosts2 are obsoleted, and integrated
  into those without "2".
- file name change, /etc/primes -> /etc/moduli
- cleanups
2001-06-23 19:37:38 +00:00
itojun 235b9f0c2f upgrade to openssh 2.5.4 (2001/4/10).
major behavior changes: (made in openssh master tree - openbsd usr.bin/ssh)
- ssh(1) now defaults to ssh protocol version 2.
  if you want version 1 to take precedence, use /etc/ssh.conf to override.
- config change: ~/.ssh/id_rsa[12] is now ~/.ssh/id_rsa (changed 4/3)
- forced client rekey for protocol version 2 (~R)
- swap gid when uid swaps.
- ListenAddress syntax can take [foo]:port for IPv6 numerics.
- "ssh -D 1080" allows us to use ssh tunnel as SOCKS4 proxy.
2001-04-10 08:07:54 +00:00
itojun 531a3ed838 sync with 2/14.
openssh changes:
- SIGWINCH propagated correctly
- mitigate SSH1 traffic analysis
- sprintf -> snprintf and lots of other cleanups
netbsd local changes:
- include OpenBSD RCSID into binary again, which helps us diagnose later.
2001-02-14 01:06:48 +00:00
itojun 1f5cfca3e6 sync crypto/dist/ssh with re-importorted tree. try to minimize diffs
with openssh tree to ease future upgrade.  re-do local changes, including:
- prototype pedants
- IgnoreRootRhosts
- login.conf user validation
some of the local changes that weren't used are omitted for now.  we may
need to revisit those afterwards.

it adds "sftp".
2001-02-07 17:05:31 +00:00
itojun 9d3aa44a65 OpenSSH 2.3.1 as of 2001/2/8 2001-02-07 16:46:40 +00:00
thorpej 49a55a1d58 Import NetBSD Secure Shell. This is based on OpenSSH, but modified
somewhat.
2000-09-28 22:09:28 +00:00