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!)

17 files changed, 32 insertions, 33 deletions

diff --git a/ldap/servers/plugins/syntaxes/bin.c b/ldap/servers/plugins/syntaxes/bin.c
index be423582..791f31c1 100644
--- a/ldap/servers/plugins/syntaxes/bin.c
+++ b/ldap/servers/plugins/syntaxes/bin.c
@@ -79,22 +79,22 @@ static char *fax_names[] = { "FAX", FAX_SYNTAX_OID, 0 };
  * a number of attributes in our default schema.  We should try to eliminate
  * it's use and remove support for it. */
 static Slapi_PluginDesc bin_pdesc = {
-	"bin-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+	"bin-syntax", VENDOR, PACKAGE_VERSION,
 	"binary attribute syntax plugin"
 };
 
 static Slapi_PluginDesc octetstring_pdesc = {
-	"octetstring-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+	"octetstring-syntax", VENDOR, PACKAGE_VERSION,
 	"octet string attribute syntax plugin"
 };
 
 static Slapi_PluginDesc jpeg_pdesc = {
-	"jpeg-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+	"jpeg-syntax", VENDOR, PACKAGE_VERSION,
 	"JPEG attribute syntax plugin"
 };
 
 static Slapi_PluginDesc fax_pdesc = {
-	"fax-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+	"fax-syntax", VENDOR, PACKAGE_VERSION,
 	"Fax attribute syntax plugin"
 };
 
diff --git a/ldap/servers/plugins/syntaxes/bitstring.c b/ldap/servers/plugins/syntaxes/bitstring.c
index 91f88846..d5eb7cc9 100644
--- a/ldap/servers/plugins/syntaxes/bitstring.c
+++ b/ldap/servers/plugins/syntaxes/bitstring.c
@@ -63,7 +63,7 @@ static int bitstring_validate(struct berval *val);
 /* the first name is the official one from RFC 4517 */
 static char *names[] = { "Bit String", "bitstring", BITSTRING_SYNTAX_OID, 0 };
 
-static Slapi_PluginDesc pdesc = { "bitstring-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "bitstring-syntax", VENDOR, PACKAGE_VERSION,
 	"Bit String attribute syntax plugin" };
 
 int
diff --git a/ldap/servers/plugins/syntaxes/ces.c b/ldap/servers/plugins/syntaxes/ces.c
index 68b642f0..07f9ba8c 100644
--- a/ldap/servers/plugins/syntaxes/ces.c
+++ b/ldap/servers/plugins/syntaxes/ces.c
@@ -69,11 +69,11 @@ static char *ia5_names[] = { "IA5String", "ces", "caseexactstring",
 /* the first name is the official one from RFC 2252 */
 static char *uri_names[] = { "URI", "1.3.6.1.4.1.4401.1.1.1",0};
 
-static Slapi_PluginDesc ia5_pdesc = { "ces-syntax", PLUGIN_MAGIC_VENDOR_STR,
-	PRODUCTTEXT, "caseExactString attribute syntax plugin" };
+static Slapi_PluginDesc ia5_pdesc = { "ces-syntax", VENDOR,
+	PACKAGE_VERSION, "caseExactString attribute syntax plugin" };
 
-static Slapi_PluginDesc uri_pdesc = { "uri-syntax", PLUGIN_MAGIC_VENDOR_STR,
-	PRODUCTTEXT, "uri attribute syntax plugin" };
+static Slapi_PluginDesc uri_pdesc = { "uri-syntax", VENDOR,
+	PACKAGE_VERSION, "uri attribute syntax plugin" };
 
 
 /*
diff --git a/ldap/servers/plugins/syntaxes/cis.c b/ldap/servers/plugins/syntaxes/cis.c
index 2af300ba..2a4c8027 100644
--- a/ldap/servers/plugins/syntaxes/cis.c
+++ b/ldap/servers/plugins/syntaxes/cis.c
@@ -153,31 +153,31 @@ n\" "
 
 
 static Slapi_PluginDesc dirstring_pdesc = { "directorystring-syntax",
-		PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+		VENDOR, PACKAGE_VERSION,
 		"DirectoryString attribute syntax plugin" };
 
 static Slapi_PluginDesc boolean_pdesc = { "boolean-syntax",
-		PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+		VENDOR, PACKAGE_VERSION,
 		"Boolean attribute syntax plugin" };
 
 static Slapi_PluginDesc time_pdesc = { "time-syntax",
-		PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+		VENDOR, PACKAGE_VERSION,
 		"GeneralizedTime attribute syntax plugin" };
 
 static Slapi_PluginDesc country_pdesc = { "countrystring-syntax",
-		PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+		VENDOR, PACKAGE_VERSION,
 		"Country String attribute syntax plugin" };
 
 static Slapi_PluginDesc postal_pdesc = { "postaladdress-syntax",
-		PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+		VENDOR, PACKAGE_VERSION,
 		"Postal Address attribute syntax plugin" };
 
 static Slapi_PluginDesc oid_pdesc = { "oid-syntax",
-		PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+		VENDOR, PACKAGE_VERSION,
 		"OID attribute syntax plugin" };
 
 static Slapi_PluginDesc printable_pdesc = { "printablestring-syntax",
-		PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+		VENDOR, PACKAGE_VERSION,
 		"Printable String attribtue syntax plugin" };
 
 
diff --git a/ldap/servers/plugins/syntaxes/deliverymethod.c b/ldap/servers/plugins/syntaxes/deliverymethod.c
index 0edb8ceb..62a41249 100644
--- a/ldap/servers/plugins/syntaxes/deliverymethod.c
+++ b/ldap/servers/plugins/syntaxes/deliverymethod.c
@@ -64,7 +64,7 @@ static int pdm_validate(const char *start, const char *end);
 /* the first name is the official one from RFC 4517 */
 static char *names[] = { "Delivery Method", "delivery", DELIVERYMETHOD_SYNTAX_OID, 0 };
 
-static Slapi_PluginDesc pdesc = { "delivery-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "delivery-syntax", VENDOR, PACKAGE_VERSION,
 	"Delivery Method attribute syntax plugin" };
 
 int
diff --git a/ldap/servers/plugins/syntaxes/dn.c b/ldap/servers/plugins/syntaxes/dn.c
index fbfb49f3..6ab62949 100644
--- a/ldap/servers/plugins/syntaxes/dn.c
+++ b/ldap/servers/plugins/syntaxes/dn.c
@@ -62,8 +62,8 @@ static int dn_validate( struct berval *val );
 /* the first name is the official one from RFC 2252 */
 static char *names[] = { "DN", DN_SYNTAX_OID, 0 };
 
-static Slapi_PluginDesc pdesc = { "dn-syntax", PLUGIN_MAGIC_VENDOR_STR,
-	PRODUCTTEXT, "distinguished name attribute syntax plugin" };
+static Slapi_PluginDesc pdesc = { "dn-syntax", VENDOR,
+	PACKAGE_VERSION, "distinguished name attribute syntax plugin" };
 
 int
 dn_init( Slapi_PBlock *pb )
diff --git a/ldap/servers/plugins/syntaxes/facsimile.c b/ldap/servers/plugins/syntaxes/facsimile.c
index c37a3604..fa604219 100644
--- a/ldap/servers/plugins/syntaxes/facsimile.c
+++ b/ldap/servers/plugins/syntaxes/facsimile.c
@@ -64,7 +64,7 @@ static int fax_parameter_validate(const char *start, const char *end);
 /* the first name is the official one from RFC 4517 */
 static char *names[] = { "Facsimile Telephone Number", "facsimile", FACSIMILE_SYNTAX_OID, 0 };
 
-static Slapi_PluginDesc pdesc = { "facsimile-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "facsimile-syntax", VENDOR, PACKAGE_VERSION,
 	"Facsimile Telephone Number attribute syntax plugin" };
 
 int
diff --git a/ldap/servers/plugins/syntaxes/guide.c b/ldap/servers/plugins/syntaxes/guide.c
index 90dd27a4..0b2e1742 100644
--- a/ldap/servers/plugins/syntaxes/guide.c
+++ b/ldap/servers/plugins/syntaxes/guide.c
@@ -70,11 +70,11 @@ static char *guide_names[] = { "Guide", "guide", GUIDE_SYNTAX_OID, 0 };
 static char *enhancedguide_names[] = { "Enhanced Guide", "enhancedguide",
 		ENHANCEDGUIDE_SYNTAX_OID, 0 };
 
-static Slapi_PluginDesc guide_pdesc = { "guide-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc guide_pdesc = { "guide-syntax", VENDOR, PACKAGE_VERSION,
 	"Guide attribute syntax plugin" };
 
 static Slapi_PluginDesc enhancedguide_pdesc = { "enhancedguide-syntax",
-		PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+		VENDOR, PACKAGE_VERSION,
 		"Enhanced Guide attribute syntax plugin" };
 
 int
diff --git a/ldap/servers/plugins/syntaxes/int.c b/ldap/servers/plugins/syntaxes/int.c
index 0372d3a6..2d98d066 100644
--- a/ldap/servers/plugins/syntaxes/int.c
+++ b/ldap/servers/plugins/syntaxes/int.c
@@ -62,8 +62,8 @@ static char *names[] = { "INTEGER", "int", INTEGER_SYNTAX_OID, 0 };
 #define INTEGERMATCH_OID "2.5.13.14"
 #define INTEGERORDERINGMATCH_OID "2.5.13.15"
 
-static Slapi_PluginDesc pdesc = { "int-syntax", PLUGIN_MAGIC_VENDOR_STR,
-	PRODUCTTEXT, "integer attribute syntax plugin" };
+static Slapi_PluginDesc pdesc = { "int-syntax", VENDOR,
+	PACKAGE_VERSION, "integer attribute syntax plugin" };
 
 static Slapi_MatchingRuleEntry
 integerMatch = { INTEGERMATCH_OID, NULL /* no alias? */,
diff --git a/ldap/servers/plugins/syntaxes/libsyntax.def b/ldap/servers/plugins/syntaxes/libsyntax.def
index b3da6a60..23dc0b7e 100644
--- a/ldap/servers/plugins/syntaxes/libsyntax.def
+++ b/ldap/servers/plugins/syntaxes/libsyntax.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 syntaxes Plugin'
+DESCRIPTION     'Dirsrv 1.0 syntaxes Plugin'
 EXPORTS
 	cis_init				@2
 	ces_init				@3
diff --git a/ldap/servers/plugins/syntaxes/nameoptuid.c b/ldap/servers/plugins/syntaxes/nameoptuid.c
index 2086aa97..fe28313b 100644
--- a/ldap/servers/plugins/syntaxes/nameoptuid.c
+++ b/ldap/servers/plugins/syntaxes/nameoptuid.c
@@ -63,7 +63,7 @@ static int nameoptuid_validate(struct berval *val);
 /* the first name is the official one from RFC 4517 */
 static char *names[] = { "Name And Optional UID", "nameoptuid", NAMEANDOPTIONALUID_SYNTAX_OID, 0 };
 
-static Slapi_PluginDesc pdesc = { "nameoptuid-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "nameoptuid-syntax", VENDOR, PACKAGE_VERSION,
 	"Name And Optional UID attribute syntax plugin" };
 
 int
diff --git a/ldap/servers/plugins/syntaxes/numericstring.c b/ldap/servers/plugins/syntaxes/numericstring.c
index 180f8f7d..2a38538f 100644
--- a/ldap/servers/plugins/syntaxes/numericstring.c
+++ b/ldap/servers/plugins/syntaxes/numericstring.c
@@ -63,8 +63,8 @@ static char *names[] = { "Numeric String", "numstr", NUMERICSTRING_SYNTAX_OID, 0
 #define NUMERICSTRINGORDERINGMATCH_OID	"2.5.13.9"
 #define NUMERICSTRINGSUBSTRINGMATCH_OID	"2.5.13.10"
 
-static Slapi_PluginDesc pdesc = { "numstr-syntax", PLUGIN_MAGIC_VENDOR_STR,
-	PRODUCTTEXT, "numeric string attribute syntax plugin" };
+static Slapi_PluginDesc pdesc = { "numstr-syntax", VENDOR,
+	PACKAGE_VERSION, "numeric string attribute syntax plugin" };
 
 static Slapi_MatchingRuleEntry
 numericStringMatch = { NUMERICSTRINGMATCH_OID, NULL /* no alias? */,
diff --git a/ldap/servers/plugins/syntaxes/sicis.c b/ldap/servers/plugins/syntaxes/sicis.c
index 07fee069..bcc80c0a 100644
--- a/ldap/servers/plugins/syntaxes/sicis.c
+++ b/ldap/servers/plugins/syntaxes/sicis.c
@@ -69,7 +69,7 @@ static char *names[] = { "SpaceInsensitiveString",
 		SPACE_INSENSITIVE_STRING_SYNTAX_OID, 0 };
 
 static Slapi_PluginDesc pdesc = { "spaceinsensitivestring-syntax",
-	PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+	VENDOR, PACKAGE_VERSION,
 	"space insensitive string attribute syntax plugin" };
 
 int
diff --git a/ldap/servers/plugins/syntaxes/syntax.h b/ldap/servers/plugins/syntaxes/syntax.h
index 865fc8b7..4007028f 100644
--- a/ldap/servers/plugins/syntaxes/syntax.h
+++ b/ldap/servers/plugins/syntaxes/syntax.h
@@ -49,7 +49,6 @@
 
 #include "slap.h"
 #include "slapi-plugin.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
 
 #define SYNTAX_CIS		1
 #define SYNTAX_CES		2
diff --git a/ldap/servers/plugins/syntaxes/tel.c b/ldap/servers/plugins/syntaxes/tel.c
index 3a2edd68..8ea3f9e7 100644
--- a/ldap/servers/plugins/syntaxes/tel.c
+++ b/ldap/servers/plugins/syntaxes/tel.c
@@ -63,7 +63,7 @@ static int tel_validate(struct berval *val);
 /* the first name is the official one from RFC 2252 */
 static char *names[] = { "TelephoneNumber", "tel", TELEPHONE_SYNTAX_OID, 0 };
 
-static Slapi_PluginDesc pdesc = { "tele-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "tele-syntax", VENDOR, PACKAGE_VERSION,
 	"telephoneNumber attribute syntax plugin" };
 
 int
diff --git a/ldap/servers/plugins/syntaxes/teletex.c b/ldap/servers/plugins/syntaxes/teletex.c
index da9e7fe2..683af9f6 100644
--- a/ldap/servers/plugins/syntaxes/teletex.c
+++ b/ldap/servers/plugins/syntaxes/teletex.c
@@ -64,7 +64,7 @@ static int ttx_param_validate(const char *start, const char *end);
 /* the first name is the official one from RFC 4517 */
 static char *names[] = { "Teletex Terminal Identifier", "teletextermid", TELETEXTERMID_SYNTAX_OID, 0 };
 
-static Slapi_PluginDesc pdesc = { "teletextermid-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "teletextermid-syntax", VENDOR, PACKAGE_VERSION,
 	"Teletex Terminal Identifier attribute syntax plugin" };
 
 int
diff --git a/ldap/servers/plugins/syntaxes/telex.c b/ldap/servers/plugins/syntaxes/telex.c
index e51f2f73..ed56ef45 100644
--- a/ldap/servers/plugins/syntaxes/telex.c
+++ b/ldap/servers/plugins/syntaxes/telex.c
@@ -63,7 +63,7 @@ static int telex_validate(struct berval *val);
 /* the first name is the official one from RFC 4517 */
 static char *names[] = { "Telex Number", "telexnumber", TELEXNUMBER_SYNTAX_OID, 0 };
 
-static Slapi_PluginDesc pdesc = { "telex-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "telex-syntax", VENDOR, PACKAGE_VERSION,
 	"Telex Number attribute syntax plugin" };
 
 int