06993fb381
resolve conflicts.
2007-03-10 22:52:04 +00:00
c5a8b87f73
Resolve conflicts
2006-09-28 21:22:14 +00:00
8b8ab8547b
Resolve conflicts.
2005-02-13 05:57:25 +00:00
b1395375fd
add __RCSID("$NetBSD$"), because it's hard to track our changes in a
...
binary when we only have the vendor's RCSID.
2003-07-10 01:09:41 +00:00
b33be07056
Avoid conflict with reserved identifier "log".
2002-12-06 03:39:06 +00:00
3ea946f134
sync with openssh 3.3.
...
local mods included to make it compile with openssl 0.9.6d.
2002-06-24 05:48:24 +00:00
34b40b030e
sync with openssh 3.2 as of 2002/4/22.
...
- privilege separation
- afs/kerberos auth security issue fixed
2002-04-22 07:59:35 +00:00
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
a18ce029f6
Deal with lossage caused by the addition of the netbsd-1-5 branch tag
...
to these files.
Apparently, the "magic" which causes the latest version on the
vendor branch to appear at the head in the repository broke when
the netbsd-1-5 tag was added. Thus, merge in the lost revisions from
the vendor tag to work around this.
2001-12-13 15:53:54 +00:00
29c34cbb94
OpenSSH 3.0 as of 2001/11/7
2001-11-07 06:20:12 +00:00
bcdc367f57
OpenSSH 2.9.9 as of 2001/9/27
2001-09-27 02:00:33 +00:00
christos