c5a8b87f73
Resolve conflicts
2006-09-28 21:22:14 +00:00
8471a3b7da
resolve conflicts.
2005-04-23 16:53:28 +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
b5222aff66
OpenSSH 3.3 as of June 24, 2002.
...
- ssh is no longer seruid root. ssh-keyscan is added to read secret host keys.
protocol version 1 rsh-like authentication is gone.
- FallBackToRsh is deprecated.
2002-06-24 05:25:39 +00:00
christos