Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve conflicts. | des | 2004-02-26 | 1 | -21/+22 |
| | |||||
* | Resolve conflicts and remove obsolete files. | des | 2004-01-07 | 1 | -6/+2 |
| | | | | Sponsored by: registrar.no | ||||
* | Resolve conflicts. | des | 2003-04-23 | 1 | -2/+2 |
| | |||||
* | Resolve conflicts. | des | 2002-06-29 | 1 | -5/+21 |
| | | | | Sponsored by: DARPA, NAI Labs | ||||
* | Forcibly revert to mainline. | des | 2002-06-27 | 1 | -1/+4 |
| | |||||
* | Resolve conflicts. Known issues: | des | 2002-06-23 | 1 | -5/+23 |
| | | | | | | | | | | | - 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 | -14/+11 |
| | |||||
* | Fix conflicts for OpenSSH 2.9. | green | 2001-05-04 | 1 | -15/+31 |
| | |||||
* | Resolve conflicts and update for OpenSSH 2.2.0 | kris | 2000-09-10 | 1 | -9/+29 |
| | | | | Reviewed by: gshapiro, peter, green | ||||
* | Resolve conflicts and update for FreeBSD. | kris | 2000-05-15 | 1 | -11/+62 |
| | |||||
* | Resolve conflicts. | kris | 2000-03-26 | 1 | -4/+4 |
| | |||||
* | 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/+158 |