diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2009-08-11 14:37:44 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2009-08-11 15:17:44 -0600 |
| commit | 886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7 (patch) | |
| tree | 7afa75c8dd680409fe7049827cf0a4f2905036a5 /ldap/servers/plugins/retrocl | |
| parent | abff3feacb218a7bb65a358dce2e9c90a2f185b1 (diff) | |
| download | ds-886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7.tar.gz ds-886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7.tar.xz ds-886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7.zip | |
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!)
Diffstat (limited to 'ldap/servers/plugins/retrocl')
| -rw-r--r-- | ldap/servers/plugins/retrocl/retrocl.c | 6 | ||||
| -rw-r--r-- | ldap/servers/plugins/retrocl/retrocl.def | 2 | ||||
| -rw-r--r-- | ldap/servers/plugins/retrocl/retrocl.h | 2 |
3 files changed, 4 insertions, 6 deletions
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 |