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/passthru | |
| 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/passthru')
| -rw-r--r-- | ldap/servers/plugins/passthru/libpassthru.def | 2 | ||||
| -rw-r--r-- | ldap/servers/plugins/passthru/passthru.h | 2 | ||||
| -rw-r--r-- | ldap/servers/plugins/passthru/ptpreop.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/ldap/servers/plugins/passthru/libpassthru.def b/ldap/servers/plugins/passthru/libpassthru.def index 0fd850f8..ac54494e 100644 --- a/ldap/servers/plugins/passthru/libpassthru.def +++ b/ldap/servers/plugins/passthru/libpassthru.def @@ -38,7 +38,7 @@ ; ; ; -DESCRIPTION 'Fedora Directory Server 1.0 Pass Through Authentication Plugin' +DESCRIPTION 'Dirsrv 1.0 Pass Through Authentication Plugin' ;CODE SHARED READ EXECUTE ;DATA SHARED READ WRITE EXPORTS diff --git a/ldap/servers/plugins/passthru/passthru.h b/ldap/servers/plugins/passthru/passthru.h index 34f8f696..ac198499 100644 --- a/ldap/servers/plugins/passthru/passthru.h +++ b/ldap/servers/plugins/passthru/passthru.h @@ -54,8 +54,6 @@ #include <sys/types.h> #include "portable.h" #include "slapi-plugin.h" -#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */ -#include "dirver.h" #include <nspr.h> /* Private API: to get slapd_pr_strerror() and SLAPI_COMPONENT_NAME_NSPR */ diff --git a/ldap/servers/plugins/passthru/ptpreop.c b/ldap/servers/plugins/passthru/ptpreop.c index e5d43d3a..959310f5 100644 --- a/ldap/servers/plugins/passthru/ptpreop.c +++ b/ldap/servers/plugins/passthru/ptpreop.c @@ -47,7 +47,7 @@ #include "passthru.h" -static Slapi_PluginDesc pdesc = { "passthruauth", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, +static Slapi_PluginDesc pdesc = { "passthruauth", VENDOR, PACKAGE_VERSION, "pass through authentication plugin" }; /* |