Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge conflicts. | des | 2006-09-30 | 1 | -3/+8 |
| | | | | MFC after: 1 week | ||||
* | Merge conflicts. | des | 2006-03-22 | 1 | -2/+2 |
| | |||||
* | Resolve conflicts. | des | 2005-09-03 | 1 | -61/+41 |
| | |||||
* | Resolve conflicts. | des | 2005-06-05 | 1 | -4/+6 |
| | |||||
* | Resolve conflicts | des | 2004-10-28 | 1 | -26/+26 |
| | |||||
* | Resolve conflicts. | des | 2004-02-26 | 1 | -10/+23 |
| | |||||
* | Resolve conflicts and remove obsolete files. | des | 2004-01-07 | 1 | -349/+33 |
| | | | | Sponsored by: registrar.no | ||||
* | Remove RCSID from files which have no other diffs to the vendor branch. | des | 2003-05-01 | 1 | -1/+0 |
| | |||||
* | Resolve conflicts. | des | 2003-04-23 | 1 | -2/+2 |
| | |||||
* | Resolve conflicts. | des | 2002-10-29 | 1 | -2/+17 |
| | |||||
* | Resolve conflicts. | des | 2002-06-29 | 1 | -1/+14 |
| | | | | Sponsored by: DARPA, NAI Labs | ||||
* | Forcibly revert to mainline. | des | 2002-06-27 | 1 | -1/+43 |
| | |||||
* | Resolve conflicts. Known issues: | des | 2002-06-23 | 1 | -11/+181 |
| | | | | | | | | | | | - 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 | ||||
* | Fix conflicts. | des | 2002-03-18 | 1 | -386/+331 |
| | |||||
* | Fix conflicts for OpenSSH 2.9. | green | 2001-05-04 | 1 | -28/+18 |
| | |||||
* | Update to OpenSSH 2.3.0 with FreeBSD modifications. OpenSSH 2.3.0 | green | 2000-12-05 | 1 | -333/+411 |
| | | | | | | | | | | | | | | | | | new features description elided in favor of checking out their website. Important new FreeBSD-version stuff: PAM support has been worked in, partially from the "Unix" OpenSSH version, and a lot due to the work of Eivind Eklend, too. This requires at least the following in pam.conf: sshd auth sufficient pam_skey.so sshd auth required pam_unix.so try_first_pass sshd session required pam_permit.so Parts by: Eivind Eklend <eivind@FreeBSD.org> | ||||
* | Resolve conflicts and update for OpenSSH 2.2.0 | kris | 2000-09-10 | 1 | -10/+34 |
| | | | | Reviewed by: gshapiro, peter, green | ||||
* | Resolve conflicts | kris | 2000-06-03 | 1 | -2/+4 |
| | |||||
* | Resolve conflicts and update for FreeBSD. | kris | 2000-05-15 | 1 | -22/+177 |
| | |||||
* | Resolve conflicts. | kris | 2000-03-26 | 1 | -15/+1 |
| | |||||
* | The includes must be <openssl/.*\.h>, not <ssl/.*\.h>. | green | 2000-02-25 | 1 | -1/+2 |
| | |||||
* | Vendor import of OpenSSH. | markm | 2000-02-24 | 1 | -0/+320 |