[openssh-commits] [openssh] 07/07: upstream: Reorder headers according to KNF,
git+noreply at mindrot.org
git+noreply at mindrot.org
Tue Feb 10 02:01:27 AEDT 2026
This is an automated email from the git hooks/post-receive script.
dtucker pushed a commit to branch master
in repository openssh.
commit 47828dbd95c095d0cad327e12bb6859a510833c8
Author: dtucker at openbsd.org <dtucker at openbsd.org>
AuthorDate: Sun Feb 8 19:54:31 2026 +0000
upstream: Reorder headers according to KNF,
and pull in a few we don't have from Portable.
OpenBSD-Commit-ID: d83f6c75da7bfb16bbff40fd2133d6eba4aba272
---
auth-krb5.c | 2 +-
authfile.c | 2 +-
dh.c | 5 ++---
gss-genr.c | 2 +-
kex.c | 2 +-
kexgen.c | 2 +-
kexgexc.c | 4 ++--
kexgexs.c | 4 ++--
monitor.c | 2 +-
monitor_fdpass.c | 2 +-
monitor_wrap.c | 2 +-
packet.c | 2 +-
readconf.c | 2 +-
scp.c | 6 +++---
sftp-common.c | 2 +-
sftp-server.c | 4 ++--
sftp.c | 2 +-
17 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/auth-krb5.c b/auth-krb5.c
index 9d2f1f0ea..3c6dc0622 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-krb5.c,v 1.25 2025/09/29 21:29:22 dtucker Exp $ */
+/* $OpenBSD: auth-krb5.c,v 1.26 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Kerberos v5 authentication and ticket-passing routines.
*
diff --git a/authfile.c b/authfile.c
index 16e02d9d0..e3ca1005f 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.147 2025/08/29 03:50:38 djm Exp $ */
+/* $OpenBSD: authfile.c,v 1.148 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright (c) 2000, 2013 Markus Friedl. All rights reserved.
*
diff --git a/dh.c b/dh.c
index 168dea1dd..b291750d8 100644
--- a/dh.c
+++ b/dh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.c,v 1.75 2024/12/03 16:27:53 dtucker Exp $ */
+/* $OpenBSD: dh.c,v 1.76 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright (c) 2000 Niels Provos. All rights reserved.
*
@@ -26,6 +26,7 @@
#include "includes.h"
#ifdef WITH_OPENSSL
+#include "openbsd-compat/openssl-compat.h"
#include <errno.h>
#include <stdarg.h>
@@ -43,8 +44,6 @@
#include "misc.h"
#include "ssherr.h"
-#include "openbsd-compat/openssl-compat.h"
-
static const char *moduli_filename;
void dh_set_moduli_file(const char *filename)
diff --git a/gss-genr.c b/gss-genr.c
index 8f1f54afb..7088d93b4 100644
--- a/gss-genr.c
+++ b/gss-genr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gss-genr.c,v 1.30 2025/09/29 21:28:33 dtucker Exp $ */
+/* $OpenBSD: gss-genr.c,v 1.31 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
diff --git a/kex.c b/kex.c
index 814fad947..ee2e1cc0a 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.189 2025/09/15 04:40:34 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.190 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
*
diff --git a/kexgen.c b/kexgen.c
index 494d4b233..1541ab975 100644
--- a/kexgen.c
+++ b/kexgen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgen.c,v 1.10 2024/09/09 02:39:57 djm Exp $ */
+/* $OpenBSD: kexgen.c,v 1.11 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright (c) 2019 Markus Friedl. All rights reserved.
*
diff --git a/kexgexc.c b/kexgexc.c
index 097d83f30..a114be944 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexc.c,v 1.39 2025/10/03 00:08:02 djm Exp $ */
+/* $OpenBSD: kexgexc.c,v 1.40 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright (c) 2000 Niels Provos. All rights reserved.
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -27,10 +27,10 @@
#include "includes.h"
#ifdef WITH_OPENSSL
+#include "openbsd-compat/openssl-compat.h"
#include <sys/types.h>
-#include "openbsd-compat/openssl-compat.h"
#include <openssl/bn.h>
#include <openssl/dh.h>
diff --git a/kexgexs.c b/kexgexs.c
index d02cca6dc..aa61a9c1a 100644
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexs.c,v 1.49 2025/10/03 00:09:26 djm Exp $ */
+/* $OpenBSD: kexgexs.c,v 1.50 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright (c) 2000 Niels Provos. All rights reserved.
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -27,13 +27,13 @@
#include "includes.h"
#ifdef WITH_OPENSSL
+#include "openbsd-compat/openssl-compat.h"
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <signal.h>
-#include "openbsd-compat/openssl-compat.h"
#include <openssl/bn.h>
#include <openssl/dh.h>
diff --git a/monitor.c b/monitor.c
index b49ab3cc9..fa66b60cb 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.251 2025/12/19 00:56:34 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.252 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright 2002 Niels Provos <provos at citi.umich.edu>
* Copyright 2002 Markus Friedl <markus at openbsd.org>
diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 786d29ab7..a2472abdb 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_fdpass.c,v 1.22 2020/10/18 11:32:01 djm Exp $ */
+/* $OpenBSD: monitor_fdpass.c,v 1.23 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright 2001 Niels Provos <provos at citi.umich.edu>
* All rights reserved.
diff --git a/monitor_wrap.c b/monitor_wrap.c
index a5c6308be..c56f46768 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.144 2025/12/19 00:56:34 djm Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.145 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright 2002 Niels Provos <provos at citi.umich.edu>
* Copyright 2002 Markus Friedl <markus at openbsd.org>
diff --git a/packet.c b/packet.c
index 05c2adfac..8785db9d8 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.331 2025/12/30 04:28:42 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.332 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
diff --git a/readconf.c b/readconf.c
index 580026431..1e7e24002 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.407 2025/11/20 05:10:11 dtucker Exp $ */
+/* $OpenBSD: readconf.c,v 1.408 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
diff --git a/scp.c b/scp.c
index dae585daf..e46daef90 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.271 2026/02/06 22:59:18 dtucker Exp $ */
+/* $OpenBSD: scp.c,v 1.272 2026/02/08 19:54:31 dtucker Exp $ */
/*
* scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd).
@@ -88,8 +88,6 @@
#endif
#include <glob.h>
#include <libgen.h>
-#include <limits.h>
-#include <util.h>
#include <locale.h>
#include <poll.h>
#include <pwd.h>
@@ -101,6 +99,8 @@
#include <string.h>
#include <time.h>
#include <unistd.h>
+#include <limits.h>
+#include <util.h>
#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
#include <vis.h>
#endif
diff --git a/sftp-common.c b/sftp-common.c
index 1924e4be0..912b332d9 100644
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-common.c,v 1.34 2023/03/31 04:00:37 djm Exp $ */
+/* $OpenBSD: sftp-common.c,v 1.35 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2001 Damien Miller. All rights reserved.
diff --git a/sftp-server.c b/sftp-server.c
index b98c3cd41..2f725d265 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.150 2025/12/08 00:41:46 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.151 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
*
@@ -18,8 +18,8 @@
#include "includes.h"
#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/resource.h>
+#include <sys/stat.h>
#include <sys/time.h>
#ifdef HAVE_SYS_MOUNT_H
#include <sys/mount.h>
diff --git a/sftp.c b/sftp.c
index 78b37ebbd..f2be1fe38 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.248 2026/01/21 15:44:51 sthen Exp $ */
+/* $OpenBSD: sftp.c,v 1.249 2026/02/08 19:54:31 dtucker Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm at openbsd.org>
*
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list