Dag-Erling Smørgrav
62efe23a82
Resolve conflicts.
2006-11-10 16:52:41 +00:00
Dag-Erling Smørgrav
497e3d52a4
Tweak ifdefs for backward compatibility.
2006-10-03 11:33:25 +00:00
Dag-Erling Smørgrav
333ee03933
Merge conflicts.
...
MFC after: 1 week
2006-09-30 13:38:06 +00:00
Dag-Erling Smørgrav
b74df5b26f
Merge conflicts.
2006-03-22 20:41:37 +00:00
Doug Rabson
c0b9f4fe65
Add a new extensible GSS-API layer which can support GSS-API plugins,
...
similar the the Solaris implementation. Repackage the krb5 GSS mechanism
as a plugin library for the new implementation. This also includes a
comprehensive set of manpages for the GSS-API functions with text mostly
taken from the RFC.
Reviewed by: Love Hörnquist Åstrand <lha@it.su.se>, ru (build system), des (openssh parts)
2005-12-29 14:40:22 +00:00
Dag-Erling Smørgrav
d4ecd10857
Resolve conflicts.
2005-09-03 07:04:25 +00:00
Dag-Erling Smørgrav
aa49c9264c
Resolve conflicts.
2005-06-05 15:46:09 +00:00
Dag-Erling Smørgrav
21e764df0c
Resolve conflicts
2004-10-28 16:11:31 +00:00
Dag-Erling Smørgrav
5962c0e9a3
Resolve conflicts.
2004-04-20 09:46:41 +00:00
Dag-Erling Smørgrav
1ec0d75429
Resolve conflicts.
2004-02-26 10:52:33 +00:00
Dag-Erling Smørgrav
cf2b5f3b6d
Resolve conflicts and remove obsolete files.
...
Sponsored by: registrar.no
2004-01-07 11:16:27 +00:00
Dag-Erling Smørgrav
da05574c54
Fix off-by-one and initialization errors which prevented sshd from
...
restarting when sent a SIGHUP.
Submitted by: tegge
Approved by: re (jhb)
2003-05-28 19:39:33 +00:00
Dag-Erling Smørgrav
e73e9afa91
Resolve conflicts.
2003-04-23 17:13:13 +00:00
Dag-Erling Smørgrav
84860c33f0
Force early initialization of the resolver library, since the resolver
...
configuration files will no longer be available once sshd is chrooted.
PR: 39953, 40894
Submitted by: dinoex
MFC after: 3 days
2003-01-22 14:12:59 +00:00
Dag-Erling Smørgrav
f388f5ef26
Resolve conflicts.
2002-10-29 10:16:02 +00:00
Dag-Erling Smørgrav
a82e551f0f
Resolve conflicts.
...
Sponsored by: DARPA, NAI Labs
2002-06-29 11:48:59 +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
Ruslan Ermilov
fd4ca9e02d
Make libssh.so useable (undefined reference to IPv4or6).
...
Reviewed by: des, markm
Approved by: markm
2002-01-23 15:06:47 +00:00
Assar Westerlund
1f131ac4bd
fix renamed options in some of the code that was #ifdef AFS
...
also print an error if krb5 ticket passing is disabled
Submitted by: Jonathan Chen <jon@spock.org>
2001-09-04 13:27:04 +00:00
Brian Feldman
ca3176e7c8
Fix conflicts for OpenSSH 2.9.
2001-05-04 04:14:23 +00:00
Assar Westerlund
cb96ab3672
Add code for being compatible with ssh.com's krb5 authentication.
...
It is done by using the same ssh messages for v4 and v5 authentication
(since the ssh.com does not now anything about v4) and looking at the
contents after unpacking it to see if it is v4 or v5.
Based on code from Björn Grönvall <bg@sics.se>
PR: misc/20504
2001-03-04 02:22:04 +00:00
Kris Kennaway
a09221f83c
Patches backported from later development version of OpenSSH which prevent
...
(instead of just mitigating through connection limits) the Bleichenbacher
attack which can lead to guessing of the server key (not host key) by
regenerating it when an RSA failure is detected.
Reviewed by: rwatson
2001-02-12 06:44:51 +00:00
Brian Feldman
ea0187039a
/Really/ deprecate ConnectionsPerPeriod, ripping out the code for it
...
and giving a dire error to its lingering users.
2001-01-13 07:57:43 +00:00
Brian Feldman
39567f8cee
Fix a long-standing bug that resulted in a dropped session sometimes
...
when an X11-forwarded client was closed. For some reason, sshd didn't
disable the SIGPIPE exit handler and died a horrible death (well, okay,
a silent death really). Set SIGPIPE's handler to SIG_IGN.
2001-01-06 21:15:07 +00:00
Brian Feldman
099584266b
Update to OpenSSH 2.3.0 with FreeBSD modifications. OpenSSH 2.3.0
...
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>
2000-12-05 02:55:12 +00:00
Brian Feldman
4a950c224b
Fix a few style oddities.
2000-09-10 18:04:12 +00:00
Brian Feldman
dd5f9dffd6
Fix a goof in timevaldiff.
2000-09-10 18:03:46 +00:00
Kris Kennaway
c2d3a5594b
Resolve conflicts and update for OpenSSH 2.2.0
...
Reviewed by: gshapiro, peter, green
2000-09-10 09:35:38 +00:00
Brian Feldman
c8ef594c0f
Allow restarting on SIGHUP when the full path was not given as argv[0].
...
We do have /proc/curproc/file :)
2000-07-04 06:43:26 +00:00
Brian Feldman
c342fc930b
Also make sure to close the socket that exceeds your rate limit.
2000-06-26 23:39:26 +00:00
Brian Feldman
7e03cf33e9
Make rate limiting work per-listening-socket. Log better messages than
...
before for this, requiring a new function (get_ipaddr()). canohost.c
receives a $FreeBSD$ line.
Suggested by: Niels Provos <niels@OpenBSD.org>
2000-06-26 05:44:23 +00:00
Kris Kennaway
c322fe352d
Resolve conflicts
2000-06-03 09:58:15 +00:00
Kris Kennaway
b787acb5e3
Unbreak Kerberos5 compilation. This still remains untested.
...
Noticed by: obrien
2000-05-17 08:06:20 +00:00
Kris Kennaway
e8aafc91b5
Resolve conflicts and update for FreeBSD.
2000-05-15 05:24:25 +00:00
Kris Kennaway
3c6ae11886
Resolve conflicts.
2000-03-26 07:37:48 +00:00
Mark Murray
c59bf09996
Make LOGIN_CAP work properly.
2000-03-09 14:52:31 +00:00
Hajimu UMEMOTO
e51ec40ec8
Enable connection logging. FreeBSD's libwrap is IPv6 ready.
...
OpenSSH is in our source tree, now. It's a time to enable it.
Reviewed by: markm, shin
Approved by: jkh
2000-02-29 19:37:04 +00:00
Mark Murray
fe5fd0173b
1) Add kerberos5 functionality.
...
by Daniel Kouril <kouril@informatics.muni.cz>
2) Add full LOGIN_CAP capability
by Andrey Chernov
2000-02-28 19:03:50 +00:00
Brian Feldman
8261034302
Fix a bug that crawled in pretty recently (from the port). It made
...
sshd coredump :(
2000-02-25 05:22:14 +00:00
Mark Murray
42f71286cd
Add the patches fom ports (QV: ports/security/openssh/patches/patch-*)
2000-02-24 15:29:42 +00:00
Mark Murray
511b41d2a1
Vendor import of OpenSSH.
2000-02-24 14:29:47 +00:00