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/uiduniq | |
| 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/uiduniq')
| -rw-r--r-- | ldap/servers/plugins/uiduniq/7bit.c | 4 | ||||
| -rw-r--r-- | ldap/servers/plugins/uiduniq/libuiduniq.def | 2 | ||||
| -rw-r--r-- | ldap/servers/plugins/uiduniq/uid.c | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/ldap/servers/plugins/uiduniq/7bit.c b/ldap/servers/plugins/uiduniq/7bit.c index 802c21e3..98f216ad 100644 --- a/ldap/servers/plugins/uiduniq/7bit.c +++ b/ldap/servers/plugins/uiduniq/7bit.c @@ -50,9 +50,7 @@ */ #include <stdio.h> #include <slapi-plugin.h> -#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */ #include <string.h> -#include "dirver.h" /* DBDB this should be pulled from a common header file */ #ifdef _WIN32 @@ -87,7 +85,7 @@ */ static char *plugin_name = "NS7bitAttr"; static Slapi_PluginDesc -pluginDesc = { "NS7bitAttr", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, +pluginDesc = { "NS7bitAttr", VENDOR, PACKAGE_VERSION, "Enforce 7-bit clean attribute values" }; diff --git a/ldap/servers/plugins/uiduniq/libuiduniq.def b/ldap/servers/plugins/uiduniq/libuiduniq.def index ed05549e..a687de03 100644 --- a/ldap/servers/plugins/uiduniq/libuiduniq.def +++ b/ldap/servers/plugins/uiduniq/libuiduniq.def @@ -38,7 +38,7 @@ ; ; ; -DESCRIPTION 'Fedora Directory Server 1.0 Unique Attribute Checking Plugin' +DESCRIPTION 'Dirsrv 1.0 Unique Attribute Checking Plugin' ;CODE SHARED READ EXECUTE ;DATA SHARED READ WRITE EXPORTS diff --git a/ldap/servers/plugins/uiduniq/uid.c b/ldap/servers/plugins/uiduniq/uid.c index 6fd1a4e8..955e6770 100644 --- a/ldap/servers/plugins/uiduniq/uid.c +++ b/ldap/servers/plugins/uiduniq/uid.c @@ -52,9 +52,7 @@ */ #include <slapi-plugin.h> #include <portable.h> -#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */ #include <string.h> -#include "dirver.h" #include "plugin-utils.h" #include "nspr.h" @@ -97,7 +95,7 @@ static int search_one_berval(const char *baseDN, const char *attrName, static char *plugin_name = "NSUniqueAttr"; static Slapi_PluginDesc pluginDesc = { - "NSUniqueAttr", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, + "NSUniqueAttr", VENDOR, PACKAGE_VERSION, "Enforce unique attribute values" }; static void* plugin_identity = NULL; |