[v9_8]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 9f4c9dffd77abcfc3bc356f1ef6a794dfa87ecf5..86fb8834150ecc5f326158c5f845f1c9b8725f93 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 d02ec000eea61c1f47409b58f3cbc3bfc6dbf033..5184787cf29070230b62fdfd10ab7a19e33bc05f 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 c72fb2e330ed4380d0bb0b1e1e2d63dbf37b6c25..befcd7dc50a2e9f09f5a0c249d507177d5be6b0a 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -66,6 +66,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 3701b4d55e718e4fc0868cafe1e86a793de26411..d0a67c5236e737f7039167772689f6d40c363c8d 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -535,10 +535,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",
@@ -791,8 +791,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 7e18fa7d585873810a2e9d01d4ea7976e1e41f28..04ae3f121675e6dc3391cc876e1a3038592ed7fd 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
@@ -19270,6 +19271,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 8d1ed1e2f594a97ba26a3cb2f647b369b876daf1..03eaebb08914413e0d52eec63222f4ec4daa05d5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3239,6 +3239,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 6055febb1d719727fecbf04e7a26078561ba4596..7b2efa57ca58b1489a41a9a66a83065197c34145 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=8
 PATCHVER=5