Commit Graph

5 Commits

Author SHA1 Message Date
des
4ff234ef46 Merge conflicts.
MFC after:	1 week
2006-09-30 13:38:06 +00:00
des
983ad11a1c Resolve conflicts. 2005-06-05 15:46:09 +00:00
des
a46b8cda04 Remove code related to the PAMAuthenticationViaKbdInt option (which we've
disabled).  This removes the only reference to auth2_pam().
2002-12-14 13:48:13 +00:00
des
bb02848f18 Vendor import of OpenSSH 3.3p1. 2002-06-27 22:31:32 +00:00
des
610201f50f Vendor import of OpenSSH 3.3. 2002-06-23 14:01:54 +00:00