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

4 files changed, 6 insertions, 6 deletions

diff --git a/ldap/servers/snmp/netscape-ldap.mib b/ldap/servers/snmp/netscape-ldap.mib
index 9c0cfa86..c4ef5f60 100644
--- a/ldap/servers/snmp/netscape-ldap.mib
+++ b/ldap/servers/snmp/netscape-ldap.mib
@@ -37,7 +37,7 @@
 -- END COPYRIGHT BLOCK
 --
 --
--- MIB for Fedora Directory Server 7 
+-- MIB for Directory Server
 --
 -- This is an implementation of the MADMAN mib for monitoring LDAP/CLDAP and X.500
 -- directories described in RFC 2788 and 2789
@@ -79,7 +79,7 @@ IMPORTS
             DESCRIPTION
                " An implementation of the MADMAN mib for monitoring LDAP/CLDAP and X.500
 		 directories described in RFC 2788 and 2789
-                 used for Fedora Directory Server 7"
+                 used for Directory Server"
             ::= { netscape 7}
 
     dsOpsTable OBJECT-TYPE
diff --git a/ldap/servers/snmp/ntagt/nsldapagt_nt.c b/ldap/servers/snmp/ntagt/nsldapagt_nt.c
index 42d668a6..9818c580 100644
--- a/ldap/servers/snmp/ntagt/nsldapagt_nt.c
+++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.c
@@ -786,7 +786,7 @@ int MagtLoadStaticInfo(MagtStaticInfo_t *staticInfo, char *pszRootDir, int *SNMP
  
   staticInfo->ApplIndex = 0;
  
-  REPLACE(staticInfo->entityDescr.val, "Fedora Directory Server");
+  REPLACE(staticInfo->entityDescr.val, CAPBRAND " Directory Server");
   staticInfo->entityDescr.len = strlen(staticInfo->entityDescr.val);
  
   REPLACE(staticInfo->entityVers.val, "1");
diff --git a/ldap/servers/snmp/ntagt/nsldapagt_nt.def b/ldap/servers/snmp/ntagt/nsldapagt_nt.def
index 7f4b8e70..31e8d5a4 100644
--- a/ldap/servers/snmp/ntagt/nsldapagt_nt.def
+++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.def
@@ -38,7 +38,7 @@
 ;
 LIBRARY ns-ldapagt
 
-DESCRIPTION 'Fedora Directory Server SNMP Agent'
+DESCRIPTION 'Dirsrv SNMP Agent'
 
 CODE  LOADONCALL MOVEABLE DISCARDABLE
 DATA  PRELOAD    MOVEABLE SINGLE
diff --git a/ldap/servers/snmp/redhat-directory.mib b/ldap/servers/snmp/redhat-directory.mib
index 56d4f9a6..a03073f4 100644
--- a/ldap/servers/snmp/redhat-directory.mib
+++ b/ldap/servers/snmp/redhat-directory.mib
@@ -37,7 +37,7 @@
 -- END COPYRIGHT BLOCK
 --
 --
--- MIB for Red Hat and Fedora Directory Server 
+-- MIB for Red Hat Directory Server 
 --
 -- This is an implementation of the MADMAN mib for monitoring LDAP/CLDAP and X.500
 -- directories described in RFC 2788 and 2789
@@ -76,7 +76,7 @@ IMPORTS
             DESCRIPTION
                " An implementation of the MADMAN mib for monitoring LDAP/CLDAP and X.500
 		 directories described in RFC 2788 and 2789
-                 used for Red Hat and Fedora  Directory Server" 
+                 used for Red Hat Directory Server" 
             ::= {redhat 6}
 
     dsOpsTable OBJECT-TYPE