[v9_9]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 ee6bd713544e1f4b65499f092416d068d813229a..9bf9d9421cd631aba236e07d66cc3b58cc6e2c3f 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 0e10e369ff21ff404dc28addae41acbc5f510019..19bdb8e9f3a94835651541ea5091c861ee24ba5d 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@
@@ -116,6 +118,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 56a30fe6eacf16f4a2b83501ed78ced53a00d237..b7c78b31b18b2db0f4cda50155a732ee2c3be98a 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -67,6 +67,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 dae567093694768b19247a53095e334dee90eb92..d0f9c2c0d7e5cf2da5d3825f6dcfaec0b562ce52 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -540,10 +540,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);
 #ifdef OPENSSL
                        printf("using OpenSSL version: %s\n",
@@ -808,8 +808,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 d7ea837a2ff7bf9914c4afceed17350565ea5074..f1e0c6b3b0d6daa06058c238ce08b76b322e94a4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1169,6 +1169,7 @@ SO
 BIND9_CONFIGARGS
 BIND9_SRCID
 BIND9_VERSION
+BIND9_PRODUCT
 BIND9_BIND9_BUILDINCLUDE
 BIND9_LWRES_BUILDINCLUDE
 BIND9_DNS_BUILDINCLUDE
@@ -19508,6 +19509,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 f0a2b6f032e06d2fa2bb497a48488316b3baa27b..bc085d4adecb9d4b2f9da20de8bdb2204a3a7461 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3338,6 +3338,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 d0c5a361062ba3cb2f4571e0d0a5a6645f07cc44..0fec214aa269314f4c155b2f6a1dac484661c2a6 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=9
 PATCHVER=3