From 886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 11 Aug 2009 14:37:44 -0600 Subject: 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!) --- ldap/servers/plugins/cos/cos.c | 4 +--- ldap/servers/plugins/cos/cos.def | 2 +- ldap/servers/plugins/cos/cos_cache.c | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) (limited to 'ldap/servers/plugins/cos') 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 /* 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 #include "portable.h" #include "slapi-plugin.h" -#include /* PLUGIN_MAGIC_VENDOR_STR */ -#include "dirver.h" /* this is naughty, but the api for backend state change is currently here */ #include "slapi-private.h" -- cgit