Minor resync with upstream

Reorder definitions add whitespace to eliminate diffs vs upstream.

diff --git a/auth.c b/auth.c
index 8d94047439be56289e2c0823b0ab59239763a2bc..ad7c5774e1242e327ed2bb00798014fbbecf20e5 100644 (file)
--- 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 5b401c5c444cecb40679a37aecaef190e3440cc1..b633fc4f4b7204ec0a258d86b1a443020c1c1fe2 100644 (file)
--- 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 0dcc4955241f380eb37214d1458cf445c72d809f..ae01c69e2d91bf0c2528df673aea06dccb8141e1 100644 (file)
--- 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 405f7eb60e0299117b4e48f10705e940b7e5e4f4..b3c06ce99a9fd8137d0fb395b4287d1e2f1b9621 100644 (file)
--- 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 e7bffe225cd99154966dae7e1292b7b0e577455a..7516fd5880658634a61e5149031a8e8181e3c51a 100644 (file)
--- 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 052b0879849e7d74c99fbf3cfafe5e9a150a7edf..7826cd37e9ef340305b7fd41d63af029a09f23e0 100644 (file)
--- 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>