12 commits

Author	SHA1	Message	Date
Dag-Erling Smørgrav	f388f5ef26	Resolve conflicts.	2002-10-29 10:16:02 +00:00
Dag-Erling Smørgrav	edb557f8bb	Support OPIE as an alternative to S/Key. ... Sponsored by: DARPA, NAI Labs	2002-06-29 10:44:37 +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
Mark Murray	7e40a391bc	Unbreak OpenSSH for the KRB5-and-no-KRB4 case. Asking for KRB5 does ... not imply that you want, need or have kerberosIV headers.	2001-06-15 08:12:31 +00:00
Brian Feldman	e7edf5a116	Enable Kerberos 5 support in sshd again.	2001-06-12 03:43:47 +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
Brian Feldman	5b9b2fafd4	Import of OpenSSH 2.3.0 (virgin OpenBSD source release).	2000-12-05 02:20:19 +00:00
Kris Kennaway	b66f2d16a0	Initial import of OpenSSH post-2.2.0 snapshot dated 2000-09-09	2000-09-10 08:31:17 +00:00
Kris Kennaway	a04a10f891	Initial import of OpenSSH v2.1.	2000-05-15 04:37:24 +00:00