Antonio Larrosa
33d804a345
- To fix a copy&paste oversight in an ifdef :
* 0001-fix-utmpx-ifdef.patch
- To fix a regression introduced when the "Match" criteria
tokenizer was modified since it stopped supporting the
"Match criteria=argument" format:
* 0002-upstream-fix-regression-introduced-when-I-switched-the-Match.patch
- To fix the previous patch which broke on negated Matches:
* 0003-upstream-fix-previous-change-to-ssh_config-Match_-which-broken-on.patch
- To fix the ML-KEM768x25519 kex algorithm on big-endian systems:
* 0004-upstream-fix-ML-KEM768x25519-KEX-on-big-endian-systems-spotted-by.patch
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=279
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From c7fda601186ff28128cfe3eab9c9c0622de096e1 Mon Sep 17 00:00:00 2001
|
|
From: Christoph Ostarek <christoph@zededa.com>
|
|
Date: Wed, 3 Jul 2024 12:46:59 +0200
|
|
Subject: fix utmpx ifdef
|
|
|
|
02e16ad95fb1f56ab004b01a10aab89f7103c55d did a copy-paste for
|
|
utmpx, but forgot to change the ifdef appropriately
|
|
---
|
|
loginrec.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/loginrec.c b/loginrec.c
|
|
index 7460bb2c..45f13dee 100644
|
|
--- a/loginrec.c
|
|
+++ b/loginrec.c
|
|
@@ -723,7 +723,7 @@ set_utmpx_time(struct logininfo *li, struct utmpx *utx)
|
|
void
|
|
construct_utmpx(struct logininfo *li, struct utmpx *utx)
|
|
{
|
|
-# ifdef HAVE_ADDR_V6_IN_UTMP
|
|
+# ifdef HAVE_ADDR_V6_IN_UTMPX
|
|
struct sockaddr_in6 *sa6;
|
|
# endif
|
|
memset(utx, '\0', sizeof(*utx));
|
|
@@ -769,7 +769,7 @@ construct_utmpx(struct logininfo *li, struct utmpx *utx)
|
|
if (li->hostaddr.sa.sa_family == AF_INET)
|
|
utx->ut_addr = li->hostaddr.sa_in.sin_addr.s_addr;
|
|
# endif
|
|
-# ifdef HAVE_ADDR_V6_IN_UTMP
|
|
+# ifdef HAVE_ADDR_V6_IN_UTMPX
|
|
/* this is just a 128-bit IPv6 address */
|
|
if (li->hostaddr.sa.sa_family == AF_INET6) {
|
|
sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa);
|
|
--
|
|
cgit v1.2.3
|
|
|