Age | Commit message (Collapse) | Author |
|
On at least older OpenBSDs, sys/sysctl.h and net/route.h require
sys/types and, in the case of sys/sysctl.h, sys/param.h for MAXLOGNAME.
|
|
avoid unused variable warnings for !WITH_OPENSSL; patch from
Marcus Folkesson
OpenBSD-Commit-ID: c01d27a3f907acdc3dd4ea48170fac3ba236d229
|
|
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
|
|
fix broken stdout in ControlPersist mode, introduced by me in
r1.467 and reported by Alf Schlichting
OpenBSD-Commit-ID: 3750a16e02108fc25f747e4ebcedb7123c1ef509
|
|
The configure script checks for getpagesize() and sets HAVE_GETPAGESIZE in
config.h, but bsd-getpagesize.c forgot to include includes.h (which
indirectly includes config.h) so the checks always fails, causing linker
issues when linking statically on systems with getpagesize().
Patch from Peter Korsgaard <peter at korsgaard.com>
|
|
whitespace at EOL
OpenBSD-Regress-ID: f4b5df99b28c6f63478deb916c6ed0e794685f07
|
|
whitespace at EOL
OpenBSD-Regress-ID: 19b1394393deee4c8a2114a3b7d18189f27a15cd
|
|
Use printenv to test whether an SSH_USER_AUTH is set
instead of using $SSH_USER_AUTH. The latter won't work with csh which treats
unknown variables as an error when expanding them. OK markus@
OpenBSD-Regress-ID: f601e878dd8b71aa40381573dde3a8f567e6f2d1
|
|
Add tests for URI parsing. OK markus@
OpenBSD-Regress-ID: 5d1df19874f3b916d1a2256a905526e17a98bd3b
|
|
whitespace at EOL
OpenBSD-Commit-ID: c95549cf5a07d56ea11aaff818415118720214f6
|
|
whitespace at EOL (lots)
OpenBSD-Commit-ID: 757257dd44116794ee1b5a45c6724973de181747
|
|
improve printing of rdomain on accept() a little
OpenBSD-Commit-ID: 5da58db2243606899cedaa646c70201b2d12247a
|
|
mark up the rdomain keyword;
OpenBSD-Commit-ID: 1b597d0ad0ad20e94dbd61ca066057e6f6313b8a
|
|
tweak the uri text, specifically removing some markup to
make it a bit more readable;
issue reported by - and diff ok - millert
OpenBSD-Commit-ID: 8b56a20208040b2d0633536fd926e992de37ef3f
|
|
simplify macros in previous, and some minor tweaks;
OpenBSD-Commit-ID: 6efeca3d8b095b76e21b484607d9cc67ac9a11ca
|
|
Previously portable OpenSSH has synced against a conversion of OpenBSD's
CVS repository made using the git cvsimport tool, but this has become
increasingly unreliable.
As of this commit, portable OpenSSH now tracks a conversion of the
OpenBSD CVS upstream made using the excellent cvs2gitdump tool from
YASUOKA Masahiko: https://github.com/yasuoka/cvs2gitdump
cvs2gitdump is considerably more reliable than gitcvsimport and the old
version of cvsps that it uses under the hood, and is the same tool used
to export the entire OpenBSD repository to git (so we know it can cope
with future growth).
These new conversions are mirrored at github, so interested parties can
match portable OpenSSH commits to their upstream counterparts.
https://github.com/djmdjm/openbsd-openssh-src
https://github.com/djmdjm/openbsd-openssh-regress
An unfortunate side effect of switching upstreams is that we must have
a flag day, across which the upstream commit IDs will be inconsistent.
The old commit IDs are recorded with the tags "Upstream-ID" for main
directory commits and "Upstream-Regress-ID" for regress commits.
To make it clear that the commit IDs do not refer to the same
things, the new repository will instead use "OpenBSD-ID" and
"OpenBSD-Regress-ID" tags instead.
Apart from being a longwinded explanation of what is going on, this
commit message also serves to synchronise our tools with the state of
the tree, which happens to be:
OpenBSD-ID: 9c43a9968c7929613284ea18e9fb92e4e2a8e4c1
OpenBSD-Regress-ID: b33b385719420bf3bc57d664feda6f699c147fef
|
|
|
|
|
|
|
|
Not enabled, pending implementation of valid_rdomain() and autoconf glue
|
|
|
|
Ahead of adding rdomain support
|
|
uninitialised variable in PermitTunnel printing code
Upstream-ID: f04dc33e42855704e116b8da61095ecc71bc9e9a
|
|
|
|
|
|
transfer ownership of stdout to the session channel by
dup2'ing /dev/null to fd 1. This allows propagation of remote stdout close to
the local side; reported by David Newall, ok markus@
Upstream-ID: 8d9ac18a11d89e6b0415f0cbf67b928ac67f0e79
|
|
add a "rdomain" criteria for the sshd_config Match
keyword to allow conditional configuration that depends on which rdomain(4) a
connection was recevied on. ok markus@
Upstream-ID: 27d8fd5a3f1bae18c9c6e533afdf99bff887a4fb
|
|
add sshd_config RDomain keyword to place sshd and the
subsequent user session (including the shell and any TCP/IP forwardings) into
the specified rdomain(4)
ok markus@
Upstream-ID: be2358e86346b5cacf20d90f59f980b87d1af0f5
|
|
Add optional rdomain qualifier to sshd_config's
ListenAddress option to allow listening on a different rdomain(4), e.g.
ListenAddress 0.0.0.0 rdomain 4
Upstream-ID: 24b6622c376feeed9e9be8b9605e593695ac9091
|
|
Kill dead store and some spaces vs. tabs indent in
parse_user_host_path(). Noticed by markus@
Upstream-ID: 114fec91dadf9af46c7c94fd40fc630ea2de8200
|
|
tweak previous; ok djm
Upstream-ID: 7d913981ab315296be1f759c67b6e17aea38fca9
|
|
|
|
Expose devices allocated for tun/tap forwarding.
At the client, the device may be obtained from a new %T expansion
for LocalCommand.
At the server, the allocated devices will be listed in a
SSH_TUNNEL variable exposed to the environment of any user sessions
started after the tunnel forwarding was established.
ok markus
Upstream-ID: e61e53f8ae80566e9ddc0d67a5df5bdf2f3c9f9e
|
|
Add URI support to ssh, sftp and scp. For example
ssh://user@host or sftp://user@host/path. The connection parameters
described in draft-ietf-secsh-scp-sftp-ssh-uri-04 are not implemented since
the ssh fingerprint format in the draft uses md5 with no way to specify the
hash function type. OK djm@
Upstream-ID: 4ba3768b662d6722de59e6ecb00abf2d4bf9cacc
|
|
|
|
more RCSIDs
Upstream-Regress-ID: 1aecbe3f8224793f0ec56741a86d619830eb33be
|
|
add RCSIDs to these; they make syncing portable a bit
easier
Upstream-ID: 56cb7021faea599736dd7e7f09c2e714425b1e68
|
|
Apply missing commit 1.11 to kexc25519s.c
Upstream-ID: 5f020e23a1ee6c3597af1f91511e68552cdf15e8
|
|
Apply missing commit 1.127 to servconf.h
Upstream-ID: f14c4bac74a2b7cf1e3cff6bea5c447f192a7d15
|
|
remove unused Pp;
Upstream-ID: 8ad26467f1f6a40be887234085a8e01a61a00550
|
|
In the description of pattern-lists, clarify negated
matches by explicitly stating that a negated match will never yield a
positive result, and that at least one positive term in the pattern-list must
match. bz#1918
Upstream-ID: 652d2f9d993f158fc5f83cef4a95cd9d95ae6a14
|
|
log debug messages sent to peer; ok deraadt markus
Upstream-ID: 3b4fdc0a06ea5083f61d96e20043000f477103d9
|
|
trim permitrootlogin description somewhat, to avoid
ambiguity; original diff from walter alejandro iglesias, tweaked by sthen and
myself
ok sthen schwarze deraadt
Upstream-ID: 1749418b2bc073f3fdd25fe21f8263c3637fe5d2
|
|
mention SSH_USER_AUTH in the list of environment
variables
Upstream-ID: 1083397c3ee54b4933121ab058c70a0fc6383691
|
|
BIO_get_mem_data() is supposed to take a char* as pointer
argument, so don't pass it a const char*
Upstream-ID: 1ccd91eb7f4dd4f0fa812d4f956987cd00b5f6ec
|
|
clarify the order in which config statements are used. ok
jmc@ djm@
Upstream-ID: e37e27bb6bbac71315e22cb9690fd8a556a501ed
|
|
replace statically-sized arrays in ServerOptions with
dynamic ones managed by xrecallocarray, removing some arbitrary (though
large) limits and saving a bit of memory; "much nicer" markus@
Upstream-ID: 1732720b2f478fe929d6687ac7b0a97ff2efe9d2
|
|
%C is hashed; from klemens nanni ok markus
Upstream-ID: 6ebed7b2e1b6ee5402a67875d74f5e2859d8f998
|
|
exercise PermitOpen a little more thoroughly
Upstream-Regress-ID: f41592334e227a4c1f9a983044522de4502d5eac
|
|
UsePrivilegeSeparation is gone, stop trying to test it.
Upstream-Regress-ID: 796a5057cfd79456a20ea935cc53f6eb80ace191
|