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

74 files changed, 111 insertions, 283 deletions

diff --git a/ldap/servers/plugins/acl/aclplugin.c b/ldap/servers/plugins/acl/aclplugin.c
index b8cefb17..f2b9f0f8 100644
--- a/ldap/servers/plugins/acl/aclplugin.c
+++ b/ldap/servers/plugins/acl/aclplugin.c
@@ -46,10 +46,8 @@
  *
  */
 #include "acl.h"
-#include "dirver.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
 
-static Slapi_PluginDesc pdesc = { "acl", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "acl access check plugin" };
+static Slapi_PluginDesc pdesc = { "acl", VENDOR, PACKAGE_VERSION, "acl access check plugin" };
 char *plugin_name = ACL_PLUGIN_NAME;
 
 /* Prototypes */
diff --git a/ldap/servers/plugins/acl/libacl.def b/ldap/servers/plugins/acl/libacl.def
index b436696b..e9eefc39 100644
--- a/ldap/servers/plugins/acl/libacl.def
+++ b/ldap/servers/plugins/acl/libacl.def
@@ -38,7 +38,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 ACL Plugin'
+DESCRIPTION     'Dirsrv 1.0 ACL Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/bitwise/bitwise.c b/ldap/servers/plugins/bitwise/bitwise.c
index fb70fcfa..7dbdc1f0 100644
--- a/ldap/servers/plugins/bitwise/bitwise.c
+++ b/ldap/servers/plugins/bitwise/bitwise.c
@@ -187,7 +187,7 @@ bitwise_filter_create (Slapi_PBlock* pb)
     return LDAP_SUCCESS;
 }
 
-static Slapi_PluginDesc pdesc = { "bitwise", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "bitwise", VENDOR, PACKAGE_VERSION,
               "bitwise match plugin" };
 
 int /* LDAP error code */
diff --git a/ldap/servers/plugins/chainingdb/cb.h b/ldap/servers/plugins/chainingdb/cb.h
index 263b2b5a..d787c0cb 100644
--- a/ldap/servers/plugins/chainingdb/cb.h
+++ b/ldap/servers/plugins/chainingdb/cb.h
@@ -52,8 +52,6 @@
 #include "slapi-plugin.h"
 #include "slapi-private.h"
 #include "portable.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
 
 /* Constants */
 
diff --git a/ldap/servers/plugins/chainingdb/cb_init.c b/ldap/servers/plugins/chainingdb/cb_init.c
index 078c7cde..0f12d3b0 100644
--- a/ldap/servers/plugins/chainingdb/cb_init.c
+++ b/ldap/servers/plugins/chainingdb/cb_init.c
@@ -43,8 +43,8 @@
 #include "cb.h"
 
 Slapi_PluginDesc chainingdbdesc = { CB_PLUGIN_NAME,
-				    PLUGIN_MAGIC_VENDOR_STR,
-				    PRODUCTTEXT,
+				    VENDOR,
+				    PACKAGE_VERSION,
 				    CB_PLUGIN_DESCRIPTION };
 
 
diff --git a/ldap/servers/plugins/chainingdb/libcb.def b/ldap/servers/plugins/chainingdb/libcb.def
index 47c7ce80..b38527bc 100644
--- a/ldap/servers/plugins/chainingdb/libcb.def
+++ b/ldap/servers/plugins/chainingdb/libcb.def
@@ -38,7 +38,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 Chaining Database Plugin'
+DESCRIPTION     'Dirsrv 1.0 Chaining Database Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/collation/collate.h b/ldap/servers/plugins/collation/collate.h
index 0f5110ef..e0667b1f 100644
--- a/ldap/servers/plugins/collation/collate.h
+++ b/ldap/servers/plugins/collation/collate.h
@@ -45,7 +45,6 @@
 #define _COLLATE_H_
 
 #include <stddef.h> /* size_t */
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
 
 struct indexer_t;
 
diff --git a/ldap/servers/plugins/collation/collation.def b/ldap/servers/plugins/collation/collation.def
index 397c86c8..e62011bb 100644
--- a/ldap/servers/plugins/collation/collation.def
+++ b/ldap/servers/plugins/collation/collation.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 Collation Plugin'
+DESCRIPTION     'Dirsrv 1.0 Collation Plugin'
 EXPORTS
 	orderingRule_init	@2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/collation/orfilter.c b/ldap/servers/plugins/collation/orfilter.c
index 9e072626..ed2ffe27 100644
--- a/ldap/servers/plugins/collation/orfilter.c
+++ b/ldap/servers/plugins/collation/orfilter.c
@@ -969,7 +969,7 @@ or_indexer_create (Slapi_PBlock* pb)
     return rc;
 }
 
-static Slapi_PluginDesc pdesc = { "orderingrule", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "orderingrule", VENDOR, PACKAGE_VERSION,
               "internationalized ordering rule plugin" };
 
 #define SLAPI_ORPLUGIN_NAME	pdesc.spd_description
diff --git a/ldap/servers/plugins/cos/cos.c b/ldap/servers/plugins/cos/cos.c
index 2a4f8810..79351103 100644
--- a/ldap/servers/plugins/cos/cos.c
+++ b/ldap/servers/plugins/cos/cos.c
@@ -46,8 +46,6 @@
 #include "nspr.h"
 #include "slapi-plugin.h"
 #include "slapi-private.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
 #include "cos_cache.h"
 #include "vattr_spi.h"
 
@@ -134,7 +132,7 @@ int cos_close( Slapi_PBlock *pb );
 int cos_post_op( Slapi_PBlock *pb );
 
 
-static Slapi_PluginDesc pdesc = { "cos", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "cos", VENDOR, PACKAGE_VERSION,
 	"class of service plugin" };
 
 static void * cos_plugin_identity = NULL;
diff --git a/ldap/servers/plugins/cos/cos.def b/ldap/servers/plugins/cos/cos.def
index a1906ba9..6e285a9f 100644
--- a/ldap/servers/plugins/cos/cos.def
+++ b/ldap/servers/plugins/cos/cos.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 Class Of Service Plugin'
+DESCRIPTION     'Dirsrv 1.0 Class Of Service Plugin'
 EXPORTS
 	cos_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/cos/cos_cache.c b/ldap/servers/plugins/cos/cos_cache.c
index e46e0ab3..a14e48ce 100644
--- a/ldap/servers/plugins/cos/cos_cache.c
+++ b/ldap/servers/plugins/cos/cos_cache.c
@@ -71,8 +71,6 @@
 #include <string.h>
 #include "portable.h"
 #include "slapi-plugin.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
 
 /* this is naughty, but the api for backend state change is currently here */
 #include "slapi-private.h"
diff --git a/ldap/servers/plugins/deref/deref.c b/ldap/servers/plugins/deref/deref.c
index a2428496..306988fa 100644
--- a/ldap/servers/plugins/deref/deref.c
+++ b/ldap/servers/plugins/deref/deref.c
@@ -44,8 +44,6 @@
  */
 #include <string.h>
 #include "deref.h"
-#include "dirlite_strings.h"
-#include "dirver.h"
 #include <nspr.h>
 
 #ifndef DN_SYNTAX_OID
@@ -60,8 +58,8 @@ static char *_PluginDN = NULL;
 static int g_plugin_started = 0;
 
 static Slapi_PluginDesc pdesc = { DEREF_FEATURE_DESC,
-                                  PLUGIN_MAGIC_VENDOR_STR,
-                                  PRODUCTTEXT,
+                                  VENDOR,
+                                  PACKAGE_VERSION,
                                   DEREF_PLUGIN_DESC };
 
 /*
diff --git a/ldap/servers/plugins/distrib/README b/ldap/servers/plugins/distrib/README
index fddf4f30..80f71a5e 100644
--- a/ldap/servers/plugins/distrib/README
+++ b/ldap/servers/plugins/distrib/README
@@ -38,11 +38,9 @@
 
                    ----------------------------
                  Sample pluggable distribution logic
-                     for Netscape Directory Server
                    ----------------------------
 
-This directory contains code for some sample server plug-ins intended for
-use with the Fedora Directory Server 1.  
+This directory contains code for some sample server plug-ins.  
 
     NOTE: Before you compile and run these examples, make sure 
     to change any server-specific data in the examples to  
diff --git a/ldap/servers/plugins/distrib/libdistrib.def b/ldap/servers/plugins/distrib/libdistrib.def
index d8a0b02c..f3c4cd5f 100644
--- a/ldap/servers/plugins/distrib/libdistrib.def
+++ b/ldap/servers/plugins/distrib/libdistrib.def
@@ -35,7 +35,7 @@
 ; Copyright (C) 2005 Red Hat, Inc.
 ; All rights reserved.
 ; --- END COPYRIGHT BLOCK ---
-DESCRIPTION 	'Fedora Directory Server 1.0 distribution logic example'
+DESCRIPTION 	'Dirsrv 1.0 distribution logic example'
 EXPORTS
 	alpha_distribution @1
 	hash_distribution @2
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
index b8e21f0e..d35cd8c5 100644
--- a/ldap/servers/plugins/dna/dna.c
+++ b/ldap/servers/plugins/dna/dna.c
@@ -50,8 +50,6 @@
 #include "portable.h"
 #include "nspr.h"
 #include "slapi-private.h"
-#include "dirlite_strings.h"
-#include "dirver.h"
 #include "prclist.h"
 
 /* Required to get portable printf/scanf format macros */
@@ -124,13 +122,13 @@
 #define DNA_EXTEND_EXOP_RESPONSE_OID "2.16.840.1.113730.3.5.11"
 
 static Slapi_PluginDesc pdesc = { DNA_FEATURE_DESC,
-                                  PLUGIN_MAGIC_VENDOR_STR,
-                                  PRODUCTTEXT,
+                                  VENDOR,
+                                  PACKAGE_VERSION,
                                   DNA_PLUGIN_DESC };
 
 static Slapi_PluginDesc exop_pdesc = { DNA_EXOP_FEATURE_DESC,
-                                       PLUGIN_MAGIC_VENDOR_STR,
-                                       PRODUCTTEXT,
+                                       VENDOR,
+                                       PACKAGE_VERSION,
                                        DNA_EXOP_DESC };
 
 
diff --git a/ldap/servers/plugins/http/http_client.c b/ldap/servers/plugins/http/http_client.c
index 814e8d1f..22033273 100644
--- a/ldap/servers/plugins/http/http_client.c
+++ b/ldap/servers/plugins/http/http_client.c
@@ -53,8 +53,6 @@
 
 #include "slapi-plugin.h"
 #include "slapi-private.h"
-#include "dirlite_strings.h"
-#include "dirver.h"
 
 #include "http_client.h"
 #include "http_impl.h"
@@ -122,8 +120,8 @@ static void *api[7];
  * Plugin identifiers
  */
 static Slapi_PluginDesc pdesc = { "http-client",
-								  PLUGIN_MAGIC_VENDOR_STR,
-								  PRODUCTTEXT,
+								  VENDOR,
+								  PACKAGE_VERSION,
 								  "HTTP Client plugin" };
 
 static Slapi_ComponentId *plugin_id = NULL;
diff --git a/ldap/servers/plugins/http/http_impl.c b/ldap/servers/plugins/http/http_impl.c
index 29a91c13..c9e82be3 100644
--- a/ldap/servers/plugins/http/http_impl.c
+++ b/ldap/servers/plugins/http/http_impl.c
@@ -207,8 +207,6 @@ static int readConfigLDAPurl(Slapi_ComponentId *plugin_id, char *plugindn);
 static int parseHTTPConfigEntry(Slapi_Entry *e);
 static int parseConfigEntry(Slapi_Entry *e);
 
-static int nssReinitializationRequired();
-
 /*SSL functions */
 PRFileDesc* setupSSLSocket(PRFileDesc* fd);
 
@@ -257,8 +255,6 @@ static int doRequest(const char *url, httpheader **httpheaderArray, char *body,
 
 	char *host = NULL;
 	char *path = NULL;
-	char *val = NULL;
-	char *defaultprefix = NULL;
    	PRFileDesc *fd = NULL;
 	PRNetAddr addr;
 	PRInt32 port;
@@ -315,49 +311,6 @@ static int doRequest(const char *url, httpheader **httpheaderArray, char *body,
     setTCPNoDelay(fd);
 
     if (sslOn) {
-	
-		/* Have to reinitialize NSS is the DS security is set to off.
-		This is because the HTTPS required the cert dbs to be created.
-		The default prefixes are used as per DS norm */
-
-		if (PL_strcasecmp(httpConfig->DS_sslOn, "off") == 0) {	
-			if (!httpConfig->nssInitialized) {
-				if (nssReinitializationRequired())
-				{
-					PRInt32 nssStatus;
-					PRUint32 nssFlags = 0;
-					char certDir[1024];
-					char certPref[1024];
-					char keyPref[1024];
-
-					NSS_Shutdown();
-					nssFlags &= (~NSS_INIT_READONLY);
-       				val = config_get_certdir();
-       				PL_strncpyz(certDir, val, sizeof(certDir));
-					defaultprefix = strrchr(certDir, '/');
-					if (!defaultprefix)
-    						defaultprefix = strrchr(certDir, '\\');
-					if (!defaultprefix) /* still could not find it . . . */
-    						goto bail; /* . . . can't do anything */
-					defaultprefix++;
-					PR_snprintf(certPref, 1024, "%s-",defaultprefix);
-					PL_strncpyz(keyPref, certPref, sizeof(keyPref));
-       				nssStatus = NSS_Initialize(certDir, certPref, keyPref, "secmod.db", nssFlags);
-					slapi_ch_free((void **)&val);
-		
-   					if (nssStatus != 0) {
-   	    	 	 			slapi_log_error(SLAPI_LOG_FATAL, HTTP_PLUGIN_SUBSYSTEM,
-   	    		   			"doRequest: Unable to initialize NSS Cert/Key Database\n");
-							status = HTTP_CLIENT_ERROR_NSS_INITIALIZE;
-   	     	 			goto bail;
-   					}
-   				}
-				httpConfig->nssInitialized = 1;
-			}
-		}
-
-		NSS_SetDomesticPolicy();
-
 		fd = setupSSLSocket(fd);
 		if (fd == NULL) {
 			slapi_log_error( SLAPI_LOG_FATAL, HTTP_PLUGIN_SUBSYSTEM,
@@ -644,58 +597,6 @@ bail:
     return status;
 }
 
-static int nssReinitializationRequired()
-{
-	int nssReinitializationRequired = 0;
-	int err = 0;
-	float version = 0;
-	const float DSVERSION = 6.1;
-	char *str = NULL;
-	char *value   = NULL;
-	Slapi_Entry  **entry = NULL;
-	Slapi_PBlock *resultpb= NULL;
-
-	resultpb= slapi_search_internal( "", LDAP_SCOPE_BASE, "objectclass=*", NULL, NULL, 0);
-	slapi_pblock_get( resultpb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &entry );
-	slapi_pblock_get( resultpb, SLAPI_PLUGIN_INTOP_RESULT, &err);
-	if ( err == LDAP_SUCCESS && entry!=NULL  && entry[0]!=NULL)
-	{
-		value = slapi_entry_attr_get_charptr(entry[0], "vendorVersion");
-		if (value == NULL || strncmp(value, "Fedora", strlen("Fedora")))
-		{
-			slapi_log_error( SLAPI_LOG_PLUGIN, HTTP_PLUGIN_SUBSYSTEM,
-				"nssReinitializationRequired: vendor is not Fedora \n");
-			slapi_log_error( SLAPI_LOG_PLUGIN, HTTP_PLUGIN_SUBSYSTEM,
-				"or version [%s] is earlier than 6.0\n", value?value:"NULL");
-			nssReinitializationRequired = 1;
-			slapi_free_search_results_internal(resultpb);
-			slapi_pblock_destroy(resultpb);
-			slapi_ch_free((void **)&value);
-			return nssReinitializationRequired;
-		}
- 
-		if ( (str = strstr(value,"/")) != NULL )
-		{	
-			str++;
-			version = atof(str);
-			slapi_log_error( SLAPI_LOG_PLUGIN, HTTP_PLUGIN_SUBSYSTEM,
-				"nssReinitializationRequired: version is %f. \n", version);
-		}
-
-
-		if (str == NULL || version < DSVERSION)
-		{
-			nssReinitializationRequired = 1;
-		}
-		slapi_ch_free((void **)&value);
-
-	}
-	slapi_free_search_results_internal(resultpb);
-	slapi_pblock_destroy(resultpb);
-	return nssReinitializationRequired;
-
-}
-
 static PRStatus sendGetReq(PRFileDesc *fd, const char *path)
 {
 	PRStatus status = PR_SUCCESS;
diff --git a/ldap/servers/plugins/linkedattrs/linked_attrs.c b/ldap/servers/plugins/linkedattrs/linked_attrs.c
index 5126e35a..a04fbb04 100644
--- a/ldap/servers/plugins/linkedattrs/linked_attrs.c
+++ b/ldap/servers/plugins/linkedattrs/linked_attrs.c
@@ -57,8 +57,8 @@ static char *_PluginDN = NULL;
 static int g_plugin_started = 0;
 
 static Slapi_PluginDesc pdesc = { LINK_FEATURE_DESC,
-                                  PLUGIN_MAGIC_VENDOR_STR,
-                                  PRODUCTTEXT,
+                                  VENDOR,
+                                  PACKAGE_VERSION,
                                   LINK_PLUGIN_DESC };
 
 /*
diff --git a/ldap/servers/plugins/linkedattrs/linked_attrs.h b/ldap/servers/plugins/linkedattrs/linked_attrs.h
index 8a3b2621..c6e63471 100644
--- a/ldap/servers/plugins/linkedattrs/linked_attrs.h
+++ b/ldap/servers/plugins/linkedattrs/linked_attrs.h
@@ -49,8 +49,6 @@
 #include "portable.h"
 #include "nspr.h"
 #include "slapi-plugin.h"
-#include "dirlite_strings.h"
-#include "dirver.h"
 #include "prclist.h"
 #include "ldif.h"
 
diff --git a/ldap/servers/plugins/memberof/memberof.c b/ldap/servers/plugins/memberof/memberof.c
index f1738ccc..75894431 100644
--- a/ldap/servers/plugins/memberof/memberof.c
+++ b/ldap/servers/plugins/memberof/memberof.c
@@ -66,16 +66,14 @@
 #endif
 
 #include "slapi-plugin.h"
-#include "dirver.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
 
 #include "string.h"
 #include "nspr.h"
 
 #include "memberof.h"
 
-static Slapi_PluginDesc pdesc = { "memberof", PLUGIN_MAGIC_VENDOR_STR,
-	PRODUCTTEXT, "memberof plugin" };
+static Slapi_PluginDesc pdesc = { "memberof", VENDOR,
+	PACKAGE_VERSION, "memberof plugin" };
 
 static void* _PluginID = NULL;
 static Slapi_Mutex *memberof_operation_lock = 0;
diff --git a/ldap/servers/plugins/memberof/memberof.h b/ldap/servers/plugins/memberof/memberof.h
index 268f16c7..642e851c 100644
--- a/ldap/servers/plugins/memberof/memberof.h
+++ b/ldap/servers/plugins/memberof/memberof.h
@@ -53,8 +53,6 @@
 #include <sys/types.h>
 #include "portable.h"
 #include "slapi-plugin.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
 #include <nspr.h>
 
 /* Private API: to get SLAPI_DSE_RETURNTEXT_SIZE, DSE_FLAG_PREOP, and DSE_FLAG_POSTOP */
diff --git a/ldap/servers/plugins/pam_passthru/pam_passthru.h b/ldap/servers/plugins/pam_passthru/pam_passthru.h
index 1f6dccba..6a9d332c 100644
--- a/ldap/servers/plugins/pam_passthru/pam_passthru.h
+++ b/ldap/servers/plugins/pam_passthru/pam_passthru.h
@@ -53,8 +53,6 @@
 #include <sys/types.h>
 #include "portable.h"
 #include "slapi-plugin.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
 #include <nspr.h>
 
 /* Private API: to get slapd_pr_strerror() and SLAPI_COMPONENT_NAME_NSPR */
diff --git a/ldap/servers/plugins/pam_passthru/pam_ptpreop.c b/ldap/servers/plugins/pam_passthru/pam_ptpreop.c
index 254a30a1..39c13fcb 100644
--- a/ldap/servers/plugins/pam_passthru/pam_ptpreop.c
+++ b/ldap/servers/plugins/pam_passthru/pam_ptpreop.c
@@ -46,7 +46,7 @@
 
 #include "pam_passthru.h"
 
-static Slapi_PluginDesc pdesc = { "pam_passthruauth",  PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "pam_passthruauth",  VENDOR, PACKAGE_VERSION,
 	"PAM pass through authentication plugin" };
 
 static void * pam_passthruauth_plugin_identity = NULL;
diff --git a/ldap/servers/plugins/passthru/libpassthru.def b/ldap/servers/plugins/passthru/libpassthru.def
index 0fd850f8..ac54494e 100644
--- a/ldap/servers/plugins/passthru/libpassthru.def
+++ b/ldap/servers/plugins/passthru/libpassthru.def
@@ -38,7 +38,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 Pass Through Authentication Plugin'
+DESCRIPTION     'Dirsrv 1.0 Pass Through Authentication Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/passthru/passthru.h b/ldap/servers/plugins/passthru/passthru.h
index 34f8f696..ac198499 100644
--- a/ldap/servers/plugins/passthru/passthru.h
+++ b/ldap/servers/plugins/passthru/passthru.h
@@ -54,8 +54,6 @@
 #include <sys/types.h>
 #include "portable.h"
 #include "slapi-plugin.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
 #include <nspr.h>
 
 /* Private API: to get slapd_pr_strerror() and SLAPI_COMPONENT_NAME_NSPR */
diff --git a/ldap/servers/plugins/passthru/ptpreop.c b/ldap/servers/plugins/passthru/ptpreop.c
index e5d43d3a..959310f5 100644
--- a/ldap/servers/plugins/passthru/ptpreop.c
+++ b/ldap/servers/plugins/passthru/ptpreop.c
@@ -47,7 +47,7 @@
 
 #include "passthru.h"
 
-static Slapi_PluginDesc pdesc = { "passthruauth",  PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "passthruauth",  VENDOR, PACKAGE_VERSION,
 	"pass through authentication plugin" };
 
 /*
diff --git a/ldap/servers/plugins/presence/presence.c b/ldap/servers/plugins/presence/presence.c
index 09c5431a..fcb390ac 100644
--- a/ldap/servers/plugins/presence/presence.c
+++ b/ldap/servers/plugins/presence/presence.c
@@ -51,8 +51,6 @@
 #include "nspr.h"
 #include "slapi-plugin.h"
 #include "slapi-private.h"
-#include "dirlite_strings.h"
-#include "dirver.h"
 #include "vattr_spi.h"
 #include "plhash.h"
 #include "ldif.h"
@@ -154,8 +152,8 @@ extern "C" {
 #define PRESENCE_RETURNED_ERROR_TEXT		"ERROR"
 
 static Slapi_PluginDesc pdesc = { "IM Presence",
-								  PLUGIN_MAGIC_VENDOR_STR,
-								  PRODUCTTEXT,
+								  VENDOR,
+								  PACKAGE_VERSION,
 	"presence plugin" };
 
 /**
diff --git a/ldap/servers/plugins/presence/presence.def b/ldap/servers/plugins/presence/presence.def
index 780c4550..e40b64d8 100644
--- a/ldap/servers/plugins/presence/presence.def
+++ b/ldap/servers/plugins/presence/presence.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 Presence Plugin'
+DESCRIPTION     'Dirsrv 1.0 Presence Plugin'
 EXPORTS
 	presence_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/pwdstorage/libpwdstorage.def b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
index 07a42f2a..54935867 100644
--- a/ldap/servers/plugins/pwdstorage/libpwdstorage.def
+++ b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION		'Fedora Directory Server 1.0 password storage scheme Plugin'
+DESCRIPTION		'Dirsrv 1.0 password storage scheme Plugin'
 EXPORTS
 	sha_pwd_storage_scheme_init @2
 	ssha_pwd_storage_scheme_init @3
diff --git a/ldap/servers/plugins/pwdstorage/pwd_init.c b/ldap/servers/plugins/pwdstorage/pwd_init.c
index b5104b5b..6ae2669a 100644
--- a/ldap/servers/plugins/pwdstorage/pwd_init.c
+++ b/ldap/servers/plugins/pwdstorage/pwd_init.c
@@ -46,33 +46,32 @@
 #include <sys/types.h>
 
 #include "pwdstorage.h"
-#include "dirver.h"
 
-static Slapi_PluginDesc sha_pdesc = { "sha-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Secure Hashing Algorithm (SHA)" };
+static Slapi_PluginDesc sha_pdesc = { "sha-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Secure Hashing Algorithm (SHA)" };
 
-static Slapi_PluginDesc ssha_pdesc = { "ssha-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA)" };
+static Slapi_PluginDesc ssha_pdesc = { "ssha-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Salted Secure Hashing Algorithm (SSHA)" };
 
-static Slapi_PluginDesc sha256_pdesc = { "sha256-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Secure Hashing Algorithm (SHA256)" };
+static Slapi_PluginDesc sha256_pdesc = { "sha256-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Secure Hashing Algorithm (SHA256)" };
 
-static Slapi_PluginDesc ssha256_pdesc = { "ssha256-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA256)" };
+static Slapi_PluginDesc ssha256_pdesc = { "ssha256-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Salted Secure Hashing Algorithm (SSHA256)" };
 
-static Slapi_PluginDesc sha384_pdesc = { "sha384-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Secure Hashing Algorithm (SHA384)" };
+static Slapi_PluginDesc sha384_pdesc = { "sha384-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Secure Hashing Algorithm (SHA384)" };
 
-static Slapi_PluginDesc ssha384_pdesc = { "ssha384-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA384)" };
+static Slapi_PluginDesc ssha384_pdesc = { "ssha384-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Salted Secure Hashing Algorithm (SSHA384)" };
 
-static Slapi_PluginDesc sha512_pdesc = { "sha512-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Secure Hashing Algorithm (SHA512)" };
+static Slapi_PluginDesc sha512_pdesc = { "sha512-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Secure Hashing Algorithm (SHA512)" };
 
-static Slapi_PluginDesc ssha512_pdesc = { "ssha512-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA512)" };
+static Slapi_PluginDesc ssha512_pdesc = { "ssha512-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Salted Secure Hashing Algorithm (SSHA512)" };
 
 #ifndef _WIN32
-static Slapi_PluginDesc crypt_pdesc = { "crypt-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Unix crypt algorithm (CRYPT)" };
+static Slapi_PluginDesc crypt_pdesc = { "crypt-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Unix crypt algorithm (CRYPT)" };
 #endif
 
-static Slapi_PluginDesc clear_pdesc = { "clear-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "No encryption (CLEAR)" };
+static Slapi_PluginDesc clear_pdesc = { "clear-password-storage-scheme", VENDOR, PACKAGE_VERSION, "No encryption (CLEAR)" };
 
-static Slapi_PluginDesc ns_mta_md5_pdesc = { "NS-MTA-MD5-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Netscape MD5 (NS-MTA-MD5)" };
+static Slapi_PluginDesc ns_mta_md5_pdesc = { "NS-MTA-MD5-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Netscape MD5 (NS-MTA-MD5)" };
 
-static Slapi_PluginDesc md5_pdesc = { "md5-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "MD5 hash algorithm (MD5)" };
+static Slapi_PluginDesc md5_pdesc = { "md5-password-storage-scheme", VENDOR, PACKAGE_VERSION, "MD5 hash algorithm (MD5)" };
 
 static char *plugin_name = "NSPwdStoragePlugin";
 
diff --git a/ldap/servers/plugins/pwdstorage/pwdstorage.h b/ldap/servers/plugins/pwdstorage/pwdstorage.h
index 975d789e..895ac4ea 100644
--- a/ldap/servers/plugins/pwdstorage/pwdstorage.h
+++ b/ldap/servers/plugins/pwdstorage/pwdstorage.h
@@ -50,7 +50,6 @@
 #include "ldif.h"
 #include "md5.h"
 
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
 
 #define PWD_HASH_PREFIX_START   '{'
 #define PWD_HASH_PREFIX_END '}'
diff --git a/ldap/servers/plugins/referint/referint.c b/ldap/servers/plugins/referint/referint.c
index 25df199f..0a443101 100644
--- a/ldap/servers/plugins/referint/referint.c
+++ b/ldap/servers/plugins/referint/referint.c
@@ -45,8 +45,6 @@
 #include "portable.h"
 #include "slapi-plugin.h"
 #include "slap.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
 
 /* include NSPR header files */
 #include "prthread.h"
@@ -94,7 +92,7 @@ int keeprunning = 0;
 static PRLock 		*keeprunning_mutex = NULL; 
 static PRCondVar        *keeprunning_cv = NULL; 
 
-static Slapi_PluginDesc pdesc = { "referint", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "referint", VENDOR, PACKAGE_VERSION,
 	"referential integrity plugin" };
 
 static void* referint_plugin_identity = NULL;
diff --git a/ldap/servers/plugins/referint/referint.def b/ldap/servers/plugins/referint/referint.def
index 97d088c5..3c7558db 100644
--- a/ldap/servers/plugins/referint/referint.def
+++ b/ldap/servers/plugins/referint/referint.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 Referint Plugin'
+DESCRIPTION     'Dirsrv 1.0 Referint Plugin'
 CODE            SHARED READ EXECUTE
 DATA            SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c
index b0bb1b25..2c451790 100644
--- a/ldap/servers/plugins/replication/repl5_init.c
+++ b/ldap/servers/plugins/replication/repl5_init.c
@@ -70,8 +70,6 @@ nsslapd-plugindescription: Multi-Master Replication Plugin
 #include "repl.h"
 #include "repl5.h"
 #include "cl5.h"			 /* changelog interface */
-#include "dirver.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
 
 #include "plstr.h"
 
@@ -127,14 +125,14 @@ static char *response_name_list[] = {
 
 /* ----------------------------- Multi-Master Replication Plugin */
 
-static Slapi_PluginDesc multimasterdesc = {"replication-multimaster", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multi-master Replication Plugin"};
-static Slapi_PluginDesc multimasterpreopdesc = {"replication-multimaster-preop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multi-master replication pre-operation plugin"};
-static Slapi_PluginDesc multimasterpostopdesc = {"replication-multimaster-postop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multi-master replication post-operation plugin"};
-static Slapi_PluginDesc multimasterinternalpreopdesc = {"replication-multimaster-internalpreop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multi-master replication internal pre-operation plugin"};
-static Slapi_PluginDesc multimasterinternalpostopdesc = {"replication-multimaster-internalpostop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multimaster replication internal post-operation plugin"};
-static Slapi_PluginDesc multimasterbepreopdesc = {"replication-multimaster-bepreop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multimaster replication bepre-operation plugin"};
-static Slapi_PluginDesc multimasterbepostopdesc = {"replication-multimaster-bepostop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multimaster replication bepost-operation plugin"};
-static Slapi_PluginDesc multimasterextopdesc = { "replication-multimaster-extop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multimaster replication extended-operation plugin" };
+static Slapi_PluginDesc multimasterdesc = {"replication-multimaster", VENDOR, PACKAGE_VERSION, "Multi-master Replication Plugin"};
+static Slapi_PluginDesc multimasterpreopdesc = {"replication-multimaster-preop", VENDOR, PACKAGE_VERSION, "Multi-master replication pre-operation plugin"};
+static Slapi_PluginDesc multimasterpostopdesc = {"replication-multimaster-postop", VENDOR, PACKAGE_VERSION, "Multi-master replication post-operation plugin"};
+static Slapi_PluginDesc multimasterinternalpreopdesc = {"replication-multimaster-internalpreop", VENDOR, PACKAGE_VERSION, "Multi-master replication internal pre-operation plugin"};
+static Slapi_PluginDesc multimasterinternalpostopdesc = {"replication-multimaster-internalpostop", VENDOR, PACKAGE_VERSION, "Multimaster replication internal post-operation plugin"};
+static Slapi_PluginDesc multimasterbepreopdesc = {"replication-multimaster-bepreop", VENDOR, PACKAGE_VERSION, "Multimaster replication bepre-operation plugin"};
+static Slapi_PluginDesc multimasterbepostopdesc = {"replication-multimaster-bepostop", VENDOR, PACKAGE_VERSION, "Multimaster replication bepost-operation plugin"};
+static Slapi_PluginDesc multimasterextopdesc = { "replication-multimaster-extop", VENDOR, PACKAGE_VERSION, "Multimaster replication extended-operation plugin" };
 
 static int multimaster_stopped_flag; /* A flag which is set when all the plugin threads are to stop */
 static int multimaster_started_flag = 0;
@@ -569,13 +567,6 @@ int replication_multimaster_plugin_init(Slapi_PBlock *pb)
 */
 	multimaster_mtnode_extension_init ();
 
-	if(config_is_slapd_lite())
-	{
-		slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name,
-				"replication plugin not approved for restricted"
-				" mode Directory Server.\n" );
-	    rc= -1;
-	}
 	if(rc==0 && !multimaster_initialised)
 	{
         /* initialize replica hash - has to be done before mapping tree is
diff --git a/ldap/servers/plugins/replication/repl_init.c b/ldap/servers/plugins/replication/repl_init.c
index 83cc04f6..7177ff65 100644
--- a/ldap/servers/plugins/replication/repl_init.c
+++ b/ldap/servers/plugins/replication/repl_init.c
@@ -70,8 +70,6 @@ NOTE: This plugin depends on the Multi-Master Replication Plugin
 #include "repl5.h"
 #include "repl_shared.h"
 #include "cl4.h"	/* changelog interface */
-#include "dirver.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
 
 #ifdef _WIN32
 int *module_ldap_debug = 0;
@@ -84,12 +82,12 @@ void plugin_init_debug_level(int *level_ptr)
 
 /* ----------------------------- Legacy Replication Plugin */
 
-static Slapi_PluginDesc legacydesc = { "replication-legacy", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Legacy Replication Plugin" };
-static Slapi_PluginDesc legacypreopdesc = { "replication-legacy-preop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Legacy replication pre-operation plugin" };
-static Slapi_PluginDesc legacypostopdesc = { "replication-legacy-postop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Legacy replication post-operation plugin" };
-static Slapi_PluginDesc legacyinternalpreopdesc = { "replication-legacy-internalpreop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Legacy replication internal pre-operation plugin" };
-static Slapi_PluginDesc legacyinternalpostopdesc = { "replication-legacy-internalpostop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Legacy replication internal post-operation plugin" };
-static Slapi_PluginDesc legacyentrydesc = { "replication-legacy-entry", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Legacy replication entry plugin" };
+static Slapi_PluginDesc legacydesc = { "replication-legacy", VENDOR, PACKAGE_VERSION, "Legacy Replication Plugin" };
+static Slapi_PluginDesc legacypreopdesc = { "replication-legacy-preop", VENDOR, PACKAGE_VERSION, "Legacy replication pre-operation plugin" };
+static Slapi_PluginDesc legacypostopdesc = { "replication-legacy-postop", VENDOR, PACKAGE_VERSION, "Legacy replication post-operation plugin" };
+static Slapi_PluginDesc legacyinternalpreopdesc = { "replication-legacy-internalpreop", VENDOR, PACKAGE_VERSION, "Legacy replication internal pre-operation plugin" };
+static Slapi_PluginDesc legacyinternalpostopdesc = { "replication-legacy-internalpostop", VENDOR, PACKAGE_VERSION, "Legacy replication internal post-operation plugin" };
+static Slapi_PluginDesc legacyentrydesc = { "replication-legacy-entry", VENDOR, PACKAGE_VERSION, "Legacy replication entry plugin" };
 
 static int legacy_stopped; /* A flag which is set when all the plugin threads are to stop */        
 
@@ -312,13 +310,6 @@ replication_legacy_plugin_init(Slapi_PBlock *pb)
 	PR_ASSERT (identity);
 	repl_set_plugin_identity (PLUGIN_LEGACY_REPLICATION, identity);
 
-	if(config_is_slapd_lite())
-	{
-		slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name,
-				"replication plugin not approved for restricted"
-				" mode Directory Server.\n" );
-	    rc= -1;
-	}
 	if(rc==0 && !legacy_initialised)
 	{
 	    rc= slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, SLAPI_PLUGIN_VERSION_01 );
diff --git a/ldap/servers/plugins/replication/replication.def b/ldap/servers/plugins/replication/replication.def
index 2019486d..94b0da76 100644
--- a/ldap/servers/plugins/replication/replication.def
+++ b/ldap/servers/plugins/replication/replication.def
@@ -38,7 +38,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 Replication Plugin'
+DESCRIPTION     'Dirsrv 1.0 Replication Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/replication/winsync-plugin.h b/ldap/servers/plugins/replication/winsync-plugin.h
index 17d2cd1d..e6260d21 100644
--- a/ldap/servers/plugins/replication/winsync-plugin.h
+++ b/ldap/servers/plugins/replication/winsync-plugin.h
@@ -491,8 +491,8 @@ test_winsync_destroy_agmt_cb(void *cbdata, const Slapi_DN *ds_subtree,
  */
 static Slapi_PluginDesc test_winsync_pdesc = {
     "test-winsync-plugin",
-    PLUGIN_MAGIC_VENDOR_STR,
-    PRODUCTTEXT,
+    VENDOR,
+    PACKAGE_VERSION,
     "test winsync plugin"
 };
 
diff --git a/ldap/servers/plugins/retrocl/retrocl.c b/ldap/servers/plugins/retrocl/retrocl.c
index 58edc072..dd900f2b 100644
--- a/ldap/servers/plugins/retrocl/retrocl.c
+++ b/ldap/servers/plugins/retrocl/retrocl.c
@@ -79,9 +79,9 @@ Slapi_Backend *retrocl_be_changelog = NULL;
 
 /* ----------------------------- Retrocl Plugin */
 
-static Slapi_PluginDesc retrocldesc = {"retrocl", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Retrocl Plugin"};
-static Slapi_PluginDesc retroclpostopdesc = {"retrocl-postop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "retrocl post-operation plugin"};
-static Slapi_PluginDesc retroclinternalpostopdesc = {"retrocl-internalpostop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "retrocl internal post-operation plugin"};
+static Slapi_PluginDesc retrocldesc = {"retrocl", VENDOR, PACKAGE_VERSION, "Retrocl Plugin"};
+static Slapi_PluginDesc retroclpostopdesc = {"retrocl-postop", VENDOR, PACKAGE_VERSION, "retrocl post-operation plugin"};
+static Slapi_PluginDesc retroclinternalpostopdesc = {"retrocl-internalpostop", VENDOR, PACKAGE_VERSION, "retrocl internal post-operation plugin"};
 
 
 /*
diff --git a/ldap/servers/plugins/retrocl/retrocl.def b/ldap/servers/plugins/retrocl/retrocl.def
index 23ca9fac..fffebea4 100644
--- a/ldap/servers/plugins/retrocl/retrocl.def
+++ b/ldap/servers/plugins/retrocl/retrocl.def
@@ -38,7 +38,7 @@
 ;
 ;
 
-DESCRIPTION     'Fedora Directory Server 1.0 Retro-Changelog Plugin'
+DESCRIPTION     'Dirsrv 1.0 Retro-Changelog Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/retrocl/retrocl.h b/ldap/servers/plugins/retrocl/retrocl.h
index 4833d257..e7b65c62 100644
--- a/ldap/servers/plugins/retrocl/retrocl.h
+++ b/ldap/servers/plugins/retrocl/retrocl.h
@@ -51,11 +51,9 @@
 #include "slapi-private.h"
 #include "slapi-plugin.h"
 /* #include "portable.h" */
-#include "dirver.h"
 #include "ldaplog.h"
 #include "ldif.h"
 #include "slap.h"
-#include <dirlite_strings.h>
 
 /* max len of a long (2^64), represented as a string, including null byte */
 #define	CNUMSTR_LEN		21
diff --git a/ldap/servers/plugins/rever/rever.c b/ldap/servers/plugins/rever/rever.c
index ac01058c..50b61ffe 100644
--- a/ldap/servers/plugins/rever/rever.c
+++ b/ldap/servers/plugins/rever/rever.c
@@ -43,11 +43,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include "dirver.h"
 
 #include "rever.h"
 
-static Slapi_PluginDesc pdesc = { "des-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "DES storage scheme plugin" };
+static Slapi_PluginDesc pdesc = { "des-storage-scheme", VENDOR, PACKAGE_VERSION, "DES storage scheme plugin" };
 
 static char *plugin_name = "ReverStoragePlugin";
 
diff --git a/ldap/servers/plugins/rever/rever.h b/ldap/servers/plugins/rever/rever.h
index ac303fd1..8ea62795 100644
--- a/ldap/servers/plugins/rever/rever.h
+++ b/ldap/servers/plugins/rever/rever.h
@@ -49,8 +49,6 @@
 #include "slap.h"
 #include "ldaplog.h"
 
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-
 #define REVER_SCHEME_NAME	"DES"
 #define PWD_HASH_PREFIX_START   '{'
 #define PWD_HASH_PREFIX_END '}'
diff --git a/ldap/servers/plugins/roles/roles.def b/ldap/servers/plugins/roles/roles.def
index efa79acc..9a8c1c7c 100644
--- a/ldap/servers/plugins/roles/roles.def
+++ b/ldap/servers/plugins/roles/roles.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 Roles Plugin'
+DESCRIPTION     'Dirsrv 1.0 Roles Plugin'
 EXPORTS
 	roles_init        @2
 	plugin_init_debug_level	@3
diff --git a/ldap/servers/plugins/roles/roles_cache.c b/ldap/servers/plugins/roles/roles_cache.c
index c5ba1c12..b7de265f 100644
--- a/ldap/servers/plugins/roles/roles_cache.c
+++ b/ldap/servers/plugins/roles/roles_cache.c
@@ -45,8 +45,6 @@
 #include <sys/types.h>
 #include "portable.h"
 #include "slapi-plugin.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
  
 /* This is naughty ... */
 #include "slapi-private.h"
diff --git a/ldap/servers/plugins/roles/roles_plugin.c b/ldap/servers/plugins/roles/roles_plugin.c
index 046df3d6..92a64ed4 100644
--- a/ldap/servers/plugins/roles/roles_plugin.c
+++ b/ldap/servers/plugins/roles/roles_plugin.c
@@ -61,7 +61,7 @@
 static void * roles_plugin_identity = NULL;
 
 static Slapi_PluginDesc pdesc = { "roles",
-		PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "roles plugin" };
+		VENDOR, PACKAGE_VERSION, "roles plugin" };
 
 #ifdef _WIN32
 int *module_ldap_debug = 0;
diff --git a/ldap/servers/plugins/schema_reload/schema_reload.c b/ldap/servers/plugins/schema_reload/schema_reload.c
index 4b27366d..b47d425f 100644
--- a/ldap/servers/plugins/schema_reload/schema_reload.c
+++ b/ldap/servers/plugins/schema_reload/schema_reload.c
@@ -74,13 +74,11 @@
 #include "slap.h"
 #include "slapi-plugin.h"
 #include "nspr.h"
-#include "dirver.h"             /* PRODUCTTEXT */
-#include <dirlite_strings.h>    /* PLUGIN_MAGIC_VENDOR_STR */
 
 static PRLock *schemareload_lock = NULL;
 
 static Slapi_PluginDesc pdesc = { "schemareload",
-    PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+    VENDOR, PACKAGE_VERSION,
     "task plugin to reload schema files" };
 
 static int schemareload_add(Slapi_PBlock *pb, Slapi_Entry *e,
diff --git a/ldap/servers/plugins/shared/plugin-utils.h b/ldap/servers/plugins/shared/plugin-utils.h
index 12884551..3188352c 100644
--- a/ldap/servers/plugins/shared/plugin-utils.h
+++ b/ldap/servers/plugins/shared/plugin-utils.h
@@ -69,14 +69,12 @@
  * slapi_modify_internal()
  */
 #include "slapi-plugin-compat4.h"
-#include <dirlite_strings.h>
 #include <stdio.h>
 #include <string.h>
 #ifdef _WINDOWS
 #undef strcasecmp
 #define strcasecmp strcmpi
 #endif
-#include "dirver.h"
 
 #ifdef LDAP_DEBUG
 #ifndef DEBUG
diff --git a/ldap/servers/plugins/statechange/statechange.c b/ldap/servers/plugins/statechange/statechange.c
index 89809de3..8db0591f 100644
--- a/ldap/servers/plugins/statechange/statechange.c
+++ b/ldap/servers/plugins/statechange/statechange.c
@@ -46,8 +46,6 @@
 #include <string.h>
 #include "portable.h"
 #include "slapi-plugin.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
 #include "statechange.h"
 
 /* get file mode flags for unix */
@@ -91,7 +89,7 @@ static void _statechange_vattr_cache_invalidator_callback(Slapi_Entry *e, char *
 static SCNotify *statechange_find_notify(char *dn, char *filter, notify_callback func);
 
 
-static Slapi_PluginDesc pdesc = { "statechange", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "statechange", VENDOR, PACKAGE_VERSION,
 	"state change notification service plugin" };
 
 
diff --git a/ldap/servers/plugins/statechange/statechange.def b/ldap/servers/plugins/statechange/statechange.def
index 553c0eea..4a0daf69 100644
--- a/ldap/servers/plugins/statechange/statechange.def
+++ b/ldap/servers/plugins/statechange/statechange.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 State Change Plugin'
+DESCRIPTION     'Dirsrv 1.0 State Change Plugin'
 EXPORTS
 	statechange_init        @2
 	plugin_init_debug_level	@3
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
diff --git a/ldap/servers/plugins/uiduniq/7bit.c b/ldap/servers/plugins/uiduniq/7bit.c
index 802c21e3..98f216ad 100644
--- a/ldap/servers/plugins/uiduniq/7bit.c
+++ b/ldap/servers/plugins/uiduniq/7bit.c
@@ -50,9 +50,7 @@
  */
 #include <stdio.h>
 #include <slapi-plugin.h>
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
 #include <string.h>
-#include "dirver.h"
 
 /* DBDB this should be pulled from a common header file */
 #ifdef _WIN32
@@ -87,7 +85,7 @@
  */
 static char *plugin_name = "NS7bitAttr";
 static Slapi_PluginDesc
-pluginDesc = { "NS7bitAttr", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+pluginDesc = { "NS7bitAttr", VENDOR, PACKAGE_VERSION,
   "Enforce  7-bit clean attribute values" };
 
 
diff --git a/ldap/servers/plugins/uiduniq/libuiduniq.def b/ldap/servers/plugins/uiduniq/libuiduniq.def
index ed05549e..a687de03 100644
--- a/ldap/servers/plugins/uiduniq/libuiduniq.def
+++ b/ldap/servers/plugins/uiduniq/libuiduniq.def
@@ -38,7 +38,7 @@
 ;
 ;
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 Unique Attribute Checking Plugin'
+DESCRIPTION     'Dirsrv 1.0 Unique Attribute Checking Plugin'
 ;CODE		SHARED READ EXECUTE
 ;DATA		SHARED READ WRITE
 EXPORTS
diff --git a/ldap/servers/plugins/uiduniq/uid.c b/ldap/servers/plugins/uiduniq/uid.c
index 6fd1a4e8..955e6770 100644
--- a/ldap/servers/plugins/uiduniq/uid.c
+++ b/ldap/servers/plugins/uiduniq/uid.c
@@ -52,9 +52,7 @@
  */
 #include <slapi-plugin.h>
 #include <portable.h>
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
 #include <string.h>
-#include "dirver.h"
 #include "plugin-utils.h"
 #include "nspr.h"
 
@@ -97,7 +95,7 @@ static int search_one_berval(const char *baseDN, const char *attrName,
 static char *plugin_name = "NSUniqueAttr";
 static Slapi_PluginDesc
 pluginDesc = { 
-	"NSUniqueAttr", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+	"NSUniqueAttr", VENDOR, PACKAGE_VERSION,
 	"Enforce unique attribute values" 
 };
 static void* plugin_identity = NULL;
diff --git a/ldap/servers/plugins/usn/usn.c b/ldap/servers/plugins/usn/usn.c
index 2bb389a2..7f464362 100644
--- a/ldap/servers/plugins/usn/usn.c
+++ b/ldap/servers/plugins/usn/usn.c
@@ -42,7 +42,7 @@
 #include "usn.h"
 
 static Slapi_PluginDesc pdesc = {
-        "USN", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+        "USN", VENDOR, PACKAGE_VERSION,
         "USN (Update Sequence Number) plugin" };
 
 static CSNGen *_usn_csngen = NULL;
diff --git a/ldap/servers/plugins/vattrsp_template/vattrsp.c b/ldap/servers/plugins/vattrsp_template/vattrsp.c
index 5a7afe16..b0c96714 100644
--- a/ldap/servers/plugins/vattrsp_template/vattrsp.c
+++ b/ldap/servers/plugins/vattrsp_template/vattrsp.c
@@ -46,8 +46,6 @@
 #include "nspr.h"
 #include "slapi-plugin.h"
 #include "slapi-private.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
 #include "vattr_spi.h"
 
 /* the global plugin handle */
@@ -95,7 +93,7 @@ static int vattrsp_vattr_types(
 		);
 
 
-static Slapi_PluginDesc pdesc = { "vattrexamplesp", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "vattrexamplesp", VENDOR, PACKAGE_VERSION,
 	"vattr service provider example plugin" };
 
 static void * vattrsp_plugin_identity = NULL;
diff --git a/ldap/servers/plugins/views/views.c b/ldap/servers/plugins/views/views.c
index 80e52b9e..8563d193 100644
--- a/ldap/servers/plugins/views/views.c
+++ b/ldap/servers/plugins/views/views.c
@@ -46,8 +46,6 @@
 #include <string.h>
 #include "portable.h"
 #include "slapi-plugin.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
 #include "statechange.h"
 #include "views.h"
 
@@ -150,7 +148,7 @@ static int _internal_api_views_entry_dn_exists(char *view_dn, char *e_dn);
 static int _internal_api_views_entry_exists_general(char *view_dn, Slapi_Entry *e, char *e_dn);
 
 
-static Slapi_PluginDesc pdesc = { "views", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "views", VENDOR, PACKAGE_VERSION,
 	"virtual directory information tree views plugin" };
 
 static void * view_plugin_identity = NULL;
diff --git a/ldap/servers/plugins/views/views.def b/ldap/servers/plugins/views/views.def
index b045be62..71dd5d0f 100644
--- a/ldap/servers/plugins/views/views.def
+++ b/ldap/servers/plugins/views/views.def
@@ -36,7 +36,7 @@
 ; All rights reserved.
 ; END COPYRIGHT BLOCK
 ;
-DESCRIPTION     'Fedora Directory Server 1.0 State Change Plugin'
+DESCRIPTION     'Dirsrv 1.0 State Change Plugin'
 EXPORTS
 	views_init        @2
 	plugin_init_debug_level	@3