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/roles | |
| 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/roles')
| -rw-r--r-- | ldap/servers/plugins/roles/roles.def | 2 | ||||
| -rw-r--r-- | ldap/servers/plugins/roles/roles_cache.c | 2 | ||||
| -rw-r--r-- | ldap/servers/plugins/roles/roles_plugin.c | 2 |
3 files changed, 2 insertions, 4 deletions
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; |