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
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
# use same lines naming as utempter (prevents problems with using different
|
|
# formats in ?tmp? files)
|
|
|
|
diff --git a/openssh-6.6p1/loginrec.c b/openssh-6.6p1/loginrec.c
|
|
--- a/openssh-6.6p1/loginrec.c
|
|
+++ b/openssh-6.6p1/loginrec.c
|
|
@@ -538,17 +538,17 @@ getlast_entry(struct logininfo *li)
|
|
/*
|
|
* 'line' string utility functions
|
|
*
|
|
* These functions process the 'line' string into one of three forms:
|
|
*
|
|
* 1. The full filename (including '/dev')
|
|
* 2. The stripped name (excluding '/dev')
|
|
* 3. The abbreviated name (e.g. /dev/ttyp00 -> yp00
|
|
- * /dev/pts/1 -> ts/1 )
|
|
+ * /dev/pts/1 -> /1 )
|
|
*
|
|
* Form 3 is used on some systems to identify a .tmp.? entry when
|
|
* attempting to remove it. Typically both addition and removal is
|
|
* performed by one application - say, sshd - so as long as the choice
|
|
* uniquely identifies a terminal it's ok.
|
|
*/
|
|
|
|
|
|
@@ -599,16 +599,20 @@ line_abbrevname(char *dst, const char *s
|
|
/* Always skip prefix if present */
|
|
if (strncmp(src, "/dev/", 5) == 0)
|
|
src += 5;
|
|
|
|
#ifdef WITH_ABBREV_NO_TTY
|
|
if (strncmp(src, "tty", 3) == 0)
|
|
src += 3;
|
|
#endif
|
|
+ if (strncmp(src, "pts/", 4) == 0) {
|
|
+ src += 3;
|
|
+ if (strlen(src) > 4) src++;
|
|
+ }
|
|
|
|
len = strlen(src);
|
|
|
|
if (len > 0) {
|
|
if (((int)len - dstsize) > 0)
|
|
src += ((int)len - dstsize);
|
|
|
|
/* note: _don't_ change this to strlcpy */
|