des
f486315183
Resolve conflicts.
2006-11-10 16:52:41 +00:00
des
4ff234ef46
Merge conflicts.
...
MFC after: 1 week
2006-09-30 13:38:06 +00:00
des
88c7c9558b
Resolve conflicts.
2005-09-03 07:04:25 +00:00
des
983ad11a1c
Resolve conflicts.
2005-06-05 15:46:09 +00:00
des
a744ec13ad
Resolve conflicts
2004-10-28 16:11:31 +00:00
des
124c4a1415
Resolve conflicts.
2004-02-26 10:52:33 +00:00
des
7545fb1c7e
Resolve conflicts and remove obsolete files.
...
Sponsored by: registrar.no
2004-01-07 11:16:27 +00:00
des
8a5b06b8e0
Remove RCSID from files which have no other diffs to the vendor branch.
2003-05-01 15:05:43 +00:00
des
58b9db3b6f
Resolve conflicts.
2003-04-23 17:13:13 +00:00
des
279b0fa809
Resolve conflicts.
2002-10-29 10:16:02 +00:00
des
72a8e501f7
Resolve conflicts.
...
Sponsored by: DARPA, NAI Labs
2002-06-29 11:48:59 +00:00
des
5ba29faa04
Forcibly revert to mainline.
2002-06-27 22:42:11 +00:00
des
fa8aa6dfe7
Resolve conflicts. Known issues:
...
- sshd fails to set TERM correctly.
- privilege separation may break PAM and is currently turned off.
- man pages have not yet been updated
I will have these issues resolved, and privilege separation turned on by
default, in time for DP2.
Sponsored by: DARPA, NAI Labs
2002-06-23 16:09:08 +00:00
des
6534271ec8
Fix conflicts.
2002-03-18 10:09:43 +00:00
green
119a11eb6b
Fix conflicts for OpenSSH 2.9.
2001-05-04 04:14:23 +00:00
kris
24372e6c10
Resolve conflicts and update for OpenSSH 2.2.0
...
Reviewed by: gshapiro, peter, green
2000-09-10 09:35:38 +00:00
kris
66c0eb5d8c
Bring vendor patches onto the main branch, and resolve conflicts.
2000-06-03 07:31:44 +00:00
kris
a632b4789c
Resolve conflicts and update for FreeBSD.
2000-05-15 05:24:25 +00:00
kris
9b205c3441
#include <ssl/foo.h> -> #include <openssl/foo.h>
2000-03-26 10:00:28 +00:00
kris
b201b15ee1
Virgin import of OpenSSH sources dated 2000/03/25
2000-03-26 07:07:24 +00:00
