11 Commits

Author	SHA1	Message	Date
Dag-Erling Smørgrav	e73e9afa91	Resolve conflicts.	2003-04-23 17:13:13 +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	e8aafc91b5	Resolve conflicts and update for FreeBSD.	2000-05-15 05:24:25 +00:00
Kris Kennaway	3c6ae11886	Resolve conflicts.	2000-03-26 07:37:48 +00:00
Brian Feldman	18a711954e	The includes must be <openssl/.*\.h>, not <ssl/.*\.h>.	2000-02-25 01:53:12 +00:00
Mark Murray	511b41d2a1	Vendor import of OpenSSH.	2000-02-24 14:29:47 +00:00