From 90cc42d02563ff0d41dc27ae8736cf167f97cf26 Mon Sep 17 00:00:00 2001
From: Curtis Blackburn <ckb@isc.org>
Date: Fri, 1 Mar 2013 16:31:37 -0600
Subject: [PATCH] [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)

---
 CHANGES                           | 4 ++++
 bin/named/Makefile.in             | 3 +++
 bin/named/include/named/globals.h | 1 +
 bin/named/main.c                  | 8 ++++----
 configure                         | 3 +++
 configure.in                      | 2 ++
 version                           | 1 +
 7 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index daef0c7bb7..9f42962929 100644
--- 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 b20f8a9d6e..892725338b 100644
--- 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 d5362a39af..a2bbad75ef 100644
--- 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 8de92faa55..f60d185a7b 100644
--- 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 102e213846..eca4989af1 100755
--- 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 cb62b01201..7dfd6b18de 100644
--- 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 2e66fdc836..2670399fef 100644
--- 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=