9 commits

Author	SHA1	Message	Date
Dag-Erling Smørgrav	333ee03933	Merge conflicts. ... MFC after: 1 week	2006-09-30 13:38:06 +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	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
Chris D. Faulhaber	c2fc1c7365	Remove _PATH_CP now that it is defined in paths.h ... Reviewed by: des	2002-05-12 01:52:11 +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
Brian Feldman	1e8db6e2f6	Say "hi" to the latest in the OpenSSH series, version 2.9! ... Happy birthday to: rwatson	2001-05-04 03:57:05 +00:00