[openssh-commits] [openssh] 02/03: Move OPENBSD ORIGINAL marker.
git+noreply at mindrot.org
git+noreply at mindrot.org
Fri Sep 2 14:31:24 AEST 2022
This is an automated email from the git hooks/post-receive script.
dtucker pushed a commit to branch master
in repository openssh.
commit beaddde26f30e2195b8aa4f3193970e140e17305
Author: Darren Tucker <dtucker at dtucker.net>
Date: Fri Sep 2 14:20:04 2022 +1000
Move OPENBSD ORIGINAL marker.
Putting this after the copyright statement (which doesn't change)
instead of before the version identifier (which does) prevents merge
conflicts when resyncing changes.
---
openbsd-compat/arc4random_uniform.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openbsd-compat/arc4random_uniform.c b/openbsd-compat/arc4random_uniform.c
index b1a8aeea..591f92d1 100644
--- a/openbsd-compat/arc4random_uniform.c
+++ b/openbsd-compat/arc4random_uniform.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/crypt/arc4random_uniform.c */
-
/* $OpenBSD: arc4random_uniform.c,v 1.3 2019/01/20 02:59:07 bcook Exp $ */
/*
@@ -18,6 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+/* OPENBSD ORIGINAL: lib/libc/crypto/arc4random_uniform.c */
+
#include "includes.h"
#ifdef HAVE_STDINT_H
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list