From: Darren Tucker <dtucker@dtucker.net>
Date: Mon, 9 Feb 2026 21:55:53 +0000 (+1100)
Subject: Minor resync with upstream
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=957cb0fbe87b6ab76045e8dc99426db6afb54057;p=thirdparty%2Fopenssh-portable.git

Minor resync with upstream

Reorder definitions add whitespace to eliminate diffs vs upstream.
---

diff --git a/auth.c b/auth.c
index 8d9404743..ad7c5774e 100644
--- a/auth.c
+++ b/auth.c
@@ -98,8 +98,8 @@ allowed_user(struct ssh *ssh, struct passwd * pw)
 {
 	struct stat st;
 	const char *hostname = NULL, *ipaddr = NULL;
-	u_int i;
 	int r;
+	u_int i;
 
 	/* Shouldn't be called if pw is NULL, but better safe than sorry... */
 	if (!pw || !pw->pw_name)
diff --git a/misc.h b/misc.h
index 5b401c5c4..b633fc4f4 100644
--- a/misc.h
+++ b/misc.h
@@ -118,6 +118,7 @@ void	 sock_set_v6only(int);
 
 struct passwd *pwcopy(struct passwd *);
 void	 pwfree(struct passwd *); /* NB. only use with pwcopy */
+
 const char *ssh_gai_strerror(int);
 
 typedef void privdrop_fn(struct passwd *);
diff --git a/pathnames.h b/pathnames.h
index 0dcc49552..ae01c69e2 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -37,8 +37,8 @@
 #define _PATH_SERVER_CONFIG_FILE	SSHDIR "/sshd_config"
 #define _PATH_HOST_CONFIG_FILE		SSHDIR "/ssh_config"
 #define _PATH_HOST_ECDSA_KEY_FILE	SSHDIR "/ssh_host_ecdsa_key"
-#define _PATH_HOST_ED25519_KEY_FILE	SSHDIR "/ssh_host_ed25519_key"
 #define _PATH_HOST_RSA_KEY_FILE		SSHDIR "/ssh_host_rsa_key"
+#define _PATH_HOST_ED25519_KEY_FILE	SSHDIR "/ssh_host_ed25519_key"
 #define _PATH_DH_MODULI			SSHDIR "/moduli"
 
 #ifndef _PATH_SSH_PROGRAM
@@ -169,6 +169,9 @@
 #ifndef _PATH_SFTP_SERVER
 #define _PATH_SFTP_SERVER		"/usr/libexec/sftp-server"
 #endif
+#ifndef _PATH_LS
+#define _PATH_LS			"ls"
+#endif
 
 /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */
 #ifndef _PATH_PRIVSEP_CHROOT_DIR
@@ -177,11 +180,7 @@
 
 /* for passwd change */
 #ifndef _PATH_PASSWD_PROG
-#define _PATH_PASSWD_PROG             "/usr/bin/passwd"
-#endif
-
-#ifndef _PATH_LS
-#define _PATH_LS			"ls"
+#define _PATH_PASSWD_PROG		"/usr/bin/passwd"
 #endif
 
 /* Askpass program define */
diff --git a/sshbuf-getput-basic.c b/sshbuf-getput-basic.c
index 405f7eb60..b3c06ce99 100644
--- a/sshbuf-getput-basic.c
+++ b/sshbuf-getput-basic.c
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define SSHBUF_INTERNAL
 #include "includes.h"
 
 #include <sys/types.h>
@@ -27,6 +26,7 @@
 #include <stdint.h>
 
 #include "ssherr.h"
+#define SSHBUF_INTERNAL
 #include "sshbuf.h"
 
 int
diff --git a/sshbuf-getput-crypto.c b/sshbuf-getput-crypto.c
index e7bffe225..7516fd588 100644
--- a/sshbuf-getput-crypto.c
+++ b/sshbuf-getput-crypto.c
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define SSHBUF_INTERNAL
 #include "includes.h"
 
 #include <sys/types.h>
@@ -30,6 +29,7 @@
 #endif /* OPENSSL_HAS_ECC */
 
 #include "ssherr.h"
+#define SSHBUF_INTERNAL
 #include "sshbuf.h"
 
 int
diff --git a/sshbuf.h b/sshbuf.h
index 052b08798..7826cd37e 100644
--- a/sshbuf.h
+++ b/sshbuf.h
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <stdarg.h>
 #include <stdio.h>
+
 #ifdef WITH_OPENSSL
 # include <openssl/bn.h>
 # include <openssl/evp.h>