git: be7e57082993 - stable/12 - openssh: clarify krb5 use in freebsd-configure

[Ed Maste]

The branch stable/12 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=be7e5708299327d3e6275b663c84624891a17c15

commit be7e5708299327d3e6275b663c84624891a17c15
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-09-02 00:23:40 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-09-09 00:56:47 +0000

    openssh: clarify krb5 use in freebsd-configure
    
    freebsd-configure.sh runs configure twice, --with-kerberos5 and
    --without-kerberos5, in order to build a config.h that defaults to
    kerberos5 disabled, and a small config file that represents the
    differences.
    
    Rename config.h.orig to config.h.kerberos5 to clarify the intent of this
    script.
    
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 5e4dd21fd60958ceef4e4fd14b000844b957287e)
---
 crypto/openssh/freebsd-configure.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/openssh/freebsd-configure.sh b/crypto/openssh/freebsd-configure.sh
index fbc0f5139c88..b2ac309d86b0 100755
--- a/crypto/openssh/freebsd-configure.sh
+++ b/crypto/openssh/freebsd-configure.sh
@@ -30,14 +30,14 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
 # Generate config.h with krb5 and stash it
 sh configure $configure_args --with-kerberos5=/usr
-mv config.log config.log.orig
-mv config.h config.h.orig
+mv config.log config.log.kerberos5
+mv config.h config.h.kerberos5
 
 # Generate config.h without krb5
 sh configure $configure_args --without-kerberos5
 
 # Extract the difference
 echo '/* $Free''BSD$ */' > krb5_config.h
-diff -u config.h.orig config.h |
+diff -u config.h.kerberos5 config.h |
 	sed -n '/^-#define/s/^-//p' |
-	grep -Ff /dev/stdin config.h.orig >> krb5_config.h
+	grep -Ff /dev/stdin config.h.kerberos5 >> krb5_config.h