From: Darren Tucker Date: Fri, 2 Sep 2022 04:20:04 +0000 (+1000) Subject: Move OPENBSD ORIGINAL marker. X-Git-Tag: V_9_1_P1~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beaddde26f30e2195b8aa4f3193970e140e17305;p=thirdparty%2Fopenssh-portable.git 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. --- diff --git a/openbsd-compat/arc4random_uniform.c b/openbsd-compat/arc4random_uniform.c index b1a8aeea2..591f92d15 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