>From 151b2330776609a75d965d321f54e6bfc88c9d94 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@xxxxxxxxxx>
Date: Tue, 11 Aug 2009 14:37:44 -0600
Subject: [PATCH] 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.
---
Makefile.am | 14 +-
Makefile.in | 38 +----
dirver.pl | 163 --------------------
ldap/admin/src/scripts/Migration.pm.in | 2 +-
ldap/admin/src/upgradeServer | 17 ++-
ldap/docs/LICENSE.txt | 8 +-
ldap/docs/README.txt | 8 +-
ldap/include/dirlite_strings.h | 99 ------------
ldap/include/litekey.h | 67 --------
ldap/include/ntslapdregparms.h | 8 +-
ldap/ldif/Example-roles.ldif | 6 +-
ldap/ldif/Example.ldif | 6 +-
ldap/schema/60pureftpd.ldif | 2 +-
ldap/schema/slapd-collations.conf | 1 -
ldap/servers/plugins/acl/aclplugin.c | 4 +-
ldap/servers/plugins/acl/libacl.def | 2 +-
ldap/servers/plugins/bitwise/bitwise.c | 2 +-
ldap/servers/plugins/chainingdb/cb.h | 2 -
ldap/servers/plugins/chainingdb/cb_init.c | 4 +-
ldap/servers/plugins/chainingdb/libcb.def | 2 +-
ldap/servers/plugins/collation/collate.h | 1 -
ldap/servers/plugins/collation/collation.def | 2 +-
ldap/servers/plugins/collation/orfilter.c | 2 +-
ldap/servers/plugins/cos/cos.c | 4 +-
ldap/servers/plugins/cos/cos.def | 2 +-
ldap/servers/plugins/cos/cos_cache.c | 2 -
ldap/servers/plugins/deref/deref.c | 6 +-
ldap/servers/plugins/distrib/README | 4 +-
ldap/servers/plugins/distrib/libdistrib.def | 2 +-
ldap/servers/plugins/dna/dna.c | 10 +-
ldap/servers/plugins/http/http_client.c | 6 +-
ldap/servers/plugins/http/http_impl.c | 99 ------------
ldap/servers/plugins/linkedattrs/linked_attrs.c | 4 +-
ldap/servers/plugins/linkedattrs/linked_attrs.h | 2 -
ldap/servers/plugins/memberof/memberof.c | 6 +-
ldap/servers/plugins/memberof/memberof.h | 2 -
ldap/servers/plugins/pam_passthru/pam_passthru.h | 2 -
ldap/servers/plugins/pam_passthru/pam_ptpreop.c | 2 +-
ldap/servers/plugins/passthru/libpassthru.def | 2 +-
ldap/servers/plugins/passthru/passthru.h | 2 -
ldap/servers/plugins/passthru/ptpreop.c | 2 +-
ldap/servers/plugins/presence/presence.c | 6 +-
ldap/servers/plugins/presence/presence.def | 2 +-
ldap/servers/plugins/pwdstorage/libpwdstorage.def | 2 +-
ldap/servers/plugins/pwdstorage/pwd_init.c | 25 ++--
ldap/servers/plugins/pwdstorage/pwdstorage.h | 1 -
ldap/servers/plugins/referint/referint.c | 4 +-
ldap/servers/plugins/referint/referint.def | 2 +-
ldap/servers/plugins/replication/repl5_init.c | 25 +--
ldap/servers/plugins/replication/repl_init.c | 21 +--
ldap/servers/plugins/replication/replication.def | 2 +-
ldap/servers/plugins/replication/winsync-plugin.h | 4 +-
ldap/servers/plugins/retrocl/retrocl.c | 6 +-
ldap/servers/plugins/retrocl/retrocl.def | 2 +-
ldap/servers/plugins/retrocl/retrocl.h | 2 -
ldap/servers/plugins/rever/rever.c | 3 +-
ldap/servers/plugins/rever/rever.h | 2 -
ldap/servers/plugins/roles/roles.def | 2 +-
ldap/servers/plugins/roles/roles_cache.c | 2 -
ldap/servers/plugins/roles/roles_plugin.c | 2 +-
ldap/servers/plugins/schema_reload/schema_reload.c | 4 +-
ldap/servers/plugins/shared/plugin-utils.h | 2 -
ldap/servers/plugins/statechange/statechange.c | 4 +-
ldap/servers/plugins/statechange/statechange.def | 2 +-
ldap/servers/plugins/syntaxes/bin.c | 8 +-
ldap/servers/plugins/syntaxes/bitstring.c | 2 +-
ldap/servers/plugins/syntaxes/ces.c | 8 +-
ldap/servers/plugins/syntaxes/cis.c | 14 +-
ldap/servers/plugins/syntaxes/deliverymethod.c | 2 +-
ldap/servers/plugins/syntaxes/dn.c | 4 +-
ldap/servers/plugins/syntaxes/facsimile.c | 2 +-
ldap/servers/plugins/syntaxes/guide.c | 4 +-
ldap/servers/plugins/syntaxes/int.c | 4 +-
ldap/servers/plugins/syntaxes/libsyntax.def | 2 +-
ldap/servers/plugins/syntaxes/nameoptuid.c | 2 +-
ldap/servers/plugins/syntaxes/numericstring.c | 4 +-
ldap/servers/plugins/syntaxes/sicis.c | 2 +-
ldap/servers/plugins/syntaxes/syntax.h | 1 -
ldap/servers/plugins/syntaxes/tel.c | 2 +-
ldap/servers/plugins/syntaxes/teletex.c | 2 +-
ldap/servers/plugins/syntaxes/telex.c | 2 +-
ldap/servers/plugins/uiduniq/7bit.c | 4 +-
ldap/servers/plugins/uiduniq/libuiduniq.def | 2 +-
ldap/servers/plugins/uiduniq/uid.c | 4 +-
ldap/servers/plugins/usn/usn.c | 2 +-
ldap/servers/plugins/vattrsp_template/vattrsp.c | 4 +-
ldap/servers/plugins/views/views.c | 4 +-
ldap/servers/plugins/views/views.def | 2 +-
ldap/servers/slapd/agtmmap.c | 2 +-
ldap/servers/slapd/agtmmap.h | 2 +-
ldap/servers/slapd/back-ldbm/init.c | 6 +-
ldap/servers/slapd/back-ldbm/upgrade.c | 2 +-
ldap/servers/slapd/back-ldif/back-ldif.h | 1 -
ldap/servers/slapd/back-ldif/init.c | 2 +-
ldap/servers/slapd/extendop.c | 4 +-
ldap/servers/slapd/libglobs.c | 7 -
ldap/servers/slapd/libslapd.def | 4 +-
ldap/servers/slapd/lite_entries.c | 143 -----------------
ldap/servers/slapd/log.c | 4 +-
ldap/servers/slapd/main.c | 12 --
ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc | 34 ++--
ldap/servers/slapd/ntperfdll/nsldapctrs.ini | 4 +-
ldap/servers/slapd/ntuserpin.c | 2 +-
ldap/servers/slapd/passwd_extop.c | 2 +-
ldap/servers/slapd/plugin.c | 92 ++----------
ldap/servers/slapd/proto-slap.h | 5 -
ldap/servers/slapd/schema.c | 46 ------
ldap/servers/slapd/slap.h | 11 +-
ldap/servers/slapd/slapi-private.h | 1 -
ldap/servers/slapd/start_tls_extop.c | 2 +-
ldap/servers/slapd/test-plugins/README | 7 +-
ldap/servers/slapd/test-plugins/testbind.c | 2 +-
ldap/servers/slapd/test-plugins/testdatainterop.c | 4 +-
ldap/servers/slapd/test-plugins/testentry.c | 2 +-
ldap/servers/slapd/test-plugins/testextendedop.c | 2 +-
ldap/servers/slapd/test-plugins/testgetip.c | 2 +-
ldap/servers/slapd/test-plugins/testplugin.def | 2 +-
ldap/servers/slapd/test-plugins/testpostop.c | 2 +-
ldap/servers/slapd/test-plugins/testpreop.c | 2 +-
ldap/servers/slapd/test-plugins/testsaslbind.c | 4 +-
ldap/servers/slapd/tools/keyupg.c | 122 ---------------
ldap/servers/snmp/netscape-ldap.mib | 4 +-
ldap/servers/snmp/ntagt/nsldapagt_nt.c | 2 +-
ldap/servers/snmp/ntagt/nsldapagt_nt.def | 2 +-
ldap/servers/snmp/redhat-directory.mib | 4 +-
ldap/systools/idsktune.c | 8 +-
lib/ldaputil/examples/Certmap.mak | 26 ++--
lib/ldaputil/utest/auth.cpp | 4 +-
lib/ldaputil/utest/authtest | 2 +-
lib/ldaputil/utest/certmap.conf | 2 +-
lib/ldaputil/utest/stubs.cpp | 2 +-
lib/ldaputil/utest/test.ref | 14 +-
lib/libsi18n/getstrmem.h | 12 +-
man/man1/cl-dump.1 | 2 +-
man/man1/dbgen.pl.1 | 2 +-
man/man1/dbscan.1 | 2 +-
man/man1/dsktune.1 | 2 +-
man/man1/infadd.1 | 2 +-
man/man1/ldap-agent.1 | 2 +-
man/man1/ldclt.1 | 2 +-
man/man1/ldif.1 | 2 +-
man/man1/logconv.pl.1 | 2 +-
man/man1/migratecred.1 | 2 +-
man/man1/mmldif.1 | 2 +-
man/man1/pwdhash.1 | 2 +-
man/man1/repl-monitor.1 | 2 +-
man/man1/rsearch.1 | 2 +-
man/man8/migrate-ds.pl.8 | 2 +-
man/man8/ns-slapd.8 | 2 +-
man/man8/remove-ds.pl.8 | 2 +-
man/man8/setup-ds.pl.8 | 2 +-
151 files changed, 281 insertions(+), 1209 deletions(-)
delete mode 100755 dirver.pl
delete mode 100644 ldap/include/dirlite_strings.h
delete mode 100644 ldap/include/litekey.h
delete mode 100644 ldap/servers/slapd/lite_entries.c
delete mode 100644 ldap/servers/slapd/tools/keyupg.c
diff --git a/Makefile.am b/Makefile.am
index f0123f0..c49162b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ QUOTE := $(NULLSTRING)"# a double quote"
BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
NQBUILDNUM := $(subst \,,$(subst $(QUOTE),,$(BUILDNUM)))
DEBUG_DEFINES = @debug_defs@
-DS_DEFINES = -DBUILD_NUM=$(BUILDNUM)
+DS_DEFINES = -DBUILD_NUM=$(BUILDNUM) -DVENDOR="\"$(vendor)\"" -DBRAND="\"$(brand)\"" -DCAPBRAND="\"$(capbrand)\""
DS_INCLUDES = -I$(srcdir)/ldap/include -I$(srcdir)/ldap/servers/slapd -I$(srcdir)/include -I.
# these paths are dependent on the settings of prefix and exec_prefix which may be specified
# at make time. So we cannot use AC_DEFINE in the configure.ac because that would set the
@@ -63,9 +63,9 @@ LIBCRUN=@LIBCRUN@
#------------------------
# Generated Sources
#------------------------
-BUILT_SOURCES = dirver.h dberrstrs.h
+BUILT_SOURCES = dberrstrs.h
-CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties \
+CLEANFILES = dberrstrs.h ns-slapd.properties \
ldap/admin/src/scripts/dscreate.map ldap/admin/src/scripts/remove-ds.pl \
ldap/admin/src/scripts/DSCreate.pm ldap/admin/src/scripts/DSMigration.pm \
ldap/admin/src/scripts/dsorgentries.map ldap/admin/src/scripts/migrate-ds.pl \
@@ -92,9 +92,6 @@ CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties \
ldap/ldif/template-orgunit.ldif ldap/ldif/template-pampta.ldif ldap/ldif/template-sasl.ldif \
ldap/ldif/template-state.ldif ldap/ldif/template-suffix-db.ldif
-dirver.h: Makefile
- perl $(srcdir)/dirver.pl -v "$(VERSION)" -o dirver.h
-
dberrstrs.h: Makefile
perl $(srcdir)/ldap/servers/slapd/mkDBErrStrs.pl -i @db_incdir@ -o .
@@ -1117,7 +1114,6 @@ ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \
ldap/servers/slapd/globals.c \
ldap/servers/slapd/house.c \
ldap/servers/slapd/init.c \
- ldap/servers/slapd/lite_entries.c \
ldap/servers/slapd/main.c \
ldap/servers/slapd/monitor.c \
ldap/servers/slapd/passwd_extop.c \
@@ -1169,9 +1165,9 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
# these are for the config files and scripts that we need to generate and replace
# the paths and other tokens with the real values set during configure/make
# note that we cannot just use AC_OUTPUT to do this for us, since it will do things like this:
-# LD_LIBRARY_PATH = ${prefix}/lib/fedora-ds
+# LD_LIBRARY_PATH = ${prefix}/lib/dirsrv
# i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
-# LD_LIBRARY_PATH = /usr/lib/fedora-ds
+# LD_LIBRARY_PATH = /usr/lib/dirsrv
if BUNDLE
# on the systems on which we bundle, perldap will be in libdir/perl, so we need to point
# the perlpath there - on other systems, perldap will be installed as a site module into
diff --git a/ldap/admin/src/scripts/Migration.pm.in b/ldap/admin/src/scripts/Migration.pm.in
index e911278..65ea1ac 100644
--- a/ldap/admin/src/scripts/Migration.pm.in
+++ b/ldap/admin/src/scripts/Migration.pm.in
@@ -198,7 +198,7 @@ sub init {
my $pkgname = "@package_name@";
# this is the new pkgname which may be something like
- # fedora-ds-base - we have to strip off the -suffix
+ # 389-ds-base - we have to strip off the -suffix
if ($pkgname =~ /-(core|base)$/) {
$pkgname =~ s/-(core|base)$//;
}
diff --git a/ldap/admin/src/upgradeServer b/ldap/admin/src/upgradeServer
index 4111357..2724805 100755
--- a/ldap/admin/src/upgradeServer
+++ b/ldap/admin/src/upgradeServer
@@ -205,7 +205,7 @@ sub modify_dse_ldif
print DSE "nsslapd-pluginEnabled: on\n";
print DSE "nsslapd-pluginId: oid-syntax\n";
print DSE "nsslapd-pluginVersion: 1.0.3\n";
- print DSE "nsslapd-pluginVendor: Fedora Project\n";
+ print DSE "nsslapd-pluginVendor: 389 Project\n";
print DSE "nsslapd-pluginDescription: OID attribute syntax plugin\n";
print DSE "\n";
}
@@ -223,7 +223,7 @@ sub modify_dse_ldif
print DSE "nsslapd-pluginEnabled: on\n";
print DSE "nsslapd-pluginId: jpeg-syntax\n";
print DSE "nsslapd-pluginVersion: 1.0.3\n";
- print DSE "nsslapd-pluginVendor: Fedora Project\n";
+ print DSE "nsslapd-pluginVendor: 389 Project\n";
print DSE "nsslapd-pluginDescription: JPEG attribute syntax plugin\n";
print DSE "\n";
}
@@ -241,7 +241,7 @@ sub modify_dse_ldif
print DSE "nsslapd-pluginEnabled: on\n";
print DSE "nsslapd-pluginId: spaceinsensitivestring-syntax\n";
print DSE "nsslapd-pluginVersion: 1.0.3\n";
- print DSE "nsslapd-pluginVendor: Fedora Project\n";
+ print DSE "nsslapd-pluginVendor: 389 Project\n";
print DSE "nsslapd-pluginDescription: space insensitive string attribute syntax plugin\n";
print DSE "\n";
}
@@ -337,6 +337,17 @@ sub getSlapdVersion {
}
last;
}
+ elsif (/^389-Directory\/(\d+)\.(\d+)(?:\.(\d+))?(?:b\d)*\s+(\S+)/) {
+ $version = $1;
+ $minor = $2;
+ if ($4) {
+ $subminor = $3;
+ $buildNumber = $4;
+ } else {
+ $buildNumber = $3;
+ }
+ last;
+ }
elsif (/^Fedora-Directory\/(\d+)\.(\d+)(?:\.(\d+))?(?:b\d)*\s+(\S+)/) {
$version = $1;
$minor = $2;
diff --git a/ldap/docs/LICENSE.txt b/ldap/docs/LICENSE.txt
index a1591af..a6bc4cb 100644
--- a/ldap/docs/LICENSE.txt
+++ b/ldap/docs/LICENSE.txt
@@ -1,14 +1,14 @@
LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
-FEDORA(TM) DIRECTORY SERVER
+389(TM) DIRECTORY SERVER
-This agreement governs the use of Fedora Directory Server,
+This agreement governs the use of 389 Directory Server,
Administration Server and Management Console (collectively, the
"SOFTWARE") and any updates to the Software, regardless of the
delivery mechanism.
-1. FEDORA DIRECTORY SERVER
+1. 389 DIRECTORY SERVER
-1.1 LICENSE GRANT. Fedora Directory Server ("FDS") is a modular
+1.1 LICENSE GRANT. 389 Directory Server ("389") is a modular
application consisting of hundreds of software components and is a
collective work under U.S. Copyright Law. Subject to the following
terms, Red Hat, Inc. ("RED HAT") grants to the user ("LICENSEE") a
diff --git a/ldap/docs/README.txt b/ldap/docs/README.txt
index f5c2bda..45be98b 100644
--- a/ldap/docs/README.txt
+++ b/ldap/docs/README.txt
@@ -1,11 +1,11 @@
=======================================================================
- Fedora Directory Server 1.0.4
+ 389 Directory Server 1.2.1
=======================================================================
-The Fedora Directory Server is subject to the terms detailed in the
+The 389 Directory Server is subject to the terms detailed in the
license agreement file called LICENSE.txt.
-Late-breaking news and information on the Fedora Directory Server is
+Late-breaking news and information on the 389 Directory Server is
available at the following location:
- http://directory.fedora.redhat.com
+ http://port389.org/
diff --git a/ldap/include/ntslapdregparms.h b/ldap/include/ntslapdregparms.h
index ef40080..78eed47 100644
--- a/ldap/include/ntslapdregparms.h
+++ b/ldap/include/ntslapdregparms.h
@@ -53,8 +53,8 @@
#define _NTSLAPDREGPARMS_H_
#define COMPANY_KEY "SOFTWARE\\Netscape"
-#define COMPANY_NAME "Fedora Project"
-#define PROGRAM_GROUP_NAME "Fedora"
+#define COMPANY_NAME VENDOR
+#define PROGRAM_GROUP_NAME VENDOR
#define PRODUCT_NAME "slapd"
#define PRODUCT_BIN "ns-slapd"
#define SLAPD_EXE "slapd.exe"
@@ -64,8 +64,8 @@
#define SLAPD_DONGLE_FILE "password.dng"
#define DONGLE_FILE_NAME SLAPD_DONGLE_FILE
#define PRODUCT_VERSION "1.0"
-#define EVENTLOG_APPNAME "FedoraSlapd"
-#define DIRECTORY_SERVICE_PREFIX "Fedora Directory Server "
+#define EVENTLOG_APPNAME VENDOR "Slapd"
+#define DIRECTORY_SERVICE_PREFIX CAPBRAND " Directory Server "
#define SERVICE_PREFIX DIRECTORY_SERVICE_PREFIX
#define CONFIG_PATH_KEY "ConfigurationPath"
#define EVENTLOG_MESSAGES_KEY "EventMessageFile"
diff --git a/ldap/ldif/Example-roles.ldif b/ldap/ldif/Example-roles.ldif
index b6dd2d0..6e1050c 100644
--- a/ldap/ldif/Example-roles.ldif
+++ b/ldap/ldif/Example-roles.ldif
@@ -3020,8 +3020,8 @@ objectclass: nsManagedRoleDefinition
cn: PD Managers
description: People who can manage engineer entries
-dn: ou=Fedora Servers,dc=example,dc=com
+dn: ou=Dirsrv Servers,dc=example,dc=com
objectclass: top
objectclass: organizationalUnit
-ou: Fedora Servers
-description: Standard branch for Fedora Server registration
+ou: Dirsrv Servers
+description: Standard branch for Dirsrv Server registration
diff --git a/ldap/ldif/Example.ldif b/ldap/ldif/Example.ldif
index 84d51f6..16025af 100644
--- a/ldap/ldif/Example.ldif
+++ b/ldap/ldif/Example.ldif
@@ -3006,8 +3006,8 @@ uniquemember: uid=kwinters, ou=People, dc=example,dc=com
uniquemember: uid=trigden, ou=People, dc=example,dc=com
description: People who can manage engineer entries
-dn: ou=Fedora Servers,dc=example,dc=com
+dn: ou=Dirsrv Servers,dc=example,dc=com
objectclass: top
objectclass: organizationalUnit
-ou: Fedora Servers
-description: Standard branch for Fedora Server registration
+ou: Dirsrv Servers
+description: Standard branch for Dirsrv Server registration
diff --git a/ldap/schema/60pureftpd.ldif b/ldap/schema/60pureftpd.ldif
index 305d30c..0ca98a3 100644
--- a/ldap/schema/60pureftpd.ldif
+++ b/ldap/schema/60pureftpd.ldif
@@ -1,4 +1,4 @@
-# 60pureftpd.ldif - pureftpd.schema for Fedora / Red Hat Directory Server
+# 60pureftpd.ldif - Pure-FTPd schema
################################################################################
#
# See README.LDAP in the Pure-FTPd documentation for more information.
diff --git a/ldap/schema/slapd-collations.conf b/ldap/schema/slapd-collations.conf
index 159c6fd..d5c7e2d 100644
--- a/ldap/schema/slapd-collations.conf
+++ b/ldap/schema/slapd-collations.conf
@@ -37,7 +37,6 @@
# All rights reserved.
# END COPYRIGHT BLOCK
#
-# Used by Fedora Directory Server
#######################################################################
# Collations
#######################################################################
diff --git a/ldap/servers/plugins/acl/aclplugin.c b/ldap/servers/plugins/acl/aclplugin.c
index b8cefb1..f2b9f0f 100644
--- a/ldap/servers/plugins/acl/aclplugin.c
+++ b/ldap/servers/plugins/acl/aclplugin.c
@@ -46,10 +46,8 @@
*
*/
#include "acl.h"
-#include "dirver.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-static Slapi_PluginDesc pdesc = { "acl", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "acl access check plugin" };
+static Slapi_PluginDesc pdesc = { "acl", VENDOR, PACKAGE_VERSION, "acl access check plugin" };
char *plugin_name = ACL_PLUGIN_NAME;
/* Prototypes */
diff --git a/ldap/servers/plugins/acl/libacl.def b/ldap/servers/plugins/acl/libacl.def
index b436696..e9eefc3 100644
--- a/ldap/servers/plugins/acl/libacl.def
+++ b/ldap/servers/plugins/acl/libacl.def
@@ -38,7 +38,7 @@
;
;
;
-DESCRIPTION 'Fedora Directory Server 1.0 ACL Plugin'
+DESCRIPTION 'Dirsrv 1.0 ACL Plugin'
;CODE SHARED READ EXECUTE
;DATA SHARED READ WRITE
EXPORTS
diff --git a/ldap/servers/plugins/bitwise/bitwise.c b/ldap/servers/plugins/bitwise/bitwise.c
index fb70fcf..7dbdc1f 100644
--- a/ldap/servers/plugins/bitwise/bitwise.c
+++ b/ldap/servers/plugins/bitwise/bitwise.c
@@ -187,7 +187,7 @@ bitwise_filter_create (Slapi_PBlock* pb)
return LDAP_SUCCESS;
}
-static Slapi_PluginDesc pdesc = { "bitwise", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "bitwise", VENDOR, PACKAGE_VERSION,
"bitwise match plugin" };
int /* LDAP error code */
diff --git a/ldap/servers/plugins/chainingdb/cb.h b/ldap/servers/plugins/chainingdb/cb.h
index 263b2b5..d787c0c 100644
--- a/ldap/servers/plugins/chainingdb/cb.h
+++ b/ldap/servers/plugins/chainingdb/cb.h
@@ -52,8 +52,6 @@
#include "slapi-plugin.h"
#include "slapi-private.h"
#include "portable.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
/* Constants */
diff --git a/ldap/servers/plugins/chainingdb/cb_init.c b/ldap/servers/plugins/chainingdb/cb_init.c
index 078c7cd..0f12d3b 100644
--- a/ldap/servers/plugins/chainingdb/cb_init.c
+++ b/ldap/servers/plugins/chainingdb/cb_init.c
@@ -43,8 +43,8 @@
#include "cb.h"
Slapi_PluginDesc chainingdbdesc = { CB_PLUGIN_NAME,
- PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT,
+ VENDOR,
+ PACKAGE_VERSION,
CB_PLUGIN_DESCRIPTION };
diff --git a/ldap/servers/plugins/chainingdb/libcb.def b/ldap/servers/plugins/chainingdb/libcb.def
index 47c7ce8..b38527b 100644
--- a/ldap/servers/plugins/chainingdb/libcb.def
+++ b/ldap/servers/plugins/chainingdb/libcb.def
@@ -38,7 +38,7 @@
;
;
;
-DESCRIPTION 'Fedora Directory Server 1.0 Chaining Database Plugin'
+DESCRIPTION 'Dirsrv 1.0 Chaining Database Plugin'
;CODE SHARED READ EXECUTE
;DATA SHARED READ WRITE
EXPORTS
diff --git a/ldap/servers/plugins/collation/collate.h b/ldap/servers/plugins/collation/collate.h
index 0f5110e..e0667b1 100644
--- a/ldap/servers/plugins/collation/collate.h
+++ b/ldap/servers/plugins/collation/collate.h
@@ -45,7 +45,6 @@
#define _COLLATE_H_
#include <stddef.h> /* size_t */
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
struct indexer_t;
diff --git a/ldap/servers/plugins/collation/collation.def b/ldap/servers/plugins/collation/collation.def
index 397c86c..e62011b 100644
--- a/ldap/servers/plugins/collation/collation.def
+++ b/ldap/servers/plugins/collation/collation.def
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 1.0 Collation Plugin'
+DESCRIPTION 'Dirsrv 1.0 Collation Plugin'
EXPORTS
orderingRule_init @2
plugin_init_debug_level @3
diff --git a/ldap/servers/plugins/collation/orfilter.c b/ldap/servers/plugins/collation/orfilter.c
index 9e07262..ed2ffe2 100644
--- a/ldap/servers/plugins/collation/orfilter.c
+++ b/ldap/servers/plugins/collation/orfilter.c
@@ -969,7 +969,7 @@ or_indexer_create (Slapi_PBlock* pb)
return rc;
}
-static Slapi_PluginDesc pdesc = { "orderingrule", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "orderingrule", VENDOR, PACKAGE_VERSION,
"internationalized ordering rule plugin" };
#define SLAPI_ORPLUGIN_NAME pdesc.spd_description
diff --git a/ldap/servers/plugins/cos/cos.c b/ldap/servers/plugins/cos/cos.c
index 2a4f881..7935110 100644
--- a/ldap/servers/plugins/cos/cos.c
+++ b/ldap/servers/plugins/cos/cos.c
@@ -46,8 +46,6 @@
#include "nspr.h"
#include "slapi-plugin.h"
#include "slapi-private.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
#include "cos_cache.h"
#include "vattr_spi.h"
@@ -134,7 +132,7 @@ int cos_close( Slapi_PBlock *pb );
int cos_post_op( Slapi_PBlock *pb );
-static Slapi_PluginDesc pdesc = { "cos", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "cos", VENDOR, PACKAGE_VERSION,
"class of service plugin" };
static void * cos_plugin_identity = NULL;
diff --git a/ldap/servers/plugins/cos/cos.def b/ldap/servers/plugins/cos/cos.def
index a1906ba..6e285a9 100644
--- a/ldap/servers/plugins/cos/cos.def
+++ b/ldap/servers/plugins/cos/cos.def
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 1.0 Class Of Service Plugin'
+DESCRIPTION 'Dirsrv 1.0 Class Of Service Plugin'
EXPORTS
cos_init @2
plugin_init_debug_level @3
diff --git a/ldap/servers/plugins/cos/cos_cache.c b/ldap/servers/plugins/cos/cos_cache.c
index e46e0ab..a14e48c 100644
--- a/ldap/servers/plugins/cos/cos_cache.c
+++ b/ldap/servers/plugins/cos/cos_cache.c
@@ -71,8 +71,6 @@
#include <string.h>
#include "portable.h"
#include "slapi-plugin.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
/* this is naughty, but the api for backend state change is currently here */
#include "slapi-private.h"
diff --git a/ldap/servers/plugins/deref/deref.c b/ldap/servers/plugins/deref/deref.c
index a242849..306988f 100644
--- a/ldap/servers/plugins/deref/deref.c
+++ b/ldap/servers/plugins/deref/deref.c
@@ -44,8 +44,6 @@
*/
#include <string.h>
#include "deref.h"
-#include "dirlite_strings.h"
-#include "dirver.h"
#include <nspr.h>
#ifndef DN_SYNTAX_OID
@@ -60,8 +58,8 @@ static char *_PluginDN = NULL;
static int g_plugin_started = 0;
static Slapi_PluginDesc pdesc = { DEREF_FEATURE_DESC,
- PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT,
+ VENDOR,
+ PACKAGE_VERSION,
DEREF_PLUGIN_DESC };
/*
diff --git a/ldap/servers/plugins/distrib/README b/ldap/servers/plugins/distrib/README
index fddf4f3..80f71a5 100644
--- a/ldap/servers/plugins/distrib/README
+++ b/ldap/servers/plugins/distrib/README
@@ -38,11 +38,9 @@
----------------------------
Sample pluggable distribution logic
- for Netscape Directory Server
----------------------------
-This directory contains code for some sample server plug-ins intended for
-use with the Fedora Directory Server 1.
+This directory contains code for some sample server plug-ins.
NOTE: Before you compile and run these examples, make sure
to change any server-specific data in the examples to
diff --git a/ldap/servers/plugins/distrib/libdistrib.def b/ldap/servers/plugins/distrib/libdistrib.def
index d8a0b02..f3c4cd5 100644
--- a/ldap/servers/plugins/distrib/libdistrib.def
+++ b/ldap/servers/plugins/distrib/libdistrib.def
@@ -35,7 +35,7 @@
; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
; --- END COPYRIGHT BLOCK ---
-DESCRIPTION 'Fedora Directory Server 1.0 distribution logic example'
+DESCRIPTION 'Dirsrv 1.0 distribution logic example'
EXPORTS
alpha_distribution @1
hash_distribution @2
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
index b8e21f0..d35cd8c 100644
--- a/ldap/servers/plugins/dna/dna.c
+++ b/ldap/servers/plugins/dna/dna.c
@@ -50,8 +50,6 @@
#include "portable.h"
#include "nspr.h"
#include "slapi-private.h"
-#include "dirlite_strings.h"
-#include "dirver.h"
#include "prclist.h"
/* Required to get portable printf/scanf format macros */
@@ -124,13 +122,13 @@
#define DNA_EXTEND_EXOP_RESPONSE_OID "2.16.840.1.113730.3.5.11"
static Slapi_PluginDesc pdesc = { DNA_FEATURE_DESC,
- PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT,
+ VENDOR,
+ PACKAGE_VERSION,
DNA_PLUGIN_DESC };
static Slapi_PluginDesc exop_pdesc = { DNA_EXOP_FEATURE_DESC,
- PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT,
+ VENDOR,
+ PACKAGE_VERSION,
DNA_EXOP_DESC };
diff --git a/ldap/servers/plugins/http/http_client.c b/ldap/servers/plugins/http/http_client.c
index 814e8d1..2203327 100644
--- a/ldap/servers/plugins/http/http_client.c
+++ b/ldap/servers/plugins/http/http_client.c
@@ -53,8 +53,6 @@
#include "slapi-plugin.h"
#include "slapi-private.h"
-#include "dirlite_strings.h"
-#include "dirver.h"
#include "http_client.h"
#include "http_impl.h"
@@ -122,8 +120,8 @@ static void *api[7];
* Plugin identifiers
*/
static Slapi_PluginDesc pdesc = { "http-client",
- PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT,
+ VENDOR,
+ PACKAGE_VERSION,
"HTTP Client plugin" };
static Slapi_ComponentId *plugin_id = NULL;
diff --git a/ldap/servers/plugins/http/http_impl.c b/ldap/servers/plugins/http/http_impl.c
index 29a91c1..c9e82be 100644
--- a/ldap/servers/plugins/http/http_impl.c
+++ b/ldap/servers/plugins/http/http_impl.c
@@ -207,8 +207,6 @@ static int readConfigLDAPurl(Slapi_ComponentId *plugin_id, char *plugindn);
static int parseHTTPConfigEntry(Slapi_Entry *e);
static int parseConfigEntry(Slapi_Entry *e);
-static int nssReinitializationRequired();
-
/*SSL functions */
PRFileDesc* setupSSLSocket(PRFileDesc* fd);
@@ -257,8 +255,6 @@ static int doRequest(const char *url, httpheader **httpheaderArray, char *body,
char *host = NULL;
char *path = NULL;
- char *val = NULL;
- char *defaultprefix = NULL;
PRFileDesc *fd = NULL;
PRNetAddr addr;
PRInt32 port;
@@ -315,49 +311,6 @@ static int doRequest(const char *url, httpheader **httpheaderArray, char *body,
setTCPNoDelay(fd);
if (sslOn) {
-
- /* Have to reinitialize NSS is the DS security is set to off.
- This is because the HTTPS required the cert dbs to be created.
- The default prefixes are used as per DS norm */
-
- if (PL_strcasecmp(httpConfig->DS_sslOn, "off") == 0) {
- if (!httpConfig->nssInitialized) {
- if (nssReinitializationRequired())
- {
- PRInt32 nssStatus;
- PRUint32 nssFlags = 0;
- char certDir[1024];
- char certPref[1024];
- char keyPref[1024];
-
- NSS_Shutdown();
- nssFlags &= (~NSS_INIT_READONLY);
- val = config_get_certdir();
- PL_strncpyz(certDir, val, sizeof(certDir));
- defaultprefix = strrchr(certDir, '/');
- if (!defaultprefix)
- defaultprefix = strrchr(certDir, '\\');
- if (!defaultprefix) /* still could not find it . . . */
- goto bail; /* . . . can't do anything */
- defaultprefix++;
- PR_snprintf(certPref, 1024, "%s-",defaultprefix);
- PL_strncpyz(keyPref, certPref, sizeof(keyPref));
- nssStatus = NSS_Initialize(certDir, certPref, keyPref, "secmod.db", nssFlags);
- slapi_ch_free((void **)&val);
-
- if (nssStatus != 0) {
- slapi_log_error(SLAPI_LOG_FATAL, HTTP_PLUGIN_SUBSYSTEM,
- "doRequest: Unable to initialize NSS Cert/Key Database\n");
- status = HTTP_CLIENT_ERROR_NSS_INITIALIZE;
- goto bail;
- }
- }
- httpConfig->nssInitialized = 1;
- }
- }
-
- NSS_SetDomesticPolicy();
-
fd = setupSSLSocket(fd);
if (fd == NULL) {
slapi_log_error( SLAPI_LOG_FATAL, HTTP_PLUGIN_SUBSYSTEM,
@@ -644,58 +597,6 @@ bail:
return status;
}
-static int nssReinitializationRequired()
-{
- int nssReinitializationRequired = 0;
- int err = 0;
- float version = 0;
- const float DSVERSION = 6.1;
- char *str = NULL;
- char *value = NULL;
- Slapi_Entry **entry = NULL;
- Slapi_PBlock *resultpb= NULL;
-
- resultpb= slapi_search_internal( "", LDAP_SCOPE_BASE, "objectclass=*", NULL, NULL, 0);
- slapi_pblock_get( resultpb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &entry );
- slapi_pblock_get( resultpb, SLAPI_PLUGIN_INTOP_RESULT, &err);
- if ( err == LDAP_SUCCESS && entry!=NULL && entry[0]!=NULL)
- {
- value = slapi_entry_attr_get_charptr(entry[0], "vendorVersion");
- if (value == NULL || strncmp(value, "Fedora", strlen("Fedora")))
- {
- slapi_log_error( SLAPI_LOG_PLUGIN, HTTP_PLUGIN_SUBSYSTEM,
- "nssReinitializationRequired: vendor is not Fedora \n");
- slapi_log_error( SLAPI_LOG_PLUGIN, HTTP_PLUGIN_SUBSYSTEM,
- "or version [%s] is earlier than 6.0\n", value?value:"NULL");
- nssReinitializationRequired = 1;
- slapi_free_search_results_internal(resultpb);
- slapi_pblock_destroy(resultpb);
- slapi_ch_free((void **)&value);
- return nssReinitializationRequired;
- }
-
- if ( (str = strstr(value,"/")) != NULL )
- {
- str++;
- version = atof(str);
- slapi_log_error( SLAPI_LOG_PLUGIN, HTTP_PLUGIN_SUBSYSTEM,
- "nssReinitializationRequired: version is %f. \n", version);
- }
-
-
- if (str == NULL || version < DSVERSION)
- {
- nssReinitializationRequired = 1;
- }
- slapi_ch_free((void **)&value);
-
- }
- slapi_free_search_results_internal(resultpb);
- slapi_pblock_destroy(resultpb);
- return nssReinitializationRequired;
-
-}
-
static PRStatus sendGetReq(PRFileDesc *fd, const char *path)
{
PRStatus status = PR_SUCCESS;
diff --git a/ldap/servers/plugins/linkedattrs/linked_attrs.c b/ldap/servers/plugins/linkedattrs/linked_attrs.c
index 5126e35..a04fbb0 100644
--- a/ldap/servers/plugins/linkedattrs/linked_attrs.c
+++ b/ldap/servers/plugins/linkedattrs/linked_attrs.c
@@ -57,8 +57,8 @@ static char *_PluginDN = NULL;
static int g_plugin_started = 0;
static Slapi_PluginDesc pdesc = { LINK_FEATURE_DESC,
- PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT,
+ VENDOR,
+ PACKAGE_VERSION,
LINK_PLUGIN_DESC };
/*
diff --git a/ldap/servers/plugins/linkedattrs/linked_attrs.h b/ldap/servers/plugins/linkedattrs/linked_attrs.h
index 8a3b262..c6e6347 100644
--- a/ldap/servers/plugins/linkedattrs/linked_attrs.h
+++ b/ldap/servers/plugins/linkedattrs/linked_attrs.h
@@ -49,8 +49,6 @@
#include "portable.h"
#include "nspr.h"
#include "slapi-plugin.h"
-#include "dirlite_strings.h"
-#include "dirver.h"
#include "prclist.h"
#include "ldif.h"
diff --git a/ldap/servers/plugins/memberof/memberof.c b/ldap/servers/plugins/memberof/memberof.c
index f1738cc..7589443 100644
--- a/ldap/servers/plugins/memberof/memberof.c
+++ b/ldap/servers/plugins/memberof/memberof.c
@@ -66,16 +66,14 @@
#endif
#include "slapi-plugin.h"
-#include "dirver.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
#include "string.h"
#include "nspr.h"
#include "memberof.h"
-static Slapi_PluginDesc pdesc = { "memberof", PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT, "memberof plugin" };
+static Slapi_PluginDesc pdesc = { "memberof", VENDOR,
+ PACKAGE_VERSION, "memberof plugin" };
static void* _PluginID = NULL;
static Slapi_Mutex *memberof_operation_lock = 0;
diff --git a/ldap/servers/plugins/memberof/memberof.h b/ldap/servers/plugins/memberof/memberof.h
index 268f16c..642e851 100644
--- a/ldap/servers/plugins/memberof/memberof.h
+++ b/ldap/servers/plugins/memberof/memberof.h
@@ -53,8 +53,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 SLAPI_DSE_RETURNTEXT_SIZE, DSE_FLAG_PREOP, and DSE_FLAG_POSTOP */
diff --git a/ldap/servers/plugins/pam_passthru/pam_passthru.h b/ldap/servers/plugins/pam_passthru/pam_passthru.h
index 1f6dccb..6a9d332 100644
--- a/ldap/servers/plugins/pam_passthru/pam_passthru.h
+++ b/ldap/servers/plugins/pam_passthru/pam_passthru.h
@@ -53,8 +53,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/pam_passthru/pam_ptpreop.c b/ldap/servers/plugins/pam_passthru/pam_ptpreop.c
index 254a30a..39c13fc 100644
--- a/ldap/servers/plugins/pam_passthru/pam_ptpreop.c
+++ b/ldap/servers/plugins/pam_passthru/pam_ptpreop.c
@@ -46,7 +46,7 @@
#include "pam_passthru.h"
-static Slapi_PluginDesc pdesc = { "pam_passthruauth", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "pam_passthruauth", VENDOR, PACKAGE_VERSION,
"PAM pass through authentication plugin" };
static void * pam_passthruauth_plugin_identity = NULL;
diff --git a/ldap/servers/plugins/passthru/libpassthru.def b/ldap/servers/plugins/passthru/libpassthru.def
index 0fd850f..ac54494 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 34f8f69..ac19849 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 e5d43d3..959310f 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" };
/*
diff --git a/ldap/servers/plugins/presence/presence.c b/ldap/servers/plugins/presence/presence.c
index 09c5431..fcb390a 100644
--- a/ldap/servers/plugins/presence/presence.c
+++ b/ldap/servers/plugins/presence/presence.c
@@ -51,8 +51,6 @@
#include "nspr.h"
#include "slapi-plugin.h"
#include "slapi-private.h"
-#include "dirlite_strings.h"
-#include "dirver.h"
#include "vattr_spi.h"
#include "plhash.h"
#include "ldif.h"
@@ -154,8 +152,8 @@ extern "C" {
#define PRESENCE_RETURNED_ERROR_TEXT "ERROR"
static Slapi_PluginDesc pdesc = { "IM Presence",
- PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT,
+ VENDOR,
+ PACKAGE_VERSION,
"presence plugin" };
/**
diff --git a/ldap/servers/plugins/presence/presence.def b/ldap/servers/plugins/presence/presence.def
index 780c455..e40b64d 100644
--- a/ldap/servers/plugins/presence/presence.def
+++ b/ldap/servers/plugins/presence/presence.def
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 1.0 Presence Plugin'
+DESCRIPTION 'Dirsrv 1.0 Presence Plugin'
EXPORTS
presence_init @2
plugin_init_debug_level @3
diff --git a/ldap/servers/plugins/pwdstorage/libpwdstorage.def b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
index 07a42f2..5493586 100644
--- a/ldap/servers/plugins/pwdstorage/libpwdstorage.def
+++ b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 1.0 password storage scheme Plugin'
+DESCRIPTION 'Dirsrv 1.0 password storage scheme Plugin'
EXPORTS
sha_pwd_storage_scheme_init @2
ssha_pwd_storage_scheme_init @3
diff --git a/ldap/servers/plugins/pwdstorage/pwd_init.c b/ldap/servers/plugins/pwdstorage/pwd_init.c
index b5104b5..6ae2669 100644
--- a/ldap/servers/plugins/pwdstorage/pwd_init.c
+++ b/ldap/servers/plugins/pwdstorage/pwd_init.c
@@ -46,33 +46,32 @@
#include <sys/types.h>
#include "pwdstorage.h"
-#include "dirver.h"
-static Slapi_PluginDesc sha_pdesc = { "sha-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Secure Hashing Algorithm (SHA)" };
+static Slapi_PluginDesc sha_pdesc = { "sha-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Secure Hashing Algorithm (SHA)" };
-static Slapi_PluginDesc ssha_pdesc = { "ssha-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA)" };
+static Slapi_PluginDesc ssha_pdesc = { "ssha-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Salted Secure Hashing Algorithm (SSHA)" };
-static Slapi_PluginDesc sha256_pdesc = { "sha256-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Secure Hashing Algorithm (SHA256)" };
+static Slapi_PluginDesc sha256_pdesc = { "sha256-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Secure Hashing Algorithm (SHA256)" };
-static Slapi_PluginDesc ssha256_pdesc = { "ssha256-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA256)" };
+static Slapi_PluginDesc ssha256_pdesc = { "ssha256-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Salted Secure Hashing Algorithm (SSHA256)" };
-static Slapi_PluginDesc sha384_pdesc = { "sha384-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Secure Hashing Algorithm (SHA384)" };
+static Slapi_PluginDesc sha384_pdesc = { "sha384-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Secure Hashing Algorithm (SHA384)" };
-static Slapi_PluginDesc ssha384_pdesc = { "ssha384-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA384)" };
+static Slapi_PluginDesc ssha384_pdesc = { "ssha384-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Salted Secure Hashing Algorithm (SSHA384)" };
-static Slapi_PluginDesc sha512_pdesc = { "sha512-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Secure Hashing Algorithm (SHA512)" };
+static Slapi_PluginDesc sha512_pdesc = { "sha512-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Secure Hashing Algorithm (SHA512)" };
-static Slapi_PluginDesc ssha512_pdesc = { "ssha512-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Salted Secure Hashing Algorithm (SSHA512)" };
+static Slapi_PluginDesc ssha512_pdesc = { "ssha512-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Salted Secure Hashing Algorithm (SSHA512)" };
#ifndef _WIN32
-static Slapi_PluginDesc crypt_pdesc = { "crypt-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Unix crypt algorithm (CRYPT)" };
+static Slapi_PluginDesc crypt_pdesc = { "crypt-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Unix crypt algorithm (CRYPT)" };
#endif
-static Slapi_PluginDesc clear_pdesc = { "clear-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "No encryption (CLEAR)" };
+static Slapi_PluginDesc clear_pdesc = { "clear-password-storage-scheme", VENDOR, PACKAGE_VERSION, "No encryption (CLEAR)" };
-static Slapi_PluginDesc ns_mta_md5_pdesc = { "NS-MTA-MD5-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Netscape MD5 (NS-MTA-MD5)" };
+static Slapi_PluginDesc ns_mta_md5_pdesc = { "NS-MTA-MD5-password-storage-scheme", VENDOR, PACKAGE_VERSION, "Netscape MD5 (NS-MTA-MD5)" };
-static Slapi_PluginDesc md5_pdesc = { "md5-password-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "MD5 hash algorithm (MD5)" };
+static Slapi_PluginDesc md5_pdesc = { "md5-password-storage-scheme", VENDOR, PACKAGE_VERSION, "MD5 hash algorithm (MD5)" };
static char *plugin_name = "NSPwdStoragePlugin";
diff --git a/ldap/servers/plugins/pwdstorage/pwdstorage.h b/ldap/servers/plugins/pwdstorage/pwdstorage.h
index 975d789..895ac4e 100644
--- a/ldap/servers/plugins/pwdstorage/pwdstorage.h
+++ b/ldap/servers/plugins/pwdstorage/pwdstorage.h
@@ -50,7 +50,6 @@
#include "ldif.h"
#include "md5.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
#define PWD_HASH_PREFIX_START '{'
#define PWD_HASH_PREFIX_END '}'
diff --git a/ldap/servers/plugins/referint/referint.c b/ldap/servers/plugins/referint/referint.c
index 25df199..0a44310 100644
--- a/ldap/servers/plugins/referint/referint.c
+++ b/ldap/servers/plugins/referint/referint.c
@@ -45,8 +45,6 @@
#include "portable.h"
#include "slapi-plugin.h"
#include "slap.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
/* include NSPR header files */
#include "prthread.h"
@@ -94,7 +92,7 @@ int keeprunning = 0;
static PRLock *keeprunning_mutex = NULL;
static PRCondVar *keeprunning_cv = NULL;
-static Slapi_PluginDesc pdesc = { "referint", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "referint", VENDOR, PACKAGE_VERSION,
"referential integrity plugin" };
static void* referint_plugin_identity = NULL;
diff --git a/ldap/servers/plugins/referint/referint.def b/ldap/servers/plugins/referint/referint.def
index 97d088c..3c7558d 100644
--- a/ldap/servers/plugins/referint/referint.def
+++ b/ldap/servers/plugins/referint/referint.def
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 1.0 Referint Plugin'
+DESCRIPTION 'Dirsrv 1.0 Referint Plugin'
CODE SHARED READ EXECUTE
DATA SHARED READ WRITE
EXPORTS
diff --git a/ldap/servers/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c
index b0bb1b2..2c45179 100644
--- a/ldap/servers/plugins/replication/repl5_init.c
+++ b/ldap/servers/plugins/replication/repl5_init.c
@@ -70,8 +70,6 @@ nsslapd-plugindescription: Multi-Master Replication Plugin
#include "repl.h"
#include "repl5.h"
#include "cl5.h" /* changelog interface */
-#include "dirver.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
#include "plstr.h"
@@ -127,14 +125,14 @@ static char *response_name_list[] = {
/* ----------------------------- Multi-Master Replication Plugin */
-static Slapi_PluginDesc multimasterdesc = {"replication-multimaster", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multi-master Replication Plugin"};
-static Slapi_PluginDesc multimasterpreopdesc = {"replication-multimaster-preop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multi-master replication pre-operation plugin"};
-static Slapi_PluginDesc multimasterpostopdesc = {"replication-multimaster-postop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multi-master replication post-operation plugin"};
-static Slapi_PluginDesc multimasterinternalpreopdesc = {"replication-multimaster-internalpreop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multi-master replication internal pre-operation plugin"};
-static Slapi_PluginDesc multimasterinternalpostopdesc = {"replication-multimaster-internalpostop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multimaster replication internal post-operation plugin"};
-static Slapi_PluginDesc multimasterbepreopdesc = {"replication-multimaster-bepreop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multimaster replication bepre-operation plugin"};
-static Slapi_PluginDesc multimasterbepostopdesc = {"replication-multimaster-bepostop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multimaster replication bepost-operation plugin"};
-static Slapi_PluginDesc multimasterextopdesc = { "replication-multimaster-extop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Multimaster replication extended-operation plugin" };
+static Slapi_PluginDesc multimasterdesc = {"replication-multimaster", VENDOR, PACKAGE_VERSION, "Multi-master Replication Plugin"};
+static Slapi_PluginDesc multimasterpreopdesc = {"replication-multimaster-preop", VENDOR, PACKAGE_VERSION, "Multi-master replication pre-operation plugin"};
+static Slapi_PluginDesc multimasterpostopdesc = {"replication-multimaster-postop", VENDOR, PACKAGE_VERSION, "Multi-master replication post-operation plugin"};
+static Slapi_PluginDesc multimasterinternalpreopdesc = {"replication-multimaster-internalpreop", VENDOR, PACKAGE_VERSION, "Multi-master replication internal pre-operation plugin"};
+static Slapi_PluginDesc multimasterinternalpostopdesc = {"replication-multimaster-internalpostop", VENDOR, PACKAGE_VERSION, "Multimaster replication internal post-operation plugin"};
+static Slapi_PluginDesc multimasterbepreopdesc = {"replication-multimaster-bepreop", VENDOR, PACKAGE_VERSION, "Multimaster replication bepre-operation plugin"};
+static Slapi_PluginDesc multimasterbepostopdesc = {"replication-multimaster-bepostop", VENDOR, PACKAGE_VERSION, "Multimaster replication bepost-operation plugin"};
+static Slapi_PluginDesc multimasterextopdesc = { "replication-multimaster-extop", VENDOR, PACKAGE_VERSION, "Multimaster replication extended-operation plugin" };
static int multimaster_stopped_flag; /* A flag which is set when all the plugin threads are to stop */
static int multimaster_started_flag = 0;
@@ -569,13 +567,6 @@ int replication_multimaster_plugin_init(Slapi_PBlock *pb)
*/
multimaster_mtnode_extension_init ();
- if(config_is_slapd_lite())
- {
- slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name,
- "replication plugin not approved for restricted"
- " mode Directory Server.\n" );
- rc= -1;
- }
if(rc==0 && !multimaster_initialised)
{
/* initialize replica hash - has to be done before mapping tree is
diff --git a/ldap/servers/plugins/replication/repl_init.c b/ldap/servers/plugins/replication/repl_init.c
index 83cc04f..7177ff6 100644
--- a/ldap/servers/plugins/replication/repl_init.c
+++ b/ldap/servers/plugins/replication/repl_init.c
@@ -70,8 +70,6 @@ NOTE: This plugin depends on the Multi-Master Replication Plugin
#include "repl5.h"
#include "repl_shared.h"
#include "cl4.h" /* changelog interface */
-#include "dirver.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
#ifdef _WIN32
int *module_ldap_debug = 0;
@@ -84,12 +82,12 @@ void plugin_init_debug_level(int *level_ptr)
/* ----------------------------- Legacy Replication Plugin */
-static Slapi_PluginDesc legacydesc = { "replication-legacy", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Legacy Replication Plugin" };
-static Slapi_PluginDesc legacypreopdesc = { "replication-legacy-preop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Legacy replication pre-operation plugin" };
-static Slapi_PluginDesc legacypostopdesc = { "replication-legacy-postop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Legacy replication post-operation plugin" };
-static Slapi_PluginDesc legacyinternalpreopdesc = { "replication-legacy-internalpreop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Legacy replication internal pre-operation plugin" };
-static Slapi_PluginDesc legacyinternalpostopdesc = { "replication-legacy-internalpostop", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Legacy replication internal post-operation plugin" };
-static Slapi_PluginDesc legacyentrydesc = { "replication-legacy-entry", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "Legacy replication entry plugin" };
+static Slapi_PluginDesc legacydesc = { "replication-legacy", VENDOR, PACKAGE_VERSION, "Legacy Replication Plugin" };
+static Slapi_PluginDesc legacypreopdesc = { "replication-legacy-preop", VENDOR, PACKAGE_VERSION, "Legacy replication pre-operation plugin" };
+static Slapi_PluginDesc legacypostopdesc = { "replication-legacy-postop", VENDOR, PACKAGE_VERSION, "Legacy replication post-operation plugin" };
+static Slapi_PluginDesc legacyinternalpreopdesc = { "replication-legacy-internalpreop", VENDOR, PACKAGE_VERSION, "Legacy replication internal pre-operation plugin" };
+static Slapi_PluginDesc legacyinternalpostopdesc = { "replication-legacy-internalpostop", VENDOR, PACKAGE_VERSION, "Legacy replication internal post-operation plugin" };
+static Slapi_PluginDesc legacyentrydesc = { "replication-legacy-entry", VENDOR, PACKAGE_VERSION, "Legacy replication entry plugin" };
static int legacy_stopped; /* A flag which is set when all the plugin threads are to stop */
@@ -312,13 +310,6 @@ replication_legacy_plugin_init(Slapi_PBlock *pb)
PR_ASSERT (identity);
repl_set_plugin_identity (PLUGIN_LEGACY_REPLICATION, identity);
- if(config_is_slapd_lite())
- {
- slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name,
- "replication plugin not approved for restricted"
- " mode Directory Server.\n" );
- rc= -1;
- }
if(rc==0 && !legacy_initialised)
{
rc= slapi_pblock_set( pb, SLAPI_PLUGIN_VERSION, SLAPI_PLUGIN_VERSION_01 );
diff --git a/ldap/servers/plugins/replication/replication.def b/ldap/servers/plugins/replication/replication.def
index 2019486..94b0da7 100644
--- a/ldap/servers/plugins/replication/replication.def
+++ b/ldap/servers/plugins/replication/replication.def
@@ -38,7 +38,7 @@
;
;
;
-DESCRIPTION 'Fedora Directory Server 1.0 Replication Plugin'
+DESCRIPTION 'Dirsrv 1.0 Replication Plugin'
;CODE SHARED READ EXECUTE
;DATA SHARED READ WRITE
EXPORTS
diff --git a/ldap/servers/plugins/replication/winsync-plugin.h b/ldap/servers/plugins/replication/winsync-plugin.h
index 17d2cd1..e6260d2 100644
--- a/ldap/servers/plugins/replication/winsync-plugin.h
+++ b/ldap/servers/plugins/replication/winsync-plugin.h
@@ -491,8 +491,8 @@ test_winsync_destroy_agmt_cb(void *cbdata, const Slapi_DN *ds_subtree,
*/
static Slapi_PluginDesc test_winsync_pdesc = {
"test-winsync-plugin",
- PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT,
+ VENDOR,
+ PACKAGE_VERSION,
"test winsync plugin"
};
diff --git a/ldap/servers/plugins/retrocl/retrocl.c b/ldap/servers/plugins/retrocl/retrocl.c
index 58edc07..dd900f2 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 23ca9fa..fffebea 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 4833d25..e7b65c6 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
diff --git a/ldap/servers/plugins/rever/rever.c b/ldap/servers/plugins/rever/rever.c
index ac01058..50b61ff 100644
--- a/ldap/servers/plugins/rever/rever.c
+++ b/ldap/servers/plugins/rever/rever.c
@@ -43,11 +43,10 @@
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
-#include "dirver.h"
#include "rever.h"
-static Slapi_PluginDesc pdesc = { "des-storage-scheme", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT, "DES storage scheme plugin" };
+static Slapi_PluginDesc pdesc = { "des-storage-scheme", VENDOR, PACKAGE_VERSION, "DES storage scheme plugin" };
static char *plugin_name = "ReverStoragePlugin";
diff --git a/ldap/servers/plugins/rever/rever.h b/ldap/servers/plugins/rever/rever.h
index ac303fd..8ea6279 100644
--- a/ldap/servers/plugins/rever/rever.h
+++ b/ldap/servers/plugins/rever/rever.h
@@ -49,8 +49,6 @@
#include "slap.h"
#include "ldaplog.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-
#define REVER_SCHEME_NAME "DES"
#define PWD_HASH_PREFIX_START '{'
#define PWD_HASH_PREFIX_END '}'
diff --git a/ldap/servers/plugins/roles/roles.def b/ldap/servers/plugins/roles/roles.def
index efa79ac..9a8c1c7 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 c5ba1c1..b7de265 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 046df3d..92a64ed 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;
diff --git a/ldap/servers/plugins/schema_reload/schema_reload.c b/ldap/servers/plugins/schema_reload/schema_reload.c
index 4b27366..b47d425 100644
--- a/ldap/servers/plugins/schema_reload/schema_reload.c
+++ b/ldap/servers/plugins/schema_reload/schema_reload.c
@@ -74,13 +74,11 @@
#include "slap.h"
#include "slapi-plugin.h"
#include "nspr.h"
-#include "dirver.h" /* PRODUCTTEXT */
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
static PRLock *schemareload_lock = NULL;
static Slapi_PluginDesc pdesc = { "schemareload",
- PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ VENDOR, PACKAGE_VERSION,
"task plugin to reload schema files" };
static int schemareload_add(Slapi_PBlock *pb, Slapi_Entry *e,
diff --git a/ldap/servers/plugins/shared/plugin-utils.h b/ldap/servers/plugins/shared/plugin-utils.h
index 1288455..3188352 100644
--- a/ldap/servers/plugins/shared/plugin-utils.h
+++ b/ldap/servers/plugins/shared/plugin-utils.h
@@ -69,14 +69,12 @@
* slapi_modify_internal()
*/
#include "slapi-plugin-compat4.h"
-#include <dirlite_strings.h>
#include <stdio.h>
#include <string.h>
#ifdef _WINDOWS
#undef strcasecmp
#define strcasecmp strcmpi
#endif
-#include "dirver.h"
#ifdef LDAP_DEBUG
#ifndef DEBUG
diff --git a/ldap/servers/plugins/statechange/statechange.c b/ldap/servers/plugins/statechange/statechange.c
index 89809de..8db0591 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 553c0ee..4a0daf6 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
diff --git a/ldap/servers/plugins/syntaxes/bin.c b/ldap/servers/plugins/syntaxes/bin.c
index be42358..791f31c 100644
--- a/ldap/servers/plugins/syntaxes/bin.c
+++ b/ldap/servers/plugins/syntaxes/bin.c
@@ -79,22 +79,22 @@ static char *fax_names[] = { "FAX", FAX_SYNTAX_OID, 0 };
* a number of attributes in our default schema. We should try to eliminate
* it's use and remove support for it. */
static Slapi_PluginDesc bin_pdesc = {
- "bin-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ "bin-syntax", VENDOR, PACKAGE_VERSION,
"binary attribute syntax plugin"
};
static Slapi_PluginDesc octetstring_pdesc = {
- "octetstring-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ "octetstring-syntax", VENDOR, PACKAGE_VERSION,
"octet string attribute syntax plugin"
};
static Slapi_PluginDesc jpeg_pdesc = {
- "jpeg-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ "jpeg-syntax", VENDOR, PACKAGE_VERSION,
"JPEG attribute syntax plugin"
};
static Slapi_PluginDesc fax_pdesc = {
- "fax-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ "fax-syntax", VENDOR, PACKAGE_VERSION,
"Fax attribute syntax plugin"
};
diff --git a/ldap/servers/plugins/syntaxes/bitstring.c b/ldap/servers/plugins/syntaxes/bitstring.c
index 91f8884..d5eb7cc 100644
--- a/ldap/servers/plugins/syntaxes/bitstring.c
+++ b/ldap/servers/plugins/syntaxes/bitstring.c
@@ -63,7 +63,7 @@ static int bitstring_validate(struct berval *val);
/* the first name is the official one from RFC 4517 */
static char *names[] = { "Bit String", "bitstring", BITSTRING_SYNTAX_OID, 0 };
-static Slapi_PluginDesc pdesc = { "bitstring-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "bitstring-syntax", VENDOR, PACKAGE_VERSION,
"Bit String attribute syntax plugin" };
int
diff --git a/ldap/servers/plugins/syntaxes/ces.c b/ldap/servers/plugins/syntaxes/ces.c
index 68b642f..07f9ba8 100644
--- a/ldap/servers/plugins/syntaxes/ces.c
+++ b/ldap/servers/plugins/syntaxes/ces.c
@@ -69,11 +69,11 @@ static char *ia5_names[] = { "IA5String", "ces", "caseexactstring",
/* the first name is the official one from RFC 2252 */
static char *uri_names[] = { "URI", "1.3.6.1.4.1.4401.1.1.1",0};
-static Slapi_PluginDesc ia5_pdesc = { "ces-syntax", PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT, "caseExactString attribute syntax plugin" };
+static Slapi_PluginDesc ia5_pdesc = { "ces-syntax", VENDOR,
+ PACKAGE_VERSION, "caseExactString attribute syntax plugin" };
-static Slapi_PluginDesc uri_pdesc = { "uri-syntax", PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT, "uri attribute syntax plugin" };
+static Slapi_PluginDesc uri_pdesc = { "uri-syntax", VENDOR,
+ PACKAGE_VERSION, "uri attribute syntax plugin" };
/*
diff --git a/ldap/servers/plugins/syntaxes/cis.c b/ldap/servers/plugins/syntaxes/cis.c
index 2af300b..2a4c802 100644
--- a/ldap/servers/plugins/syntaxes/cis.c
+++ b/ldap/servers/plugins/syntaxes/cis.c
@@ -153,31 +153,31 @@ n\" "
static Slapi_PluginDesc dirstring_pdesc = { "directorystring-syntax",
- PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ VENDOR, PACKAGE_VERSION,
"DirectoryString attribute syntax plugin" };
static Slapi_PluginDesc boolean_pdesc = { "boolean-syntax",
- PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ VENDOR, PACKAGE_VERSION,
"Boolean attribute syntax plugin" };
static Slapi_PluginDesc time_pdesc = { "time-syntax",
- PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ VENDOR, PACKAGE_VERSION,
"GeneralizedTime attribute syntax plugin" };
static Slapi_PluginDesc country_pdesc = { "countrystring-syntax",
- PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ VENDOR, PACKAGE_VERSION,
"Country String attribute syntax plugin" };
static Slapi_PluginDesc postal_pdesc = { "postaladdress-syntax",
- PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ VENDOR, PACKAGE_VERSION,
"Postal Address attribute syntax plugin" };
static Slapi_PluginDesc oid_pdesc = { "oid-syntax",
- PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ VENDOR, PACKAGE_VERSION,
"OID attribute syntax plugin" };
static Slapi_PluginDesc printable_pdesc = { "printablestring-syntax",
- PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ VENDOR, PACKAGE_VERSION,
"Printable String attribtue syntax plugin" };
diff --git a/ldap/servers/plugins/syntaxes/deliverymethod.c b/ldap/servers/plugins/syntaxes/deliverymethod.c
index 0edb8ce..62a4124 100644
--- a/ldap/servers/plugins/syntaxes/deliverymethod.c
+++ b/ldap/servers/plugins/syntaxes/deliverymethod.c
@@ -64,7 +64,7 @@ static int pdm_validate(const char *start, const char *end);
/* the first name is the official one from RFC 4517 */
static char *names[] = { "Delivery Method", "delivery", DELIVERYMETHOD_SYNTAX_OID, 0 };
-static Slapi_PluginDesc pdesc = { "delivery-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "delivery-syntax", VENDOR, PACKAGE_VERSION,
"Delivery Method attribute syntax plugin" };
int
diff --git a/ldap/servers/plugins/syntaxes/dn.c b/ldap/servers/plugins/syntaxes/dn.c
index fbfb49f..6ab6294 100644
--- a/ldap/servers/plugins/syntaxes/dn.c
+++ b/ldap/servers/plugins/syntaxes/dn.c
@@ -62,8 +62,8 @@ static int dn_validate( struct berval *val );
/* the first name is the official one from RFC 2252 */
static char *names[] = { "DN", DN_SYNTAX_OID, 0 };
-static Slapi_PluginDesc pdesc = { "dn-syntax", PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT, "distinguished name attribute syntax plugin" };
+static Slapi_PluginDesc pdesc = { "dn-syntax", VENDOR,
+ PACKAGE_VERSION, "distinguished name attribute syntax plugin" };
int
dn_init( Slapi_PBlock *pb )
diff --git a/ldap/servers/plugins/syntaxes/facsimile.c b/ldap/servers/plugins/syntaxes/facsimile.c
index c37a360..fa60421 100644
--- a/ldap/servers/plugins/syntaxes/facsimile.c
+++ b/ldap/servers/plugins/syntaxes/facsimile.c
@@ -64,7 +64,7 @@ static int fax_parameter_validate(const char *start, const char *end);
/* the first name is the official one from RFC 4517 */
static char *names[] = { "Facsimile Telephone Number", "facsimile", FACSIMILE_SYNTAX_OID, 0 };
-static Slapi_PluginDesc pdesc = { "facsimile-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "facsimile-syntax", VENDOR, PACKAGE_VERSION,
"Facsimile Telephone Number attribute syntax plugin" };
int
diff --git a/ldap/servers/plugins/syntaxes/guide.c b/ldap/servers/plugins/syntaxes/guide.c
index 90dd27a..0b2e174 100644
--- a/ldap/servers/plugins/syntaxes/guide.c
+++ b/ldap/servers/plugins/syntaxes/guide.c
@@ -70,11 +70,11 @@ static char *guide_names[] = { "Guide", "guide", GUIDE_SYNTAX_OID, 0 };
static char *enhancedguide_names[] = { "Enhanced Guide", "enhancedguide",
ENHANCEDGUIDE_SYNTAX_OID, 0 };
-static Slapi_PluginDesc guide_pdesc = { "guide-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc guide_pdesc = { "guide-syntax", VENDOR, PACKAGE_VERSION,
"Guide attribute syntax plugin" };
static Slapi_PluginDesc enhancedguide_pdesc = { "enhancedguide-syntax",
- PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ VENDOR, PACKAGE_VERSION,
"Enhanced Guide attribute syntax plugin" };
int
diff --git a/ldap/servers/plugins/syntaxes/int.c b/ldap/servers/plugins/syntaxes/int.c
index 0372d3a..2d98d06 100644
--- a/ldap/servers/plugins/syntaxes/int.c
+++ b/ldap/servers/plugins/syntaxes/int.c
@@ -62,8 +62,8 @@ static char *names[] = { "INTEGER", "int", INTEGER_SYNTAX_OID, 0 };
#define INTEGERMATCH_OID "2.5.13.14"
#define INTEGERORDERINGMATCH_OID "2.5.13.15"
-static Slapi_PluginDesc pdesc = { "int-syntax", PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT, "integer attribute syntax plugin" };
+static Slapi_PluginDesc pdesc = { "int-syntax", VENDOR,
+ PACKAGE_VERSION, "integer attribute syntax plugin" };
static Slapi_MatchingRuleEntry
integerMatch = { INTEGERMATCH_OID, NULL /* no alias? */,
diff --git a/ldap/servers/plugins/syntaxes/libsyntax.def b/ldap/servers/plugins/syntaxes/libsyntax.def
index b3da6a6..23dc0b7 100644
--- a/ldap/servers/plugins/syntaxes/libsyntax.def
+++ b/ldap/servers/plugins/syntaxes/libsyntax.def
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 1.0 syntaxes Plugin'
+DESCRIPTION 'Dirsrv 1.0 syntaxes Plugin'
EXPORTS
cis_init @2
ces_init @3
diff --git a/ldap/servers/plugins/syntaxes/nameoptuid.c b/ldap/servers/plugins/syntaxes/nameoptuid.c
index 2086aa9..fe28313 100644
--- a/ldap/servers/plugins/syntaxes/nameoptuid.c
+++ b/ldap/servers/plugins/syntaxes/nameoptuid.c
@@ -63,7 +63,7 @@ static int nameoptuid_validate(struct berval *val);
/* the first name is the official one from RFC 4517 */
static char *names[] = { "Name And Optional UID", "nameoptuid", NAMEANDOPTIONALUID_SYNTAX_OID, 0 };
-static Slapi_PluginDesc pdesc = { "nameoptuid-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "nameoptuid-syntax", VENDOR, PACKAGE_VERSION,
"Name And Optional UID attribute syntax plugin" };
int
diff --git a/ldap/servers/plugins/syntaxes/numericstring.c b/ldap/servers/plugins/syntaxes/numericstring.c
index 180f8f7..2a38538 100644
--- a/ldap/servers/plugins/syntaxes/numericstring.c
+++ b/ldap/servers/plugins/syntaxes/numericstring.c
@@ -63,8 +63,8 @@ static char *names[] = { "Numeric String", "numstr", NUMERICSTRING_SYNTAX_OID, 0
#define NUMERICSTRINGORDERINGMATCH_OID "2.5.13.9"
#define NUMERICSTRINGSUBSTRINGMATCH_OID "2.5.13.10"
-static Slapi_PluginDesc pdesc = { "numstr-syntax", PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT, "numeric string attribute syntax plugin" };
+static Slapi_PluginDesc pdesc = { "numstr-syntax", VENDOR,
+ PACKAGE_VERSION, "numeric string attribute syntax plugin" };
static Slapi_MatchingRuleEntry
numericStringMatch = { NUMERICSTRINGMATCH_OID, NULL /* no alias? */,
diff --git a/ldap/servers/plugins/syntaxes/sicis.c b/ldap/servers/plugins/syntaxes/sicis.c
index 07fee06..bcc80c0 100644
--- a/ldap/servers/plugins/syntaxes/sicis.c
+++ b/ldap/servers/plugins/syntaxes/sicis.c
@@ -69,7 +69,7 @@ static char *names[] = { "SpaceInsensitiveString",
SPACE_INSENSITIVE_STRING_SYNTAX_OID, 0 };
static Slapi_PluginDesc pdesc = { "spaceinsensitivestring-syntax",
- PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ VENDOR, PACKAGE_VERSION,
"space insensitive string attribute syntax plugin" };
int
diff --git a/ldap/servers/plugins/syntaxes/syntax.h b/ldap/servers/plugins/syntaxes/syntax.h
index 865fc8b..4007028 100644
--- a/ldap/servers/plugins/syntaxes/syntax.h
+++ b/ldap/servers/plugins/syntaxes/syntax.h
@@ -49,7 +49,6 @@
#include "slap.h"
#include "slapi-plugin.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
#define SYNTAX_CIS 1
#define SYNTAX_CES 2
diff --git a/ldap/servers/plugins/syntaxes/tel.c b/ldap/servers/plugins/syntaxes/tel.c
index 3a2edd6..8ea3f9e 100644
--- a/ldap/servers/plugins/syntaxes/tel.c
+++ b/ldap/servers/plugins/syntaxes/tel.c
@@ -63,7 +63,7 @@ static int tel_validate(struct berval *val);
/* the first name is the official one from RFC 2252 */
static char *names[] = { "TelephoneNumber", "tel", TELEPHONE_SYNTAX_OID, 0 };
-static Slapi_PluginDesc pdesc = { "tele-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "tele-syntax", VENDOR, PACKAGE_VERSION,
"telephoneNumber attribute syntax plugin" };
int
diff --git a/ldap/servers/plugins/syntaxes/teletex.c b/ldap/servers/plugins/syntaxes/teletex.c
index da9e7fe..683af9f 100644
--- a/ldap/servers/plugins/syntaxes/teletex.c
+++ b/ldap/servers/plugins/syntaxes/teletex.c
@@ -64,7 +64,7 @@ static int ttx_param_validate(const char *start, const char *end);
/* the first name is the official one from RFC 4517 */
static char *names[] = { "Teletex Terminal Identifier", "teletextermid", TELETEXTERMID_SYNTAX_OID, 0 };
-static Slapi_PluginDesc pdesc = { "teletextermid-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "teletextermid-syntax", VENDOR, PACKAGE_VERSION,
"Teletex Terminal Identifier attribute syntax plugin" };
int
diff --git a/ldap/servers/plugins/syntaxes/telex.c b/ldap/servers/plugins/syntaxes/telex.c
index e51f2f7..ed56ef4 100644
--- a/ldap/servers/plugins/syntaxes/telex.c
+++ b/ldap/servers/plugins/syntaxes/telex.c
@@ -63,7 +63,7 @@ static int telex_validate(struct berval *val);
/* the first name is the official one from RFC 4517 */
static char *names[] = { "Telex Number", "telexnumber", TELEXNUMBER_SYNTAX_OID, 0 };
-static Slapi_PluginDesc pdesc = { "telex-syntax", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "telex-syntax", VENDOR, PACKAGE_VERSION,
"Telex Number attribute syntax plugin" };
int
diff --git a/ldap/servers/plugins/uiduniq/7bit.c b/ldap/servers/plugins/uiduniq/7bit.c
index 802c21e..98f216a 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 ed05549..a687de0 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 6fd1a4e..955e677 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;
diff --git a/ldap/servers/plugins/usn/usn.c b/ldap/servers/plugins/usn/usn.c
index 2bb389a..7f46436 100644
--- a/ldap/servers/plugins/usn/usn.c
+++ b/ldap/servers/plugins/usn/usn.c
@@ -42,7 +42,7 @@
#include "usn.h"
static Slapi_PluginDesc pdesc = {
- "USN", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+ "USN", VENDOR, PACKAGE_VERSION,
"USN (Update Sequence Number) plugin" };
static CSNGen *_usn_csngen = NULL;
diff --git a/ldap/servers/plugins/vattrsp_template/vattrsp.c b/ldap/servers/plugins/vattrsp_template/vattrsp.c
index 5a7afe1..b0c9671 100644
--- a/ldap/servers/plugins/vattrsp_template/vattrsp.c
+++ b/ldap/servers/plugins/vattrsp_template/vattrsp.c
@@ -46,8 +46,6 @@
#include "nspr.h"
#include "slapi-plugin.h"
#include "slapi-private.h"
-#include <dirlite_strings.h> /* PLUGIN_MAGIC_VENDOR_STR */
-#include "dirver.h"
#include "vattr_spi.h"
/* the global plugin handle */
@@ -95,7 +93,7 @@ static int vattrsp_vattr_types(
);
-static Slapi_PluginDesc pdesc = { "vattrexamplesp", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "vattrexamplesp", VENDOR, PACKAGE_VERSION,
"vattr service provider example plugin" };
static void * vattrsp_plugin_identity = NULL;
diff --git a/ldap/servers/plugins/views/views.c b/ldap/servers/plugins/views/views.c
index 80e52b9..8563d19 100644
--- a/ldap/servers/plugins/views/views.c
+++ b/ldap/servers/plugins/views/views.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"
#include "views.h"
@@ -150,7 +148,7 @@ static int _internal_api_views_entry_dn_exists(char *view_dn, char *e_dn);
static int _internal_api_views_entry_exists_general(char *view_dn, Slapi_Entry *e, char *e_dn);
-static Slapi_PluginDesc pdesc = { "views", PLUGIN_MAGIC_VENDOR_STR, PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "views", VENDOR, PACKAGE_VERSION,
"virtual directory information tree views plugin" };
static void * view_plugin_identity = NULL;
diff --git a/ldap/servers/plugins/views/views.def b/ldap/servers/plugins/views/views.def
index b045be6..71dd5d0 100644
--- a/ldap/servers/plugins/views/views.def
+++ b/ldap/servers/plugins/views/views.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
views_init @2
plugin_init_debug_level @3
diff --git a/ldap/servers/slapd/agtmmap.c b/ldap/servers/slapd/agtmmap.c
index 9be091b..8211b7b 100644
--- a/ldap/servers/slapd/agtmmap.c
+++ b/ldap/servers/slapd/agtmmap.c
@@ -43,7 +43,7 @@
/********************************************************************
*
* agtmmap.c: Memory Map interface for SNMP sub-agent for
- * Fedora Directory Server stats (for UNIX environment).
+ * Directory Server stats (for UNIX environment).
*
* Revision History:
* 07/22/97 Created Steve Ross
diff --git a/ldap/servers/slapd/agtmmap.h b/ldap/servers/slapd/agtmmap.h
index 14f622a..08b7a27 100644
--- a/ldap/servers/slapd/agtmmap.h
+++ b/ldap/servers/slapd/agtmmap.h
@@ -44,7 +44,7 @@
/********************************************************************
*
* agtmmap.h: Memory Map interface for SNMP sub-agent for
- * Fedora Directory Server stats (for UNIX environment).
+ * Directory Server stats (for UNIX environment).
*
* Revision History:
* 07/22/97 Created Steve Ross
diff --git a/ldap/servers/slapd/back-ldbm/init.c b/ldap/servers/slapd/back-ldbm/init.c
index 76e6d19..e52d8ea 100644
--- a/ldap/servers/slapd/back-ldbm/init.c
+++ b/ldap/servers/slapd/back-ldbm/init.c
@@ -48,8 +48,8 @@
static void *IDL_api[3];
-static Slapi_PluginDesc pdesc = { "ldbm-backend", PLUGIN_MAGIC_VENDOR_STR,
- PRODUCTTEXT, "high-performance LDAP backend database plugin" };
+static Slapi_PluginDesc pdesc = { "ldbm-backend", VENDOR,
+ PACKAGE_VERSION, "high-performance LDAP backend database plugin" };
static int add_ldbm_internal_attr_syntax( const char *name, const char *oid,
const char *syntax, const char *mr_equality, unsigned long extraflags );
@@ -295,7 +295,7 @@ add_ldbm_internal_attr_syntax( const char *name, const char *oid,
origins[1] = NULL;
rc = attr_syntax_create( oid, names, 1,
- "Fedora defined attribute type",
+ "internal server defined attribute type",
NULL, /* superior */
mr_equality, NULL, NULL, /* matching rules */
origins, syntax,
diff --git a/ldap/servers/slapd/back-ldbm/upgrade.c b/ldap/servers/slapd/back-ldbm/upgrade.c
index a9c0cf9..94cbdcb 100644
--- a/ldap/servers/slapd/back-ldbm/upgrade.c
+++ b/ldap/servers/slapd/back-ldbm/upgrade.c
@@ -338,7 +338,7 @@ int ldbm_upgrade(ldbm_instance *inst, int action)
{
LDAPDebug(LDAP_DEBUG_ANY,
"ldbm_upgrade: Upgrading instance %s to %s%s is successfully done.\n",
- inst->inst_name, LDBM_VERSION_BASE, PRODUCTTEXT);
+ inst->inst_name, LDBM_VERSION_BASE, PACKAGE_VERSION);
}
else
{
diff --git a/ldap/servers/slapd/back-ldif/back-ldif.h b/ldap/servers/slapd/back-ldif/back-ldif.h
index 56bbcfd..964c58a 100644
--- a/ldap/servers/slapd/back-ldif/back-ldif.h
+++ b/ldap/servers/slapd/back-ldif/back-ldif.h
@@ -58,7 +58,6 @@
#include "ldaplog.h"
#include "portable.h"
-#include "dirver.h"
#include "slap.h"
#ifdef _WIN32
diff --git a/ldap/servers/slapd/back-ldif/init.c b/ldap/servers/slapd/back-ldif/init.c
index a3259b2..ab74f2f 100644
--- a/ldap/servers/slapd/back-ldif/init.c
+++ b/ldap/servers/slapd/back-ldif/init.c
@@ -51,7 +51,7 @@
#include "back-ldif.h"
-static Slapi_PluginDesc pdesc = { "ldif-backend", "Netscape", PRODUCTTEXT,
+static Slapi_PluginDesc pdesc = { "ldif-backend", "Netscape", PACKAGE_VERSION,
"LDIF backend database plugin" };
#ifdef _WIN32
diff --git a/ldap/servers/slapd/extendop.c b/ldap/servers/slapd/extendop.c
index ced66c3..d3e6d5a 100644
--- a/ldap/servers/slapd/extendop.c
+++ b/ldap/servers/slapd/extendop.c
@@ -353,9 +353,9 @@ extended_op_oid2string( const char *oid )
const char *rval = NULL;
if ( 0 == strcmp(oid, EXTOP_BULK_IMPORT_START_OID)) {
- rval = "Fedora Bulk Import Start";
+ rval = "Bulk Import Start";
} else if ( 0 == strcmp(oid, EXTOP_BULK_IMPORT_DONE_OID)) {
- rval = "Fedora Bulk Import End";
+ rval = "Bulk Import End";
} else {
rval = plugin_extended_op_oid2string( oid );
}
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index d806809..3d20353 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -4560,13 +4560,6 @@ config_get_require_secure_binds(void)
return retVal;
}
-
-int
-config_is_slapd_lite ()
-{
- return ( SLAPD_FULL );
-}
-
int
config_set_maxbersize( const char *attrname, char *value, char *errorbuf, int apply )
{
diff --git a/ldap/servers/slapd/libslapd.def b/ldap/servers/slapd/libslapd.def
index d48719f..c2bdfbe 100644
--- a/ldap/servers/slapd/libslapd.def
+++ b/ldap/servers/slapd/libslapd.def
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 1 Utility Library'
+DESCRIPTION 'Dirsrv 1.0 Plug-in Utility Library'
EXPORTS
slapd_log_error_proc @2
slapd_log_audit_proc @3
@@ -567,7 +567,7 @@ EXPORTS
config_check_referral_mode @533
attr_set_deletion_csn @534
slapi_mod_dump @535
- config_is_slapd_lite @536
+; config_is_slapd_lite @536
; config_set_slapd_type @537
config_get_versionstring @538
slapi_is_rootdse @539
diff --git a/ldap/servers/slapd/log.c b/ldap/servers/slapd/log.c
index 7241129..33c57f4 100644
--- a/ldap/servers/slapd/log.c
+++ b/ldap/servers/slapd/log.c
@@ -1611,7 +1611,7 @@ log_write_title (LOGFD fp)
int err = 0;
PR_snprintf(buff, bufflen, "\t%s B%s\n",
- fe_cfg->versionstring ? fe_cfg->versionstring : "Fedora-Directory",
+ fe_cfg->versionstring ? fe_cfg->versionstring : CAPBRAND "-Directory/" PACKAGE_VERSION,
buildnum ? buildnum : "");
LOG_WRITE_NOW(fp, buff, strlen(buff), 0, err);
@@ -2722,7 +2722,7 @@ log__access_rotationinfof(char *pathname)
/*
* log__check_prevlogs
*
-* check if a given prev log file (e.g., /opt/fedora-ds/slapd-fe/logs/errors.20051201-101347)
+* check if a given prev log file (e.g., /var/log/dirsrv/slapd-fe/logs/errors.20051201-101347)
* is found in the rotationinfo file.
*/
static int
diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c
index ed51825..33e6e11 100644
--- a/ldap/servers/slapd/main.c
+++ b/ldap/servers/slapd/main.c
@@ -1190,8 +1190,6 @@ main( int argc, char **argv)
if (slapd_exemode != SLAPD_EXEMODE_REFERRAL) {
/* else do this after seteuid() */
- lite_entries_init();
-
/* setup cn=tasks tree */
task_init();
@@ -2284,11 +2282,6 @@ slapd_exemode_db2ldif(int argc, char** argv)
0, 0, 0 );
return 1;
}
- if ( config_is_slapd_lite () &&
- !slapi_config_get_readonly () && is_slapd_running() ) {
- LDAPDebug( LDAP_DEBUG_ANY, "%s\n", LITE_BACKUP_ERR, 0, 0);
- return 1;
- }
if (! (SLAPI_PLUGIN_IS_V2(plugin))) {
LDAPDebug(LDAP_DEBUG_ANY, "ERROR: %s is too old to do exports.\n",
@@ -2525,11 +2518,6 @@ slapd_exemode_db2archive()
return 1;
}
- if ( config_is_slapd_lite () && !slapi_config_get_readonly () && is_slapd_running ()) {
- LDAPDebug( LDAP_DEBUG_ANY, "%s\n", LITE_BACKUP_ERR, 0, 0);
- return 1;
- }
-
/* Make sure we aren't going to run slapd in
* a mode that is going to conflict with other
* slapd processes that are currently running
diff --git a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
index 77fe476..7f5c2d6 100644
--- a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
+++ b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
@@ -180,7 +180,7 @@ Severity=Success
Facility=Startup
SymbolicName=MSG_SERVER_STARTED
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
The directory server has successfully started.
.
MessageId=0x2
@@ -188,7 +188,7 @@ Severity=Success
Facility=Slapd
SymbolicName=MSG_SERVER_SHUTDOWN
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
The directory server has shutdown.
.
MessageId=0x3
@@ -196,7 +196,7 @@ Severity=Success
Facility=Slapd
SymbolicName=MSG_SERVER_STOPPED
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
The directory server has stopped.
.
MessageId=0x4
@@ -204,7 +204,7 @@ Severity=Success
Facility=Startup
SymbolicName=MSG_SERVER_STARTING
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
The directory server is starting.
.
MessageId=0x5
@@ -212,7 +212,7 @@ Severity=Error
Facility=Startup
SymbolicName=MSG_SERVER_START_FAILED
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
The directory server has failed on startup. %2
.
MessageId=0x6
@@ -220,7 +220,7 @@ Severity=Error
Facility=Startup
SymbolicName=MSG_SERVER_START_FAILED_CTRL_HANDLER
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
The directory server has failed on startup. Failed to Register with Service Control handler.
.
MessageId=0x7
@@ -228,7 +228,7 @@ Severity=Error
Facility=Startup
SymbolicName=MSG_SERVER_PASSWORD_DIALOG_FAILED
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
The directory server failed to create the Key Database Passphrase dialog.
.
MessageId=0x8
@@ -236,7 +236,7 @@ Severity=Error
Facility=Registry
SymbolicName=MSG_WD_REGISTRY
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
Could not open registry key: %2
.
MessageId=0x9
@@ -244,7 +244,7 @@ Severity=Error
Facility=Startup
SymbolicName=MSG_WD_BADCMDLINE
Language=English
-Fedora Directory Server: %1
+Directory Server: %1
Invalid command line specified: %2
.
MessageId=0xA
@@ -252,7 +252,7 @@ Severity=Error
Facility=Startup
SymbolicName=MSG_WD_BADPASSWORD
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
Incorrect SSL password entered.
.
MessageId=0xB
@@ -260,7 +260,7 @@ Severity=Error
Facility=Startup
SymbolicName=MSG_WD_STRING
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
%2
.
MessageId=0xC
@@ -268,7 +268,7 @@ Severity=Error
Facility=Startup
SymbolicName=MSG_WD_STARTFAILED
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
The directory server could not be started.
Command line used: %2
.
@@ -277,7 +277,7 @@ Severity=Error
Facility=Startup
SymbolicName=MSG_WD_RESTART
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
The directory server terminated abnormally with error code %2.
An attempt will be made to restart it.
.
@@ -286,7 +286,7 @@ Severity=Error
Facility=Startup
SymbolicName=MSG_CRON_STARTFAILED
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
The scheduled job (%2) could not be started.
.
MessageId=0xF
@@ -294,7 +294,7 @@ Severity=Error
Facility=Slapd
SymbolicName=MSG_SERVER_SHUTDOWN_STARTING
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
The directory server is shutting down.
.
MessageId=0x10
@@ -302,7 +302,7 @@ Severity=Error
Facility=Startup
SymbolicName=MSG_SERVER_KEYDB_PASSPHRASE_WRONG
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
The specified key database passphrase is incorrect.
.
MessageId=0x11
@@ -310,6 +310,6 @@ Severity=Error
Facility=Slapd
SymbolicName=MSG_SERVER_FAILED_TO_WRITE_LOG
Language=English
-Fedora Directory Server: %1.
+Directory Server: %1.
Failed to write log: %2.
.
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrs.ini b/ldap/servers/slapd/ntperfdll/nsldapctrs.ini
index 9900971..587b671 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrs.ini
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrs.ini
@@ -45,8 +45,8 @@ symbolfile=nsldapctrdef.h
009=English
[text]
-NS_OBJ_009_NAME=Fedora Directory Server 1.0
-NS_OBJ_009_HELP=Fedora Directory Server
+NS_OBJ_009_NAME=Directory Server 1.0
+NS_OBJ_009_HELP=Directory Server
CONN_RATE_009_NAME=Client Connections/sec
CONN_RATE_009_HELP=Rate of incoming client connections
THROUGHPUT_009_NAME=Server Network Throughput (bytes/sec)
diff --git a/ldap/servers/slapd/ntuserpin.c b/ldap/servers/slapd/ntuserpin.c
index 8a9eb71..fa9320d 100644
--- a/ldap/servers/slapd/ntuserpin.c
+++ b/ldap/servers/slapd/ntuserpin.c
@@ -142,7 +142,7 @@ static char *getPin(SVRCOREPinObj *obj, const char *tokenName, PRBool retry)
if (retry)
{
MessageBox(GetDesktopWindow(), nt_retryWarning,
- "Fedora Server", MB_ICONEXCLAMATION | MB_OK);
+ CAPBRAND " Server", MB_ICONEXCLAMATION | MB_OK);
} else {
if((cbRemotePassword != 0) && (szRemotePassword != 0))
{
diff --git a/ldap/servers/slapd/passwd_extop.c b/ldap/servers/slapd/passwd_extop.c
index 5c87303..bba6d41 100644
--- a/ldap/servers/slapd/passwd_extop.c
+++ b/ldap/servers/slapd/passwd_extop.c
@@ -85,7 +85,7 @@
#define LDAP_EXTOP_PASSMOD_RANDOM_BYTES 6
-Slapi_PluginDesc passwdopdesc = { "passwd_modify_plugin", "Fedora", "0.1",
+Slapi_PluginDesc passwdopdesc = { "passwd_modify_plugin", VENDOR, PACKAGE_VERSION,
"Password Modify extended operation plugin" };
/* Check SLAPI_USERPWD_ATTR attribute of the directory entry
diff --git a/ldap/servers/slapd/plugin.c b/ldap/servers/slapd/plugin.c
index 17730d5..e5e016d 100644
--- a/ldap/servers/slapd/plugin.c
+++ b/ldap/servers/slapd/plugin.c
@@ -62,7 +62,6 @@ static int plugin_call_func (struct slapdplugin *list, int operation, Slapi_PBlo
static PRBool plugin_invoke_plugin_pb (struct slapdplugin *plugin, int operation, Slapi_PBlock *pb);
static PRBool plugin_matches_operation (Slapi_DN *target_spec, PluginTargetData *ptd,
PRBool bindop, PRBool isroot, PRBool islocal, int method);
-static int isApprovedPlugin( struct slapdplugin *plugin );
static void plugin_config_init (struct pluginconfig *config);
static void plugin_config_cleanup (struct pluginconfig *config);
@@ -1545,48 +1544,6 @@ slapi_get_supported_extended_ops_copy( void )
}
-/* isApprovedPlugin:
- * returns 1 if the plugin is approved to be loaded, 0 otherwise.
- *
- * If the server is running as the Full version, all plugins are approved,
- * otherwise, if the server is running as DirectoryLite, only plugins from
- * Red Hat are approved.
- *
- * We have a special case for the NT Synch plugin, which is disabled for DLite.
- */
-static int
-isApprovedPlugin( struct slapdplugin *plugin )
-{
- if ( config_is_slapd_lite() == 0 ) {
- /* All the plugins are approved for Directory Full */
- return 1;
- }
-
- if ( plugin == NULL ) {
- LDAPDebug( LDAP_DEBUG_ANY, "isApprovedPlugin: plugin is NULL\n", 0,0,0 );
- return 0;
- }
- if (plugin->plg_desc.spd_vendor == NULL ) {
- LDAPDebug( LDAP_DEBUG_ANY, "isApprovedPlugin: plugin vendor is NULL\n",0,0,0 );
- return 0;
- }
-
- LDAPDebug ( LDAP_DEBUG_TRACE, "isApprovedPlugin() looking at plugin \"%s\" from vendor %s\n",
- plugin->plg_name, plugin->plg_desc.spd_vendor, 0 );
-
- /*
- * approved plugins must have their vendor string set to PLUGIN_MAGIC VENDOR_STR. External
- * plugins are not allowed for Lite.
- */
- if ( strcmp( plugin->plg_desc.spd_vendor, PLUGIN_MAGIC_VENDOR_STR ) == 0)
- return 1;
-
- LDAPDebug ( LDAP_DEBUG_ANY, "isApprovedPlugin() plugin \"%s\" is not approved for Directory Lite\n",
- plugin->plg_name, 0,0 );
- return 0;
-}
-
-
/*
looks up the given string type to convert to the internal integral type; also
returns the plugin list associated with the plugin type
@@ -1997,7 +1954,6 @@ plugin_setup(Slapi_Entry *plugin_entry, struct slapi_componentid *group,
slapi_plugin_init_fnptr initfunc = p_initfunc;
Slapi_PBlock pb;
int status = 0;
- int approved = 1;
int enabled = 1;
char *configdir = 0;
@@ -2194,47 +2150,25 @@ plugin_setup(Slapi_Entry *plugin_entry, struct slapi_componentid *group,
status = plugin_add_descriptive_attributes( plugin_entry, plugin );
}
- /* see if the plugin is approved or not */
- if ((approved = isApprovedPlugin(plugin)) != 0)
- {
- if ((!plugin->plg_version) ||
- (!SLAPI_PLUGIN_IS_COMPAT(plugin->plg_version))) {
- LDAPDebug( LDAP_DEBUG_ANY, "Plugin \"%s\" from library \"%s\""
- " has wrong version (supported versions: %s)\n",
- plugin->plg_name, plugin->plg_libpath,
- SLAPI_PLUGIN_SUPPORTED_VERSIONS);
- approved = 0;
- }
- }
-
if (value)
slapi_ch_free((void**)&value);
- if (!approved) {
- enabled = 0;
- LDAPDebug(LDAP_DEBUG_ANY, "Plugin \"%s\" is disabled.\n",
- plugin->plg_name,0,0);
+ if(enabled)
+ {
+ /* don't use raw pointer from plugin_entry because it
+ will be freed later by the caller */
+ Slapi_DN *dn_copy = slapi_sdn_dup(slapi_entry_get_sdn_const(plugin_entry));
+ add_plugin_to_list(plugin_list, plugin);
+ add_plugin_entry_dn(dn_copy);
}
- if (approved)
+ if (add_entry)
{
- if(enabled)
- {
- /* don't use raw pointer from plugin_entry because it
- will be freed later by the caller */
- Slapi_DN *dn_copy = slapi_sdn_dup(slapi_entry_get_sdn_const(plugin_entry));
- add_plugin_to_list(plugin_list, plugin);
- add_plugin_entry_dn(dn_copy);
- }
-
- if (add_entry)
- {
- /* make a copy of the plugin entry for our own use because it will
- be freed later by the caller */
- Slapi_Entry *e_copy = slapi_entry_dup(plugin_entry);
- /* new_plugin_entry(&plugin_entries, plugin_entry, plugin); */
- new_plugin_entry(&dep_plugin_entries, e_copy, plugin);
- }
+ /* make a copy of the plugin entry for our own use because it will
+ be freed later by the caller */
+ Slapi_Entry *e_copy = slapi_entry_dup(plugin_entry);
+ /* new_plugin_entry(&plugin_entries, plugin_entry, plugin); */
+ new_plugin_entry(&dep_plugin_entries, e_copy, plugin);
}
diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
index 5c6eed4..9c6c16e 100644
--- a/ldap/servers/slapd/proto-slap.h
+++ b/ldap/servers/slapd/proto-slap.h
@@ -1107,11 +1107,6 @@ struct matchingRuleList *g_get_global_mrl();
void g_set_global_mrl(struct matchingRuleList *newglobalmrl);
/*
- * lite_entries.c
- */
-void lite_entries_init();
-
-/*
* generation.c
*/
diff --git a/ldap/servers/slapd/schema.c b/ldap/servers/slapd/schema.c
index 3eb3ab8..98224df 100644
--- a/ldap/servers/slapd/schema.c
+++ b/ldap/servers/slapd/schema.c
@@ -117,7 +117,6 @@ static int schema_check_name(char *name, PRBool isAttribute, char *errorbuf,
size_t errorbufsize );
static int schema_check_oid(const char *name, const char *oid,
PRBool isAttribute, char *errorbuf, size_t errorbufsize);
-static int has_smart_referral( Slapi_Entry *e );
static int isExtensibleObjectclass(const char *objectclass);
static int strip_oc_options ( struct objclass *poc );
static char *stripOption (char *attr);
@@ -458,13 +457,6 @@ slapi_entry_schema_check( Slapi_PBlock *pb, Slapi_Entry *e )
char errtext[ BUFSIZ ];
PRUint32 schema_flags = 0;
- /* smart referrals are not allowed in Directory Lite */
- if ( config_is_slapd_lite() ) {
- if ( has_smart_referral(e) ) {
- return 1;
- }
- }
-
/*
* say the schema checked out ok if we're not checking schema at
* all, or if this is a replication update.
@@ -3841,44 +3833,6 @@ static void sizedbuffer_allocate(struct sizedbuffer *p, size_t sizeneeded)
}
/*
- * has_smart_referral: returns 1 if the entry contains a ref attribute,
- * or a referral objectclass.
- *
- * Returns 0 If not.
- */
-
-
-static int
-has_smart_referral( Slapi_Entry *e ) {
-
- Slapi_Attr *aoc;
- char ebuf[BUFSIZ];
-
- /* Look for the ref attribute */
- if ( (aoc = attrlist_find( e->e_attrs, "ref" )) != NULL ) {
- LDAPDebug ( LDAP_DEBUG_ANY, "Entry \"%s\" contains a ref attrbute. Smart referrals are disabled in Directory Lite.\n", escape_string(slapi_entry_get_dn_const(e), ebuf),0,0 );
- return 1;
- }
-
- /* Look for the referral objectclass */
- if ( (aoc = attrlist_find( e->e_attrs, "objectclass" )) != NULL ) {
- Slapi_Value target, *found;
- slapi_value_init(&target);
- slapi_value_set_string(&target,"referral");
- found= slapi_valueset_find(aoc, &aoc->a_present_values, &target);
- value_done(&target);
- if(found!=NULL)
- {
- LDAPDebug ( LDAP_DEBUG_ANY, "Entry \"%s\" is a referral object class. Smart referrals are disabled in Directory Lite.\n", escape_string(slapi_entry_get_dn_const(e), ebuf),0,0 );
- return 1;
- }
- }
-
- /* No smart referral here */
- return 0;
-}
-
-/*
* Check if the object class is extensible
*/
static int isExtensibleObjectclass(const char *objectclass)
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 0365835..55184a3 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -162,10 +162,8 @@ typedef struct symbol_t {
#include "ldaplog.h"
#include "portable.h"
#include "rwlock.h"
-#include "litekey.h"
#include "disconnect_errors.h"
-#include "dirver.h"
#include "csngen.h"
#include "uuid.h"
@@ -206,9 +204,9 @@ typedef struct symbol_t {
#define LDAP_CONTROL_PAGEDRESULTS "1.2.840.113556.1.4.319"
#endif
-#define SLAPD_VENDOR_NAME "Fedora Project"
-#define SLAPD_VERSION_STR "Fedora-Directory/" PRODUCTTEXT
-#define SLAPD_SHORT_VERSION_STR PRODUCTTEXT
+#define SLAPD_VENDOR_NAME VENDOR
+#define SLAPD_VERSION_STR CAPBRAND "-Directory/" PACKAGE_VERSION
+#define SLAPD_SHORT_VERSION_STR PACKAGE_VERSION
typedef void (*VFP)(void *);
typedef void (*VFPP)(void **);
@@ -2033,9 +2031,6 @@ typedef struct _slapdFrontendConfig {
#endif /* MEMPOOL_EXPERIMENTAL */
} slapdFrontendConfig_t;
-#define SLAPD_FULL 0
-#define SLAPD_LITE 1
-
/* possible values for slapdFrontendConfig_t.schemareplace */
#define CONFIG_SCHEMAREPLACE_STR_OFF "off"
#define CONFIG_SCHEMAREPLACE_STR_ON "on"
diff --git a/ldap/servers/slapd/slapi-private.h b/ldap/servers/slapd/slapi-private.h
index b29dcb7..c09e975 100644
--- a/ldap/servers/slapd/slapi-private.h
+++ b/ldap/servers/slapd/slapi-private.h
@@ -1072,7 +1072,6 @@ int slapi_uniqueIDGenerateFromNameString(char **uId,
* JCMREPL - Added for the replication plugin.
*/
-int config_is_slapd_lite( void );
void schema_expand_objectclasses_nolock( Slapi_Entry *e );
#define DSE_SCHEMA_NO_LOAD 0x0001 /* schema won't get loaded */
diff --git a/ldap/servers/slapd/start_tls_extop.c b/ldap/servers/slapd/start_tls_extop.c
index 32a3c10..bb65e5f 100644
--- a/ldap/servers/slapd/start_tls_extop.c
+++ b/ldap/servers/slapd/start_tls_extop.c
@@ -69,7 +69,7 @@
/* #define START_TLS_OID "1.3.6.1.4.1.1466.20037" */
-Slapi_PluginDesc exopdesc = { "start_tls_plugin", "Fedora", "0.1",
+Slapi_PluginDesc exopdesc = { "start_tls_plugin", VENDOR, PACKAGE_VERSION,
"Start TLS extended operation plugin" };
diff --git a/ldap/servers/slapd/test-plugins/README b/ldap/servers/slapd/test-plugins/README
index 8edf5e6..ca64ac5 100644
--- a/ldap/servers/slapd/test-plugins/README
+++ b/ldap/servers/slapd/test-plugins/README
@@ -39,11 +39,10 @@
----------------------------
Sample Server Plug-Ins
- for Directory Server 1
+ for Directory Server
----------------------------
-This directory contains code for some sample server plug-ins intended for
-use with the Fedora Directory Server 1.
+This directory contains code for some sample server plug-ins.
NOTE: Before you compile and run these examples, make sure
to change any server-specific data in the examples to
@@ -178,7 +177,7 @@ Server plug-ins are built as libraries available to the server.
$ autogen.sh # make sure there is no errors / warnings
$ mkdir testbuild
$ cd testbuild
- $ ../configure --with-fhs [ --prefix=/opt/fedora-ds ... ]
+ $ ../configure --with-fhs [ --prefix=/opt/dirsrv ... ]
$ make install
Plugging the Library Into the Server
diff --git a/ldap/servers/slapd/test-plugins/testbind.c b/ldap/servers/slapd/test-plugins/testbind.c
index c392202..c9c49df 100644
--- a/ldap/servers/slapd/test-plugins/testbind.c
+++ b/ldap/servers/slapd/test-plugins/testbind.c
@@ -74,7 +74,7 @@
#include <string.h>
#include "slapi-plugin.h"
-Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0.4",
+Slapi_PluginDesc bindpdesc = { "test-bind", VENDOR, PACKAGE_VERSION,
"sample bind pre-operation plugin" };
static Slapi_ComponentId *plugin_id = NULL;
diff --git a/ldap/servers/slapd/test-plugins/testdatainterop.c b/ldap/servers/slapd/test-plugins/testdatainterop.c
index 1915e6e..cc0e2fe 100644
--- a/ldap/servers/slapd/test-plugins/testdatainterop.c
+++ b/ldap/servers/slapd/test-plugins/testdatainterop.c
@@ -94,7 +94,7 @@
nsslapd-pluginEnabled: on
nsslapd-pluginId: nullsuffix-preop
nsslapd-pluginVersion: 7.1
- nsslapd-pluginVendor: Fedora Project
+ nsslapd-pluginVendor: My Project
nsslapd-pluginDescription: sample pre-operation null suffix plugin
******************************************/
@@ -118,7 +118,7 @@
/*
* Static variables.
*/
-static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0.4",
+static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, VENDOR, PACKAGE_VERSION,
"sample pre-operation null suffix plugin" };
static Slapi_ComponentId *plugin_id = NULL;
diff --git a/ldap/servers/slapd/test-plugins/testentry.c b/ldap/servers/slapd/test-plugins/testentry.c
index 4909246..9c1f32a 100644
--- a/ldap/servers/slapd/test-plugins/testentry.c
+++ b/ldap/servers/slapd/test-plugins/testentry.c
@@ -95,7 +95,7 @@ nsslapd-pluginId: test-entry
#include <string.h>
#include "slapi-plugin.h"
-Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0.4",
+Slapi_PluginDesc entrypdesc = { "test-entry", VENDOR, PACKAGE_VERSION,
"sample entry modification plugin" };
/* Entry store plug-in function */
diff --git a/ldap/servers/slapd/test-plugins/testextendedop.c b/ldap/servers/slapd/test-plugins/testextendedop.c
index 42fcbc5..2655d55 100644
--- a/ldap/servers/slapd/test-plugins/testextendedop.c
+++ b/ldap/servers/slapd/test-plugins/testextendedop.c
@@ -88,7 +88,7 @@
/* OID of the extended operation handled by this plug-in */
#define MY_OID "1.2.3.4"
-Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0.4",
+Slapi_PluginDesc expdesc = { "test-extendedop", VENDOR, PACKAGE_vERSION,
"sample extended operation plugin" };
diff --git a/ldap/servers/slapd/test-plugins/testgetip.c b/ldap/servers/slapd/test-plugins/testgetip.c
index 5cb990c..2a360b4 100644
--- a/ldap/servers/slapd/test-plugins/testgetip.c
+++ b/ldap/servers/slapd/test-plugins/testgetip.c
@@ -79,7 +79,7 @@
#include "slapi-plugin.h"
#include "nspr.h"
-Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0.4",
+Slapi_PluginDesc getippdesc = { "test-getip", VENDOR, PACKAGE_VERSION,
"sample pre-operation plugin" };
static char *netaddr2str( PRNetAddr *addrp, char *buf, size_t buflen );
diff --git a/ldap/servers/slapd/test-plugins/testplugin.def b/ldap/servers/slapd/test-plugins/testplugin.def
index f7909f1..f7dfb77 100644
--- a/ldap/servers/slapd/test-plugins/testplugin.def
+++ b/ldap/servers/slapd/test-plugins/testplugin.def
@@ -36,7 +36,7 @@
; All rights reserved.
; END COPYRIGHT BLOCK
;
-DESCRIPTION 'Fedora Directory Server 1 test plugin'
+DESCRIPTION 'Dirsrv 1 test plugin'
EXPORTS
testentry_scramble @2
testentry_unscramble @3
diff --git a/ldap/servers/slapd/test-plugins/testpostop.c b/ldap/servers/slapd/test-plugins/testpostop.c
index 41720c5..d5291f3 100644
--- a/ldap/servers/slapd/test-plugins/testpostop.c
+++ b/ldap/servers/slapd/test-plugins/testpostop.c
@@ -98,7 +98,7 @@ static char changelogfile[MAX_PATH+1];
static char *changelogfile = "/tmp/changelog";
#endif
-Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0.4",
+Slapi_PluginDesc postoppdesc = { "test-postop", VENDOR, PACKAGE_VERSION,
"sample post-operation plugin" };
static void write_changelog( int optype, char *dn, void *change, int flag );
diff --git a/ldap/servers/slapd/test-plugins/testpreop.c b/ldap/servers/slapd/test-plugins/testpreop.c
index da354b5..c44d741 100644
--- a/ldap/servers/slapd/test-plugins/testpreop.c
+++ b/ldap/servers/slapd/test-plugins/testpreop.c
@@ -84,7 +84,7 @@
#include <string.h>
#include "slapi-plugin.h"
-Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0.4",
+Slapi_PluginDesc preoppdesc = { "test-preop", VENDOR, PACKAGE_VERSION,
"sample pre-operation plugin" };
/* Pre-operation plug-in function */
diff --git a/ldap/servers/slapd/test-plugins/testsaslbind.c b/ldap/servers/slapd/test-plugins/testsaslbind.c
index 2b43c35..e395950 100644
--- a/ldap/servers/slapd/test-plugins/testsaslbind.c
+++ b/ldap/servers/slapd/test-plugins/testsaslbind.c
@@ -76,7 +76,7 @@ nsslapd-plugintype: preoperation
nsslapd-pluginenabled: on
nsslapd-pluginid: test-saslbind
nsslapd-pluginversion: 5.0
-nsslapd-pluginvendor: Fedora Project
+nsslapd-pluginvendor: My Project
nsslapd-plugindescription: sample SASL bind pre-operation plugin
@@ -85,7 +85,7 @@ nsslapd-plugindescription: sample SASL bind pre-operation plugin
#include <string.h>
#include "slapi-plugin.h"
-Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0.4",
+Slapi_PluginDesc saslpdesc = { "test-saslbind", VENDOR, PACKAGE_VERSION,
"sample SASL bind pre-operation plugin" };
diff --git a/ldap/servers/snmp/netscape-ldap.mib b/ldap/servers/snmp/netscape-ldap.mib
index 9c0cfa8..c4ef5f6 100644
--- a/ldap/servers/snmp/netscape-ldap.mib
+++ b/ldap/servers/snmp/netscape-ldap.mib
@@ -37,7 +37,7 @@
-- END COPYRIGHT BLOCK
--
--
--- MIB for Fedora Directory Server 7
+-- MIB for Directory Server
--
-- This is an implementation of the MADMAN mib for monitoring LDAP/CLDAP and X.500
-- directories described in RFC 2788 and 2789
@@ -79,7 +79,7 @@ IMPORTS
DESCRIPTION
" An implementation of the MADMAN mib for monitoring LDAP/CLDAP and X.500
directories described in RFC 2788 and 2789
- used for Fedora Directory Server 7"
+ used for Directory Server"
::= { netscape 7}
dsOpsTable OBJECT-TYPE
diff --git a/ldap/servers/snmp/ntagt/nsldapagt_nt.c b/ldap/servers/snmp/ntagt/nsldapagt_nt.c
index 42d668a..9818c58 100644
--- a/ldap/servers/snmp/ntagt/nsldapagt_nt.c
+++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.c
@@ -786,7 +786,7 @@ int MagtLoadStaticInfo(MagtStaticInfo_t *staticInfo, char *pszRootDir, int *SNMP
staticInfo->ApplIndex = 0;
- REPLACE(staticInfo->entityDescr.val, "Fedora Directory Server");
+ REPLACE(staticInfo->entityDescr.val, CAPBRAND " Directory Server");
staticInfo->entityDescr.len = strlen(staticInfo->entityDescr.val);
REPLACE(staticInfo->entityVers.val, "1");
diff --git a/ldap/servers/snmp/ntagt/nsldapagt_nt.def b/ldap/servers/snmp/ntagt/nsldapagt_nt.def
index 7f4b8e7..31e8d5a 100644
--- a/ldap/servers/snmp/ntagt/nsldapagt_nt.def
+++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.def
@@ -38,7 +38,7 @@
;
LIBRARY ns-ldapagt
-DESCRIPTION 'Fedora Directory Server SNMP Agent'
+DESCRIPTION 'Dirsrv SNMP Agent'
CODE LOADONCALL MOVEABLE DISCARDABLE
DATA PRELOAD MOVEABLE SINGLE
diff --git a/ldap/servers/snmp/redhat-directory.mib b/ldap/servers/snmp/redhat-directory.mib
index 56d4f9a..a03073f 100644
--- a/ldap/servers/snmp/redhat-directory.mib
+++ b/ldap/servers/snmp/redhat-directory.mib
@@ -37,7 +37,7 @@
-- END COPYRIGHT BLOCK
--
--
--- MIB for Red Hat and Fedora Directory Server
+-- MIB for Red Hat Directory Server
--
-- This is an implementation of the MADMAN mib for monitoring LDAP/CLDAP and X.500
-- directories described in RFC 2788 and 2789
@@ -76,7 +76,7 @@ IMPORTS
DESCRIPTION
" An implementation of the MADMAN mib for monitoring LDAP/CLDAP and X.500
directories described in RFC 2788 and 2789
- used for Red Hat and Fedora Directory Server"
+ used for Red Hat Directory Server"
::= {redhat 6}
dsOpsTable OBJECT-TYPE
diff --git a/ldap/systools/idsktune.c b/ldap/systools/idsktune.c
index 1bd0ee1..122c41d 100644
--- a/ldap/systools/idsktune.c
+++ b/ldap/systools/idsktune.c
@@ -646,7 +646,7 @@ int sun_check_kern_arch(char *a,char *b)
if (flag_debug) printf("DEBUG : Kernel architecture: sun4u\n");
} else {
if (flag_html) printf("<P>\n");
- printf("%s: The kernel architecture is %s. Fedora products are optimized\nfor the UltraSPARC architecture and will exhibit poorer performance on earlier\nmachines.\n\n","WARNING",b);
+ printf("%s: The kernel architecture is %s. " VENDOR " products are optimized\nfor the UltraSPARC architecture and will exhibit poorer performance on earlier\nmachines.\n\n","WARNING",b);
if (flag_html) printf("</P>\n");
flag_arch_bad = 1;
}
@@ -2810,8 +2810,8 @@ static void disk_tests(void)
#if defined(_WIN32)
/* TBD */
#else
- if (access("/usr/fedora",X_OK) == 0) {
- sprintf(install_dir,"/usr/fedora");
+ if (access("/usr/" VENDOR,X_OK) == 0) {
+ sprintf(install_dir,"/usr/" VENDOR);
} else {
sprintf(install_dir,"/opt");
}
@@ -3294,7 +3294,7 @@ int main(int argc,char *argv[])
char sysbuf[BUFSIZ];
int nproc;
if (flag_html) printf("<P>\n");
- printf("Fedora Directory Server system tuning analysis version %s.\n\n", build_date);
+ printf(CAPBRAND " Directory Server system tuning analysis version %s.\n\n", build_date);
ids_get_platform(sysbuf);
nproc = count_processors();
if (nproc == 1) {
diff --git a/lib/ldaputil/examples/Certmap.mak b/lib/ldaputil/examples/Certmap.mak
index bde0f1b..03139cc 100644
--- a/lib/ldaputil/examples/Certmap.mak
+++ b/lib/ldaputil/examples/Certmap.mak
@@ -104,8 +104,8 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\Fedora\servers\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "c:\Fedora\servers\include" /D "WIN32"\
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "c:\$(VENDOR)\servers\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "c:\$(VENDOR)\servers\include" /D "WIN32"\
/D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/Certmap.pch" /YX /Fo"$(INTDIR)/" /c
CPP_OBJS=.\Release/
CPP_SBRS=.\.
@@ -131,7 +131,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
LINK32_OBJS= \
"$(INTDIR)\init.obj" \
"$(INTDIR)\plugin.obj" \
- "C:\Fedora\servers\lib\nsldap32v10.lib"
+ "C:\$(VENDOR)\servers\lib\nsldap32v10.lib"
"$(OUTDIR)\Certmap.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -170,8 +170,8 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\Fedora\servers\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\Fedora\servers\include" /D\
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\$(VENDOR)\servers\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /Zi /Od /I "c:\$(VENDOR)\servers\include" /D\
"WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/Certmap.pch" /YX\
/Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
@@ -198,7 +198,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
LINK32_OBJS= \
"$(INTDIR)\init.obj" \
"$(INTDIR)\plugin.obj" \
- "C:\Fedora\servers\lib\nsldap32v10.lib"
+ "C:\$(VENDOR)\servers\lib\nsldap32v10.lib"
"$(OUTDIR)\Certmap.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -243,9 +243,9 @@ LINK32_OBJS= \
SOURCE=.\plugin.c
DEP_CPP_PLUGI=\
".\plugin.h"\
- "c:\Fedora\servers\include\certmap.h"\
- "c:\Fedora\servers\include\lber.h"\
- "c:\Fedora\servers\include\ldap.h"\
+ "c:\$(VENDOR)\servers\include\certmap.h"\
+ "c:\$(VENDOR)\servers\include\lber.h"\
+ "c:\$(VENDOR)\servers\include\ldap.h"\
{$(INCLUDE)}"\sys\types.h"\
@@ -259,9 +259,9 @@ DEP_CPP_PLUGI=\
SOURCE=.\init.c
DEP_CPP_INIT_=\
".\plugin.h"\
- "c:\Fedora\servers\include\certmap.h"\
- "c:\Fedora\servers\include\lber.h"\
- "c:\Fedora\servers\include\ldap.h"\
+ "c:\$(VENDOR)\servers\include\certmap.h"\
+ "c:\$(VENDOR)\servers\include\lber.h"\
+ "c:\$(VENDOR)\servers\include\ldap.h"\
{$(INCLUDE)}"\sys\types.h"\
@@ -272,7 +272,7 @@ DEP_CPP_INIT_=\
################################################################################
# Begin Source File
-SOURCE=C:\Fedora\servers\lib\nsldap32v10.lib
+SOURCE=C:\$(VENDOR)\servers\lib\nsldap32v10.lib
!IF "$(CFG)" == "Certmap - Win32 Release"
diff --git a/lib/ldaputil/utest/auth.cpp b/lib/ldaputil/utest/auth.cpp
index a5d7890..46be3a2 100644
--- a/lib/ldaputil/utest/auth.cpp
+++ b/lib/ldaputil/utest/auth.cpp
@@ -58,7 +58,7 @@
static const char* dllname = "plugin.so";
-char *global_issuer_dn = "o=Fedora Project, c=US";
+char *global_issuer_dn = "o=" VENDOR ", c=US";
#define NSPR_INIT(Program) (PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 8))
@@ -99,7 +99,7 @@ static int ldapu_certinfo_delete_test (const char *fname, const char *old_fname)
}
/* rv = ldapu_certinfo_delete("o=Ace Industry, c=US"); */
- rv = ldapu_certinfo_delete("o=Fedora Project, c=US");
+ rv = ldapu_certinfo_delete("o=" VENDOR ", c=US");
if (rv != LDAPU_SUCCESS) {
fprintf(stderr, "ldapu_certinfo_delete failed. Reason: %s\n",
diff --git a/lib/ldaputil/utest/authtest b/lib/ldaputil/utest/authtest
index 055a471..38e206c 100755
--- a/lib/ldaputil/utest/authtest
+++ b/lib/ldaputil/utest/authtest
@@ -119,7 +119,7 @@ must_succeed ./auth 9 "o=Ace Industry, c=US" "cn=Kirsten Vaughan, ou=Human Resou
#must_fail ./auth 9 "default" "cn=Kirsten Vaughan, o=Ace Industry, c=US"
# test for encode/decode bindpw
-must_succeed ./auth 10 "cn=Foo Bar, o=Fedora Project, c=US" "foobar"
+must_succeed ./auth 10 "cn=Foo Bar, o=$VENDOR, c=US" "foobar"
# test for reading dbnames from dbswitch.conf file
must_succeed ./auth 11 dblist.conf ignore
diff --git a/lib/ldaputil/utest/certmap.conf b/lib/ldaputil/utest/certmap.conf
index 248b609..b68d9a9 100644
--- a/lib/ldaputil/utest/certmap.conf
+++ b/lib/ldaputil/utest/certmap.conf
@@ -53,7 +53,7 @@ certmap default default
#default:FilterComps cn
-certmap default1 o=Fedora Project, c=US
+certmap default1 o=VENDOR, c=US
default1:library ./plugin.so
default1:InitFn plugin_init_fn
default1:DNComps ou o c
diff --git a/lib/ldaputil/utest/stubs.cpp b/lib/ldaputil/utest/stubs.cpp
index d9bafdf..aaa5bc6 100644
--- a/lib/ldaputil/utest/stubs.cpp
+++ b/lib/ldaputil/utest/stubs.cpp
@@ -63,7 +63,7 @@ NSAPI_PUBLIC int ldapu_get_cert_subject_dn (void *cert_in, char **subjectDN)
NSAPI_PUBLIC int ldapu_get_cert_issuer_dn (void *cert, char **issuerDN)
{
/* TEMPORARY -- not implemented yet*/
- *issuerDN = strdup("o=Fedora Project, c=US");
+ *issuerDN = strdup("o=" VENDOR ", c=US");
return *issuerDN ? LDAPU_SUCCESS : LDAPU_FAILED;
}
diff --git a/lib/ldaputil/utest/test.ref b/lib/ldaputil/utest/test.ref
index 8f621df..dfb71ac 100644
--- a/lib/ldaputil/utest/test.ref
+++ b/lib/ldaputil/utest/test.ref
@@ -286,9 +286,9 @@ plugin_verify_fn called.
Matched entry to cert: "cn=Kirsten Vaughan, ou=Human Resources, o=Ace Industry, c=US"
Authentication succeeded.
-Start of test: ./auth 10 "cn=Foo Bar, o=Fedora Project, c=US" "foobar"
+Start of test: ./auth 10 "cn=Foo Bar, o=$VENDOR, c=US" "foobar"
Config file written: config_out.conf
-binddn from config file: "cn=Foo Bar, o=Fedora Project, c=US"
+binddn from config file: "cn=Foo Bar, o=$VENDOR, c=US"
bindpw from config file: "foobar"
Config file test succeeded
Authentication succeeded.
@@ -323,7 +323,7 @@ certmap default default
#default:FilterComps cn
-certmap default1 o=Fedora Project, c=US
+certmap default1 o=$VENDOR, c=US
default1:library ./plugin.so
default1:InitFn plugin_init_fn
default1:DNComps ou o c
@@ -349,7 +349,7 @@ default2:verifycert on
certmap default default
-certmap default1 o=Fedora Project, c=US
+certmap default1 o=$VENDOR, c=US
default1:library ./plugin.so
default1:InitFn plugin_init_fn
default1:DNComps ou o c
@@ -382,7 +382,7 @@ certmap default default
#default:FilterComps cn
-certmap default1 o=Fedora Project, c=US
+certmap default1 o=$VENDOR, c=US
default1:library ./plugin.so
default1:InitFn plugin_init_fn
default1:DNComps ou o c
@@ -435,7 +435,7 @@ certmap default default
#default:FilterComps cn
-certmap default1 o=Fedora Project, c=US
+certmap default1 o=$VENDOR, c=US
default1:library ./plugin.so
default1:InitFn plugin_init_fn
default1:DNComps ou o c
@@ -461,7 +461,7 @@ default2:verifycert on
certmap default default
-certmap default1 o=Fedora Project, c=US
+certmap default1 o=$VENDOR, c=US
default1:library ./plugin.so
default1:InitFn plugin_init_fn
default1:DNComps ou o c
diff --git a/lib/libsi18n/getstrmem.h b/lib/libsi18n/getstrmem.h
index cbdcbd1..937885b 100644
--- a/lib/libsi18n/getstrmem.h
+++ b/lib/libsi18n/getstrmem.h
@@ -92,7 +92,7 @@ static char* userforms[] = {
"",
"Error: could not open servers list file.<p>\n",
"Error: could not open %s server list file.<p>\n",
- "Fedora Server Account",
+ CAPBRAND " Server Account",
"Server Account Management for %s",
"Server Account Management",
emptyString };
@@ -508,7 +508,7 @@ static char* httpdaemon[] = {
"warning: daemon is running as super-user\n",
"could not determine current user name\n",
"error: chroot to %s failed (%s)\n",
- "WARNING! Fedora executable and library have different versions.\n",
+ "WARNING! " CAPBRAND " executable and library have different versions.\n",
"startup: listening to %s://%s, port %d as %s\n",
"startup: listening to %s://%s, port %d as %s\n",
"seminit failed (%s)\n",
@@ -856,7 +856,7 @@ static char* base[] = {
"unable to allocate hash entry",
"cache_insert: unable to create cache entry",
"HTTP/1.0 200 OK\nContent-type: text/html\n\n",
- "<H2>Fedora cache status report</H2>\n",
+ "<H2>" CAPBRAND " cache status report</H2>\n",
"No caches on system<P>",
"<H2>%s cache</H2>\n",
"Cache hit ratio: %d/%d (%f)</P>\n</P>\n",
@@ -891,7 +891,7 @@ static char* base[] = {
"error getting processor info for processor %d",
"Error binding to processor %d",
"bound process %d to processor %d",
- "Fedora server is not explicitly binding to any processors.",
+ CAPBRAND " server is not explicitly binding to any processors.",
"cache monitor exited",
"cache batch update daemon exited",
"Using single threaded accepts.",
@@ -900,7 +900,7 @@ static char* base[] = {
"This machine has %d processors.",
"Error calling thr_seconcurrency(%d)- (%s)",
"Set conncurrency to %d.",
- "WARNING! Fedora executable and library have different versions.\n",
+ "WARNING! " CAPBRAND " executable and library have different versions.\n",
"",
"",
"seminit failed (%s)\n",
@@ -966,7 +966,7 @@ static char* base[] = {
"dns-cache-insert: malloc failure",
"successful server startup",
"%s B%s",
- "Fedora executable and shared library have different versions",
+ CAPBRAND " executable and shared library have different versions",
" executable version is %s",
" shared library version is %s",
"error reporting shutting down",
diff --git a/man/man1/cl-dump.1 b/man/man1/cl-dump.1
index 4cf450b..ff8d30d 100644
--- a/man/man1/cl-dump.1
+++ b/man/man1/cl-dump.1
@@ -79,7 +79,7 @@ is running, and from where the server's changelog directory is accessible.
.BR repl-monitor (1)
.br
.SH AUTHOR
-cl-dump was written by the Fedora Directory Server Project.
+cl-dump was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/dbgen.pl.1 b/man/man1/dbgen.pl.1
index 49cf8ee..c53f2c8 100644
--- a/man/man1/dbgen.pl.1
+++ b/man/man1/dbgen.pl.1
@@ -67,7 +67,7 @@ Location of directory containing data files, default is /usr/share/dirsrv/data
Number of entries to be generated
.br
.SH AUTHOR
-dbgen.pl was written by the Fedora Directory Server Project.
+dbgen.pl was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/dbscan.1 b/man/man1/dbscan.1
index e23ae27..2fa69fd 100644
--- a/man/man1/dbscan.1
+++ b/man/man1/dbscan.1
@@ -89,7 +89,7 @@ Display summary of objectclass.db4:
dbscan \fB\-f\fR objectclass.db4
.br
.SH AUTHOR
-dbscan was written by the Fedora Directory Server Project.
+dbscan was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/dsktune.1 b/man/man1/dsktune.1
index c3ecb76..811939a 100644
--- a/man/man1/dsktune.1
+++ b/man/man1/dsktune.1
@@ -47,7 +47,7 @@ dsktune only reports its release version date
specify alternate server installation directory
.br
.SH AUTHOR
-dsktune was written by the Fedora Directory Server Project.
+dsktune was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/infadd.1 b/man/man1/infadd.1
index 4f349bf..36aa9c8 100644
--- a/man/man1/infadd.1
+++ b/man/man1/infadd.1
@@ -65,7 +65,7 @@ add binary blob of average size of <size> bytes
.BR rsearch (1)
.br
.SH AUTHOR
-infadd was written by the Fedora Directory Server Project.
+infadd was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/ldap-agent.1 b/man/man1/ldap-agent.1
index cba23d3..0bc0a60 100644
--- a/man/man1/ldap-agent.1
+++ b/man/man1/ldap-agent.1
@@ -42,7 +42,7 @@ Sample usage:
.B ldap-agent /etc/dirsrv/config/ldap-agent.conf
.br
.SH AUTHOR
-ldap\-agent was written by the Fedora Directory Server Project.
+ldap\-agent was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/ldclt.1 b/man/man1/ldclt.1
index 5aaf501..6192086 100644
--- a/man/man1/ldclt.1
+++ b/man/man1/ldclt.1
@@ -215,7 +215,7 @@ Execution parameters:
\fBrandomauthidhigh=value\fR high value for random SASL Authid.
.PP
.SH AUTHOR
-ldclt was written by the Fedora Directory Server Project.
+ldclt was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/ldif.1 b/man/man1/ldif.1
index 183e243..8771a99 100644
--- a/man/man1/ldif.1
+++ b/man/man1/ldif.1
@@ -38,7 +38,7 @@ Output base64 binary format
.B
ldif dn < /tmp/ldif
.SH AUTHOR
-ldif was written by the Fedora Directory Server Project.
+ldif was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/logconv.pl.1 b/man/man1/logconv.pl.1
index 378a0f0..c7a7795 100644
--- a/man/man1/logconv.pl.1
+++ b/man/man1/logconv.pl.1
@@ -101,7 +101,7 @@ logconv.pl \fB\-s\fR 50 \fB\-ibgju\fR access*
logconv.pl \fB\-S\fR "[28/Mar/2002:13:14:22 \fB\-0800]\fR" \fB\-E\fR "[28/Mar/2002:13:50:05 \fB\-0800]\fR" \fB\-e\fR access
.br
.SH AUTHOR
-logconv.pl was written by the Fedora Directory Server Project.
+logconv.pl was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/migratecred.1 b/man/man1/migratecred.1
index 0071b1f..d849ea1 100644
--- a/man/man1/migratecred.1
+++ b/man/man1/migratecred.1
@@ -48,7 +48,7 @@ Old credential
New plugin path (of the new instance)
.br
.SH AUTHOR
-migratecred was written by the Fedora Directory Server Project.
+migratecred was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/mmldif.1 b/man/man1/mmldif.1
index 43a9873..672accf 100644
--- a/man/man1/mmldif.1
+++ b/man/man1/mmldif.1
@@ -44,7 +44,7 @@ Write authoritative data to this file
.BR ldif (1)
.br
.SH AUTHOR
-mmldif was written by the Fedora Directory Server Project.
+mmldif was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/pwdhash.1 b/man/man1/pwdhash.1
index d5c8321..6014732 100644
--- a/man/man1/pwdhash.1
+++ b/man/man1/pwdhash.1
@@ -45,7 +45,7 @@ Password to be compared against
Takes the password schema directly from the ns-slapd configuration
.br
.SH AUTHOR
-dbscan was written by the Fedora Directory Server Project.
+dbscan was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/repl-monitor.1 b/man/man1/repl-monitor.1
index 79ea73d..e9abebd 100644
--- a/man/man1/repl-monitor.1
+++ b/man/man1/repl-monitor.1
@@ -52,7 +52,7 @@ Refresh url
Refresh interval
.br
.SH AUTHOR
-repl-monitor was written by the Fedora Directory Server Project.
+repl-monitor was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man1/rsearch.1 b/man/man1/rsearch.1
index b829be2..5a4b973 100644
--- a/man/man1/rsearch.1
+++ b/man/man1/rsearch.1
@@ -121,7 +121,7 @@ drop connection & reconnect every num searches
Use \fB\-B\fR file for binding; ignored if \fB\-B\fR is not given
.br
.SH AUTHOR
-rsearch was written by the Fedora Directory Server Project.
+rsearch was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man8/migrate-ds.pl.8 b/man/man8/migrate-ds.pl.8
index 5036cf5..ad53d60 100644
--- a/man/man8/migrate-ds.pl.8
+++ b/man/man8/migrate-ds.pl.8
@@ -149,7 +149,7 @@ and copying it to the destination, or by network mounting the source
directory on the destination machine.
.br
.SH AUTHOR
-migrate-ds.pl was written by the Fedora Directory Server Project.
+migrate-ds.pl was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man8/ns-slapd.8 b/man/man8/ns-slapd.8
index cf471ea..fb1386a 100644
--- a/man/man8/ns-slapd.8
+++ b/man/man8/ns-slapd.8
@@ -43,7 +43,7 @@ Specifies the debuglevel to be used
Specifies file where the pid of the process will be stored
.br
.SH AUTHOR
-ns-slapd was written by the Fedora Directory Server Project.
+ns-slapd was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man8/remove-ds.pl.8 b/man/man8/remove-ds.pl.8
index c74b823..e8e322a 100644
--- a/man/man8/remove-ds.pl.8
+++ b/man/man8/remove-ds.pl.8
@@ -43,7 +43,7 @@ Enable debugging - adding more -d will make output more verbose
The full name of the instance to remove (e.g. slapd-example)
.br
.SH AUTHOR
-remove-ds.pl was written by the Fedora Directory Server Project.
+remove-ds.pl was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
diff --git a/man/man8/setup-ds.pl.8 b/man/man8/setup-ds.pl.8
index 62c12bb..5598df6 100644
--- a/man/man8/setup-ds.pl.8
+++ b/man/man8/setup-ds.pl.8
@@ -74,7 +74,7 @@ or
Values passed in this manner will override values in an .inf file given with the \fB\-f\fR argument.
.br
.SH AUTHOR
-setup-ds.pl was written by the Fedora Directory Server Project.
+setup-ds.pl was written by the 389 Project.
.SH "REPORTING BUGS"
Report bugs to http://bugzilla.redhat.com.
.SH COPYRIGHT
--
1.5.5.6
Attachment:
smime.p7s
Description: S/MIME Cryptographic Signature
-- 389-devel mailing list 389-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-directory-devel
