[master] add product description

3568.	[cleanup]	Add a product description line to the version file,
			to be reported by named -v/-V. [RT #33366]

diff --git a/CHANGES b/CHANGES
index 8920efbb610d892623e7e32da018d1a902c7229b..40c2c47e7c9c481bdace490acc00552e23ba1edc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3568.  [cleanup]       Add a product description line to the version file,
+                       to be reported by named -v/-V. [RT #33366]
+
 3567.  [bug]           Silence clang static analyzer warnings. [RT #33365]
 
 3566.  [func]          Log when forwarding updates to master. [RT #33240]

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index b410589ebb1d9f57d7c915b142fac483bd50cebe..020d19c03c3e1e3f2e5a2a27d36b781605a4171c 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -23,6 +23,8 @@ top_srcdir =  @top_srcdir@
 
 @BIND9_PRODUCT@
 
+@BIND9_DESCRIPTION@
+
 @BIND9_SRCID@
 
 @BIND9_CONFIGARGS@
@@ -123,6 +125,7 @@ main.@O@: main.c
        ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
                -DVERSION=\"${VERSION}\" \
                -DPRODUCT=\"${PRODUCT}\" \
+               -DDESCRIPTION=\"${DESCRIPTION}\" \
                -DSRCID=\"${SRCID}\" \
                -DCONFIGARGS="\"${CONFIGARGS}\"" \
                -DNS_LOCALSTATEDIR=\"${localstatedir}\" \

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index dfa0647b90ea7c9d242bc1618e7dd81b4213d768..5e30b494532c5837888382717291e848f83c06ee 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -69,6 +69,7 @@ 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_description        INIT(DESCRIPTION);
 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 fdabbbe0c4372546ce141fec3cd938504f2577d0..39efe3f92f5c0fdb1552bff94f21485280028954 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -562,11 +562,17 @@ parse_command_line(int argc, char *argv[]) {
                        ns_g_username = isc_commandline_argument;
                        break;
                case 'v':
-                       printf("%s %s\n", ns_g_product, ns_g_version);
+                       printf("%s %s", ns_g_product, ns_g_version);
+                       if (*ns_g_description != 0)
+                               printf(" %s", ns_g_description);
+                       printf("\n");
                        exit(0);
                case 'V':
-                       printf("%s %s <id:%s> built with %s\n", ns_g_product,
-                              ns_g_version, ns_g_srcid, ns_g_configargs);
+                       printf("%s %s", ns_g_product, ns_g_version);
+                       if (*ns_g_description != 0)
+                               printf(" %s", ns_g_description);
+                       printf(" <id:%s> built with %s\n", ns_g_srcid,
+                               ns_g_configargs);
 #ifdef OPENSSL
                        printf("using OpenSSL version: %s\n",
                               OPENSSL_VERSION_TEXT);

diff --git a/configure b/configure
index 25050c96d1143c7703be6c76858ea3584fb44033..b60bb9984745598eca58058afc766b0f7afef906 100755 (executable)
--- a/configure
+++ b/configure
@@ -1170,6 +1170,7 @@ BIND9_CONFIGARGS
 BIND9_SRCID
 BIND9_MAJOR
 BIND9_VERSION
+BIND9_DESCRIPTION
 BIND9_PRODUCT
 BIND9_BIND9_BUILDINCLUDE
 BIND9_LWRES_BUILDINCLUDE
@@ -19761,6 +19762,8 @@ BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 . $srcdir/version
 BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""
 
+BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\""
+
 BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}"
 
 BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"

diff --git a/configure.in b/configure.in
index be8cdb14b8b02fdd2039e4f543a50cae4cd13501..62ba467ba7a2cff3360df3774b003f8174f8c21b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3420,6 +3420,8 @@ BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 . $srcdir/version
 BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""
 AC_SUBST(BIND9_PRODUCT)
+BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\""
+AC_SUBST(BIND9_DESCRIPTION)
 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 b9f3f244bf86f845977b5f64ee8f263611056ec8..bec2eb5eff3bb872ed0dc2b712d1bb12b4734b2d 100644 (file)
--- a/version
+++ b/version
@@ -4,6 +4,7 @@
 # configure.
 #
 PRODUCT=BIND
+DESCRIPTION=
 MAJORVER=9
 MINORVER=10
 PATCHVER=0