forked from pool/openssh
efb05e6527
- Update of the underlying OpenSSH to 6.6p1
- update to 6.6p1
Security:
* sshd(8): when using environment passing with a sshd_config(5)
AcceptEnv pattern with a wildcard. OpenSSH prior to 6.6 could
be tricked into accepting any enviornment variable that
contains the characters before the wildcard character.
Features since 6.5p1:
* ssh(1), sshd(8): removal of the J-PAKE authentication code,
which was experimental, never enabled and has been
unmaintained for some time.
* ssh(1): skip 'exec' clauses other clauses predicates failed
to match while processing Match blocks.
* ssh(1): if hostname canonicalisation is enabled and results
in the destination hostname being changed, then re-parse
ssh_config(5) files using the new destination hostname. This
gives 'Host' and 'Match' directives that use the expanded
hostname a chance to be applied.
Bugfixes:
* ssh(1): avoid spurious "getsockname failed: Bad file
descriptor" in ssh -W. bz#2200, debian#738692
* sshd(8): allow the shutdown(2) syscall in seccomp-bpf and
systrace sandbox modes, as it is reachable if the connection
is terminated during the pre-auth phase.
* ssh(1), sshd(8): fix unsigned overflow that in SSH protocol 1
bignum parsing. Minimum key length checks render this bug
unexploitable to compromise SSH 1 sessions.
* sshd_config(5): clarify behaviour of a keyword that appears
in multiple matching Match blocks. bz#2184
OBS-URL: https://build.opensuse.org/request/show/230097
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=76
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
# Don't audit SSH_INVALID_USER twice.
|
|
# PRIVSEP(getpwnamallow()) a few lines above already did this.
|
|
#
|
|
# based on:
|
|
# https://bugzilla.mindrot.org/show_bug.cgi?id=1402
|
|
# https://bugzilla.mindrot.org/attachment.cgi?id=2010
|
|
# by jchadima@redhat.com
|
|
#
|
|
# PRIVSEP(getpwnamallow()) a few lines above already did this.
|
|
|
|
diff --git a/openssh-6.6p1/auth2.c b/openssh-6.6p1/auth2.c
|
|
--- a/openssh-6.6p1/auth2.c
|
|
+++ b/openssh-6.6p1/auth2.c
|
|
@@ -236,19 +236,16 @@ input_userauth_request(int type, u_int32
|
|
authctxt->pw = PRIVSEP(getpwnamallow(user));
|
|
authctxt->user = xstrdup(user);
|
|
if (authctxt->pw && strcmp(service, "ssh-connection")==0) {
|
|
authctxt->valid = 1;
|
|
debug2("input_userauth_request: setting up authctxt for %s", user);
|
|
} else {
|
|
logit("input_userauth_request: invalid user %s", user);
|
|
authctxt->pw = fakepw();
|
|
-#ifdef SSH_AUDIT_EVENTS
|
|
- PRIVSEP(audit_event(SSH_INVALID_USER));
|
|
-#endif
|
|
}
|
|
#ifdef USE_PAM
|
|
if (options.use_pam)
|
|
PRIVSEP(start_pam(authctxt));
|
|
#endif
|
|
setproctitle("%s%s", authctxt->valid ? user : "unknown",
|
|
use_privsep ? " [net]" : "");
|
|
authctxt->service = xstrdup(service);
|