18 Commits

Author	SHA1	Message	Date
Dag-Erling Smørgrav	d4ecd10857	Resolve conflicts.	2005-09-03 07:04:25 +00:00
Dag-Erling Smørgrav	aa49c9264c	Resolve conflicts.	2005-06-05 15:46:09 +00:00
Dag-Erling Smørgrav	21e764df0c	Resolve conflicts	2004-10-28 16:11:31 +00:00
Dag-Erling Smørgrav	1ec0d75429	Resolve conflicts.	2004-02-26 10:52:33 +00:00
Dag-Erling Smørgrav	cf2b5f3b6d	Resolve conflicts and remove obsolete files. ... Sponsored by: registrar.no	2004-01-07 11:16:27 +00:00
Dag-Erling Smørgrav	d12c7b01da	Remove RCSID from files which have no other diffs to the vendor branch.	2003-05-01 15:05:43 +00:00
Dag-Erling Smørgrav	e73e9afa91	Resolve conflicts.	2003-04-23 17:13:13 +00:00
Dag-Erling Smørgrav	f388f5ef26	Resolve conflicts.	2002-10-29 10:16:02 +00:00
Dag-Erling Smørgrav	a82e551f0f	Resolve conflicts. ... Sponsored by: DARPA, NAI Labs	2002-06-29 11:48:59 +00:00
Dag-Erling Smørgrav	989dd127e4	Forcibly revert to mainline.	2002-06-27 22:42:11 +00:00
Dag-Erling Smørgrav	80628bacb0	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
Dag-Erling Smørgrav	af12a3e74a	Fix conflicts.	2002-03-18 10:09:43 +00:00
Brian Feldman	ca3176e7c8	Fix conflicts for OpenSSH 2.9.	2001-05-04 04:14:23 +00:00
Kris Kennaway	c2d3a5594b	Resolve conflicts and update for OpenSSH 2.2.0 ... Reviewed by: gshapiro, peter, green	2000-09-10 09:35:38 +00:00
Kris Kennaway	db1cb46ca2	Bring vendor patches onto the main branch, and resolve conflicts.	2000-06-03 07:31:44 +00:00
Kris Kennaway	e8aafc91b5	Resolve conflicts and update for FreeBSD.	2000-05-15 05:24:25 +00:00
Kris Kennaway	18fa3c2ec9	#include <ssl/foo.h> -> #include <openssl/foo.h>	2000-03-26 10:00:28 +00:00
Kris Kennaway	a8f6863aa6	Virgin import of OpenSSH sources dated 2000/03/25	2000-03-26 07:07:24 +00:00