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]

diff --git a/CHANGES b/CHANGES
index 335dfc3a9a4799524bcfbf282e9a38561db2204a..26126967c80e476a78a68bb43a7d864eb1665254 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 8402a2cda6f8cdaa47cb3fc738d0e3ea15cee7d0..b410589ebb1d9f57d7c915b142fac483bd50cebe 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@
@@ -120,6 +122,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 6d11859301190fd3b5528a8ae5f6e1f37c938205..407deeee3603a09189fbab0731b4b68f8d0b0f07 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -68,6 +68,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 a88e0d2f5a2d325c4e217ada810a2fb46becf141..258345bb57fabc45c0c99767d3c60f3d95b81c47 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -552,10 +552,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",
@@ -820,8 +820,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 06bca2d62f30362a2e864904b66bcdfb2508a200..b0e4c7ec7268ab107b8ad6e1d882ce461c53eaed 100755 (executable)
--- a/configure
+++ b/configure
@@ -1170,6 +1170,7 @@ BIND9_CONFIGARGS
 BIND9_SRCID
 BIND9_MAJOR
 BIND9_VERSION
+BIND9_PRODUCT
 BIND9_BIND9_BUILDINCLUDE
 BIND9_LWRES_BUILDINCLUDE
 BIND9_DNS_BUILDINCLUDE
@@ -19770,6 +19771,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}"
 
 BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"

diff --git a/configure.in b/configure.in
index 894fd2365035515ad26ca4faefd7f0a3d692a52e..8fe8f09fc2bb9a4b51adfda1b8ce78d95fa72c09 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3425,6 +3425,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)
 BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"

diff --git a/version b/version
index 634c3d1a0ada6449881b88ce005e051c59867772..b9f3f244bf86f845977b5f64ee8f263611056ec8 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=10
 PATCHVER=0