Change default branding to 389 - remove lite code

The vendor, brand, and capbrand are set in configure - we should use those
everywhere rather than have to run some sort of script over the code to
change vendor, brand, version, etc.  I've added VENDOR, BRAND, CAPBRAND
to the default defines passed to the compiler, and changed the code to use
these defines.  And instead of the unintuitively named PRODUCTTEXT macro,
we should use the already defined PRODUCT_VERSION.
This allowed me to get rid of some code.  The version was from a generated
file called dirver.h which we don't need anymore, and we don't need the perl
script dirver.pl which generated it.
The vendor string was coming from the dirlite header file.  So I also used this
as an excuse to get rid of all references to dirlite once and for all (yay!).
For the places in plain text files which are not substituted, I just used the
generic name Dirsrv or Directory Server instead of having an explicit brand
and/or version in there.

Reviewed by: nkinder (Thanks!)

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/libsi18n/getstrmem.h b/lib/libsi18n/getstrmem.h
index cbdcbd17..937885bc 100644
--- a/lib/libsi18n/getstrmem.h
+++ b/lib/libsi18n/getstrmem.h
@@ -92,7 +92,7 @@ static char* userforms[] = {
   "",
   "Error: could not open servers list file.<p>\n",
   "Error: could not open %s server list file.<p>\n",
-  "Fedora Server Account",
+  CAPBRAND " Server Account",
   "Server Account Management for %s",
   "Server Account Management",
   emptyString };
@@ -508,7 +508,7 @@ static char* httpdaemon[] = {
   "warning: daemon is running as super-user\n",
   "could not determine current user name\n",
   "error: chroot to %s failed (%s)\n",
-  "WARNING! Fedora executable and library have different versions.\n",
+  "WARNING! " CAPBRAND " executable and library have different versions.\n",
   "startup: listening to %s://%s, port %d as %s\n",
   "startup: listening to %s://%s, port %d as %s\n",
   "seminit failed (%s)\n",
@@ -856,7 +856,7 @@ static char* base[] = {
   "unable to allocate hash entry",
   "cache_insert: unable to create cache entry",
   "HTTP/1.0 200 OK\nContent-type: text/html\n\n",
-  "<H2>Fedora cache status report</H2>\n",
+  "<H2>" CAPBRAND " cache status report</H2>\n",
   "No caches on system<P>",
   "<H2>%s cache</H2>\n",
   "Cache hit ratio: %d/%d (%f)</P>\n</P>\n",
@@ -891,7 +891,7 @@ static char* base[] = {
   "error getting processor info for processor %d",
   "Error binding to processor %d",
   "bound process %d to processor %d",
-  "Fedora server is not explicitly binding to any processors.",
+  CAPBRAND " server is not explicitly binding to any processors.",
   "cache monitor exited",
   "cache batch update daemon exited",
   "Using single threaded accepts.",
@@ -900,7 +900,7 @@ static char* base[] = {
   "This machine has %d processors.",
   "Error calling thr_seconcurrency(%d)- (%s)",
   "Set conncurrency to %d.",
-  "WARNING! Fedora executable and library have different versions.\n",
+  "WARNING! " CAPBRAND " executable and library have different versions.\n",
   "",
   "",
   "seminit failed (%s)\n",
@@ -966,7 +966,7 @@ static char* base[] = {
   "dns-cache-insert: malloc failure",
   "successful server startup",
   "%s B%s",
-  "Fedora executable and shared library have different versions",
+  CAPBRAND " executable and shared library have different versions",
   "   executable version is %s",
   "   shared library version is %s",
   "error reporting shutting down",