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, 17 insertions, 17 deletions

diff --git a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
index 77fe4762..7f5c2d6f 100644
--- a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
+++ b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
@@ -180,7 +180,7 @@ Severity=Success
 Facility=Startup
 SymbolicName=MSG_SERVER_STARTED
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 The directory server has successfully started.
 .
 MessageId=0x2
@@ -188,7 +188,7 @@ Severity=Success
 Facility=Slapd
 SymbolicName=MSG_SERVER_SHUTDOWN
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 The directory server has shutdown.
 .
 MessageId=0x3
@@ -196,7 +196,7 @@ Severity=Success
 Facility=Slapd
 SymbolicName=MSG_SERVER_STOPPED
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 The directory server has stopped.
 .
 MessageId=0x4
@@ -204,7 +204,7 @@ Severity=Success
 Facility=Startup
 SymbolicName=MSG_SERVER_STARTING
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 The directory server is starting.
 .
 MessageId=0x5
@@ -212,7 +212,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_SERVER_START_FAILED
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 The directory server has failed on startup. %2
 .
 MessageId=0x6
@@ -220,7 +220,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_SERVER_START_FAILED_CTRL_HANDLER
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 The directory server has failed on startup. Failed to Register with Service Control handler.
 .
 MessageId=0x7
@@ -228,7 +228,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_SERVER_PASSWORD_DIALOG_FAILED
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 The directory server failed to create the Key Database Passphrase dialog.
 .
 MessageId=0x8
@@ -236,7 +236,7 @@ Severity=Error
 Facility=Registry
 SymbolicName=MSG_WD_REGISTRY
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 Could not open registry key: %2
 .
 MessageId=0x9
@@ -244,7 +244,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_BADCMDLINE
 Language=English
-Fedora Directory Server: %1
+Directory Server: %1
 Invalid command line specified: %2
 .
 MessageId=0xA
@@ -252,7 +252,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_BADPASSWORD
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 Incorrect SSL password entered.
 .
 MessageId=0xB
@@ -260,7 +260,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_STRING
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 %2
 .
 MessageId=0xC
@@ -268,7 +268,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_STARTFAILED
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 The directory server could not be started.
 Command line used: %2
 .
@@ -277,7 +277,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_WD_RESTART
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 The directory server terminated abnormally with error code %2.
 An attempt will be made to restart it.
 .
@@ -286,7 +286,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_CRON_STARTFAILED
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 The scheduled job (%2) could not be started.
 .
 MessageId=0xF
@@ -294,7 +294,7 @@ Severity=Error
 Facility=Slapd
 SymbolicName=MSG_SERVER_SHUTDOWN_STARTING
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 The directory server is shutting down.
 .
 MessageId=0x10
@@ -302,7 +302,7 @@ Severity=Error
 Facility=Startup
 SymbolicName=MSG_SERVER_KEYDB_PASSPHRASE_WRONG
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 The specified key database passphrase is incorrect.
 .
 MessageId=0x11
@@ -310,6 +310,6 @@ Severity=Error
 Facility=Slapd
 SymbolicName=MSG_SERVER_FAILED_TO_WRITE_LOG
 Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
 Failed to write log: %2.
 .