summaryrefslogtreecommitdiffstats
path: root/ldap/servers/plugins/statechange
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2009-08-11 14:37:44 -0600
committerRich Megginson <rmeggins@redhat.com>2009-08-11 15:17:44 -0600
commit886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7 (patch)
tree7afa75c8dd680409fe7049827cf0a4f2905036a5 /ldap/servers/plugins/statechange
parentabff3feacb218a7bb65a358dce2e9c90a2f185b1 (diff)
downloadds-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/statechange')
-rw-r--r--ldap/servers/plugins/statechange/statechange.c4
-rw-r--r--ldap/servers/plugins/statechange/statechange.def2
2 files changed, 2 insertions, 4 deletions
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