[v9_6]3509. [cleanup] Added a product line to version file to allow for

                        easy naming of different products (BIND
                        vs BIND ESV, for example). [RT #32755]
(cherry picked from commit 53a4e18582ae0c50f3742d2f6b684231a50be038)

diff --git a/CHANGES b/CHANGES
index daef0c7bb7e96ca469322782895c8236f5b90e2b..9f42962929b9987b2e57707234e3229b9e0952ea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3509.  [cleanup]       Added a product line to version file to allow for
+                       easy naming of different products (BIND
+                       vs BIND ESV, for example). [RT #32755]
+
 3508.  [contrib]       queryperf was incorrectly rejecting the -T option.
                        [RT #32338]
 

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index b20f8a9d6ef43f9c17a4e4d97d12547b310e5256..892725338b14bfa80779df1ee0faa591049015db 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -21,6 +21,8 @@ top_srcdir =  @top_srcdir@
 
 @BIND9_VERSION@
 
+@BIND9_PRODUCT@
+
 @BIND9_SRCID@
 
 @BIND9_CONFIGARGS@
@@ -109,6 +111,7 @@ MANOBJS =   ${MANPAGES} ${HTMLPAGES}
 main.@O@: main.c
        ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
                -DVERSION=\"${VERSION}\" \
+               -DPRODUCT=\"${PRODUCT}\" \
                -DSRCID=\"${SRCID}\" \
                -DCONFIGARGS="\"${CONFIGARGS}\"" \
                -DNS_LOCALSTATEDIR=\"${localstatedir}\" \

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index d5362a39af0dfc7d04f37b239dfb7a75884fce08..a2bbad75efb4fdc2fa1e5020abe9a2fee70c77e5 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -63,6 +63,7 @@ EXTERN isc_timermgr_t *               ns_g_timermgr           INIT(NULL);
 EXTERN isc_socketmgr_t *       ns_g_socketmgr          INIT(NULL);
 EXTERN cfg_parser_t *          ns_g_parser             INIT(NULL);
 EXTERN const char *            ns_g_version            INIT(VERSION);
+EXTERN const char *            ns_g_product            INIT(PRODUCT);
 EXTERN const char *            ns_g_srcid              INIT(SRCID);
 EXTERN const char *            ns_g_configargs         INIT(CONFIGARGS);
 EXTERN in_port_t               ns_g_port               INIT(0);

diff --git a/bin/named/main.c b/bin/named/main.c
index 8de92faa5573c3a1d9b605bf5582c7202b7a95f5..f60d185a7b9cd84b914d3545903f3e4decdc11f3 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -474,10 +474,10 @@ parse_command_line(int argc, char *argv[]) {
                        ns_g_username = isc_commandline_argument;
                        break;
                case 'v':
-                       printf("BIND %s\n", ns_g_version);
+                       printf("%s %s\n", ns_g_product, ns_g_version);
                        exit(0);
                case 'V':
-                       printf("BIND %s <id:%s> built with %s\n",
+                       printf("%s %s <id:%s> built with %s\n", ns_g_product,
                               ns_g_version, ns_g_srcid, ns_g_configargs);
                        exit(0);
                case '?':
@@ -689,8 +689,8 @@ setup(void) {
                                   isc_result_totext(result));
 
        isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
-                     ISC_LOG_NOTICE, "starting BIND %s%s", ns_g_version,
-                     saved_command_line);
+                     ISC_LOG_NOTICE, "starting %s %s%s", ns_g_product, 
+                     ns_g_version, saved_command_line);
 
        isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
                      ISC_LOG_NOTICE, "built with %s", ns_g_configargs);

diff --git a/configure b/configure
index 102e2138465c9062899fc82070e4d927944fac0c..eca4989af1c2c321c7ac9a301a79cd749353c64f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1165,6 +1165,7 @@ PG_CONFIG
 BIND9_CONFIGARGS
 BIND9_SRCID
 BIND9_VERSION
+BIND9_PRODUCT
 BIND9_BIND9_BUILDINCLUDE
 BIND9_LWRES_BUILDINCLUDE
 BIND9_DNS_BUILDINCLUDE
@@ -18635,6 +18636,8 @@ BIND9_MAKE_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes
 BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 
 . $srcdir/version
+BIND9_PRODUCT="PRODUCT=${PRODUCT}"
+
 BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}"
 
 

diff --git a/configure.in b/configure.in
index cb62b012016a52a55dccddae49a833bd9367aad4..7dfd6b18dee4ec44a09153ad3a1851ebc730069c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2828,6 +2828,8 @@ AC_SUBST_FILE(BIND9_MAKE_RULES)
 BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 
 . $srcdir/version
+BIND9_PRODUCT="PRODUCT=${PRODUCT}"
+AC_SUBST(BIND9_PRODUCT)
 BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}"
 AC_SUBST(BIND9_VERSION)
 

diff --git a/version b/version
index 2e66fdc836d4629f82b810eaca4b99f975d60ccb..2670399fef27be5b4ab70f91328abfe768243226 100644 (file)
--- a/version
+++ b/version
@@ -3,6 +3,7 @@
 # This file must follow /bin/sh rules.  It is imported directly via
 # configure.
 #
+PRODUCT=BIND
 MAJORVER=9
 MINORVER=6
 PATCHVER=