des
|
4ff234ef46
|
Merge conflicts.
MFC after: 1 week
|
2006-09-30 13:38:06 +00:00 |
|
des
|
7c07891caf
|
Merge conflicts.
|
2006-03-22 20:41:37 +00:00 |
|
des
|
88c7c9558b
|
Resolve conflicts.
|
2005-09-03 07:04:25 +00:00 |
|
des
|
983ad11a1c
|
Resolve conflicts.
|
2005-06-05 15:46:09 +00:00 |
|
des
|
a744ec13ad
|
Resolve conflicts
|
2004-10-28 16:11:31 +00:00 |
|
des
|
124c4a1415
|
Resolve conflicts.
|
2004-02-26 10:52:33 +00:00 |
|
des
|
7545fb1c7e
|
Resolve conflicts and remove obsolete files.
Sponsored by: registrar.no
|
2004-01-07 11:16:27 +00:00 |
|
des
|
58b9db3b6f
|
Resolve conflicts.
|
2003-04-23 17:13:13 +00:00 |
|
des
|
279b0fa809
|
Resolve conflicts.
|
2002-10-29 10:16:02 +00:00 |
|
des
|
a1a5bcd8f6
|
Use our __RCSID().
|
2002-06-29 11:22:20 +00:00 |
|
des
|
5ba29faa04
|
Forcibly revert to mainline.
|
2002-06-27 22:42:11 +00:00 |
|
des
|
6534271ec8
|
Fix conflicts.
|
2002-03-18 10:09:43 +00:00 |
|
green
|
119a11eb6b
|
Fix conflicts for OpenSSH 2.9.
|
2001-05-04 04:14:23 +00:00 |
|
kris
|
24372e6c10
|
Resolve conflicts and update for OpenSSH 2.2.0
Reviewed by: gshapiro, peter, green
|
2000-09-10 09:35:38 +00:00 |
|
kris
|
aba57a02e8
|
Respect X11BASE to derive the location of xauth(1)
PR: 17818
Submitted by: Bjoern Fischer <bfischer@Techfak.Uni-Bielefeld.DE>
|
2000-08-23 09:39:20 +00:00 |
|
brian
|
0e085590db
|
Don't USE_PIPES
Spammed by: peter
Submitted by: mkn@uk.FreeBSD.org
|
2000-05-22 09:51:18 +00:00 |
|
kris
|
a632b4789c
|
Resolve conflicts and update for FreeBSD.
|
2000-05-15 05:24:25 +00:00 |
|
brian
|
64f92723d4
|
Use pipe() instead of socketpair() in sshd when communicating
with the client.
This allows ppp/ssh style tunnels to function again.
Ok'd by: markk
Submitted by: markk@knigma.org
|
2000-03-24 15:39:37 +00:00 |
|
markm
|
37a38e6638
|
Add the patches fom ports (QV: ports/security/openssh/patches/patch-*)
|
2000-02-24 15:29:42 +00:00 |
|
markm
|
fc557ff7d9
|
Vendor import of OpenSSH.
|
2000-02-24 14:29:47 +00:00 |
|