[openssh-commits] [openssh] branch V_10_1 updated: Fix header name and move return outside of ifdef.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch V_10_1
in repository openssh.

The following commit(s) were added to refs/heads/V_10_1 by this push:
     new a18cd34e9 Fix header name and move return outside of ifdef.
a18cd34e9 is described below

commit a18cd34e9b9146ebf88c4cf15fe84907e37b197d
Author: Darren Tucker <dtucker at dtucker.net>
AuthorDate: Wed Oct 8 11:26:52 2025 +1100

    Fix header name and move return outside of ifdef.
    
    Fixes from Mike Frysinger via Github PR#597.
---
 configure.ac | 2 +-
 sshkey.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 98f2e3e1c..db5211013 100644
--- a/configure.ac
+++ b/configure.ac
@@ -536,7 +536,7 @@ AC_CHECK_HEADERS([ \
     nlist.h \
     poll.h \
     stdint.h \
-    sys/mmap.h \
+    sys/mman.h \
     sys/stat.h \
     sys/time.h \
     sys/un.h \
diff --git a/sshkey.c b/sshkey.c
index 206b72921..afd7822c4 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -734,10 +734,10 @@ sshkey_prekey_alloc(u_char **prekeyp, size_t len)
 	(void)madvise(prekey, len, MADV_DONTDUMP);
 #endif
 	*prekeyp = prekey;
-	return 0;
 #else
 	*prekeyp = calloc(1, len);
 #endif /* HAVE_MMAP et al */
+	return 0;
 }
 
 static void

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.