Change default branding to 389 - remove lite code

The vendor, brand, and capbrand are set in configure - we should use those
everywhere rather than have to run some sort of script over the code to
change vendor, brand, version, etc.  I've added VENDOR, BRAND, CAPBRAND
to the default defines passed to the compiler, and changed the code to use
these defines.  And instead of the unintuitively named PRODUCTTEXT macro,
we should use the already defined PRODUCT_VERSION.
This allowed me to get rid of some code.  The version was from a generated
file called dirver.h which we don't need anymore, and we don't need the perl
script dirver.pl which generated it.
The vendor string was coming from the dirlite header file.  So I also used this
as an excuse to get rid of all references to dirlite once and for all (yay!).
For the places in plain text files which are not substituted, I just used the
generic name Dirsrv or Directory Server instead of having an explicit brand
and/or version in there.

Reviewed by: nkinder (Thanks!)

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

Makefile.in

@@ -726,8 +726,8 @@ am__ns_slapd_SOURCES_DIST = ldap/servers/slapd/abandon.c \
 	ldap/servers/slapd/fedse.c ldap/servers/slapd/fileio.c \
 	ldap/servers/slapd/getopt_ext.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 \
+	ldap/servers/slapd/main.c ldap/servers/slapd/monitor.c \
+	ldap/servers/slapd/passwd_extop.c \
 	ldap/servers/slapd/protect_db.c ldap/servers/slapd/psearch.c \
 	ldap/servers/slapd/pw_mgmt.c ldap/servers/slapd/rootdse.c \
 	ldap/servers/slapd/sasl_io.c ldap/servers/slapd/saslbind.c \
@@ -754,7 +754,6 @@ am_ns_slapd_OBJECTS = ldap/servers/slapd/ns_slapd-abandon.$(OBJEXT) \
 	ldap/servers/slapd/ns_slapd-globals.$(OBJEXT) \
 	ldap/servers/slapd/ns_slapd-house.$(OBJEXT) \
 	ldap/servers/slapd/ns_slapd-init.$(OBJEXT) \
-	ldap/servers/slapd/ns_slapd-lite_entries.$(OBJEXT) \
 	ldap/servers/slapd/ns_slapd-main.$(OBJEXT) \
 	ldap/servers/slapd/ns_slapd-monitor.$(OBJEXT) \
 	ldap/servers/slapd/ns_slapd-passwd_extop.$(OBJEXT) \
@@ -1119,7 +1118,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
@@ -1160,8 +1159,8 @@ KERBEROS_LINK = $(kerberos_lib)
 #------------------------
 # Generated Sources
 #------------------------
-BUILT_SOURCES = dirver.h dberrstrs.h
-CLEANFILES = dirver.h dberrstrs.h ns-slapd.properties \
+BUILT_SOURCES = dberrstrs.h
+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 \
@@ -2085,7 +2084,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 \
@@ -2186,9 +2184,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
 # 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
 # the system perl
@@ -4008,9 +4006,6 @@ ldap/servers/slapd/ns_slapd-house.$(OBJEXT):  \
 ldap/servers/slapd/ns_slapd-init.$(OBJEXT):  \
 	ldap/servers/slapd/$(am__dirstamp) \
 	ldap/servers/slapd/$(DEPDIR)/$(am__dirstamp)
-ldap/servers/slapd/ns_slapd-lite_entries.$(OBJEXT):  \
-	ldap/servers/slapd/$(am__dirstamp) \
-	ldap/servers/slapd/$(DEPDIR)/$(am__dirstamp)
 ldap/servers/slapd/ns_slapd-main.$(OBJEXT):  \
 	ldap/servers/slapd/$(am__dirstamp) \
 	ldap/servers/slapd/$(DEPDIR)/$(am__dirstamp)
@@ -4818,7 +4813,6 @@ mostlyclean-compile:
 	-rm -f ldap/servers/slapd/ns_slapd-globals.$(OBJEXT)
 	-rm -f ldap/servers/slapd/ns_slapd-house.$(OBJEXT)
 	-rm -f ldap/servers/slapd/ns_slapd-init.$(OBJEXT)
-	-rm -f ldap/servers/slapd/ns_slapd-lite_entries.$(OBJEXT)
 	-rm -f ldap/servers/slapd/ns_slapd-main.$(OBJEXT)
 	-rm -f ldap/servers/slapd/ns_slapd-monitor.$(OBJEXT)
 	-rm -f ldap/servers/slapd/ns_slapd-passwd_extop.$(OBJEXT)
@@ -5270,7 +5264,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-globals.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-house.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-init.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-monitor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ldap/servers/slapd/$(DEPDIR)/ns_slapd-passwd_extop.Po@am__quote@
@@ -8513,20 +8506,6 @@ ldap/servers/slapd/ns_slapd-init.obj: ldap/servers/slapd/init.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/ns_slapd-init.obj `if test -f 'ldap/servers/slapd/init.c'; then $(CYGPATH_W) 'ldap/servers/slapd/init.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/init.c'; fi`
 
-ldap/servers/slapd/ns_slapd-lite_entries.o: ldap/servers/slapd/lite_entries.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/ns_slapd-lite_entries.o -MD -MP -MF "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Tpo" -c -o ldap/servers/slapd/ns_slapd-lite_entries.o `test -f 'ldap/servers/slapd/lite_entries.c' || echo '$(srcdir)/'`ldap/servers/slapd/lite_entries.c; \
-@am__fastdepCC_TRUE@	then mv -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Tpo" "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Po"; else rm -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/slapd/lite_entries.c' object='ldap/servers/slapd/ns_slapd-lite_entries.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/ns_slapd-lite_entries.o `test -f 'ldap/servers/slapd/lite_entries.c' || echo '$(srcdir)/'`ldap/servers/slapd/lite_entries.c
-
-ldap/servers/slapd/ns_slapd-lite_entries.obj: ldap/servers/slapd/lite_entries.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/ns_slapd-lite_entries.obj -MD -MP -MF "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Tpo" -c -o ldap/servers/slapd/ns_slapd-lite_entries.obj `if test -f 'ldap/servers/slapd/lite_entries.c'; then $(CYGPATH_W) 'ldap/servers/slapd/lite_entries.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/lite_entries.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Tpo" "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Po"; else rm -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-lite_entries.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ldap/servers/slapd/lite_entries.c' object='ldap/servers/slapd/ns_slapd-lite_entries.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ldap/servers/slapd/ns_slapd-lite_entries.obj `if test -f 'ldap/servers/slapd/lite_entries.c'; then $(CYGPATH_W) 'ldap/servers/slapd/lite_entries.c'; else $(CYGPATH_W) '$(srcdir)/ldap/servers/slapd/lite_entries.c'; fi`
-
 ldap/servers/slapd/ns_slapd-main.o: ldap/servers/slapd/main.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ns_slapd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ldap/servers/slapd/ns_slapd-main.o -MD -MP -MF "ldap/servers/slapd/$(DEPDIR)/ns_slapd-main.Tpo" -c -o ldap/servers/slapd/ns_slapd-main.o `test -f 'ldap/servers/slapd/main.c' || echo '$(srcdir)/'`ldap/servers/slapd/main.c; \
 @am__fastdepCC_TRUE@	then mv -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-main.Tpo" "ldap/servers/slapd/$(DEPDIR)/ns_slapd-main.Po"; else rm -f "ldap/servers/slapd/$(DEPDIR)/ns_slapd-main.Tpo"; exit 1; fi
@@ -9802,9 +9781,6 @@ uninstall-man: uninstall-man1 uninstall-man8
 	uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS
 
 
-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 .
 

dirver.pl

@@ -1,163 +0,0 @@
-#!/usr/bin/perl
-# --- BEGIN COPYRIGHT BLOCK ---
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-# 
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-# 
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception. 
-# 
-# 
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-
-#-----------------------------------------------------------------
-# dirver.pl: Generates ascii format #define for FILEVERSION
-#   resource identifier used by Windows executable binaries.
-#
-#   Usage: dirver.pl -v <major.minor.patch> [-d mm/dd/yy] [-o outfile]
-#   Example: dirver.pl -v 6.5.2 -d 1/19/2005 -o fileversion.h
-#
-#   -v <major.minor.patch>    Version number.
-#   -d <mm/dd/yy>             Date. (optional)
-#   -o <outfile>              Output header file. (optional)
-#   -H                        Print this help message
-#-----------------------------------------------------------------
-
-use Getopt::Std;
-use FileHandle;
-                                                                                             
-autoflush STDERR 1;
-                                                                                             
-getopts('v:d:o:H');
-                                                                                             
-if ($opt_H) {exitHelp();}
-
-# Load arguments
-$version = $opt_v || exitHelp();
-$date = $opt_d;
-$outfile = $opt_o;
-
-# Separate version into components
-my @verComponents = split(/\./, $version);
-
-# Set version components to 0 if not defined
-if ($verComponents[1] == undef) { $verComponents[1] = "0"; }
-if ($verComponents[2] == undef) { $verComponents[2] = "0"; }
-
-# Calculate build version and build date
-my $buildVersion = calcVersion(@verComponents);
-my $buildDate = calcBuildDate($date);
-
-# Write #defines out to stdout or a file is requested
-if ($outfile) {
-    open(OUTFILE,">$outfile") || die "Error: Can't create $outfile: $!";
-    $outhdl = OUTFILE;
-} else {
-    $outhdl = STDOUT;
-}
-
-print $outhdl "#define VI_PRODUCTVERSION $verComponents[0].$verComponents[1]\n";
-print $outhdl "#define PRODUCTTEXT \"$version\"\n";
-print $outhdl "#define VI_FILEVERSION $buildVersion, 0, 0, $buildDate\n";
-print $outhdl "#define VI_FileVersion \"$version Build $buildDate\\0\"\n";
-
-# Close file if not using STDOUT
-if ($outfile) {
-    close(OUTFILE);
-}
-
-#---------- calcVersion subroutine ----------
-sub calcVersion {
-    my @ver = shift;
-    my $nVersion = 0;
-
-    $nVersion = $ver[0];
-    $nVersion <<= 5;
-    $nVersion += $ver[1];
-    $nVersion <<= 7;
-    $nVersion += $ver[2];
-    $nVersion &= 0xFFFF;
-
-    return $nVersion;
-}
-
-#---------- calcBuildDate subroutine ----------
-sub calcBuildDate {
-    my $date = shift;
-    my @dateComponents = ();
-    my $month, $date, $year;
-    my $buildDate = "";
-
-    # Use date if passed in, otherwise use system date
-    if ($date) {
-        # Separate date into month, day, and year
-        @dateComponents = split(/\//, $date);
-
-        # Use struct tm range for month
-        $dateComponents[0]--;
-
-        # Handle 2 digit years like (20)00
-        if ($dateComponents[2] < 70) {
-            $dateComponents[2] += 20;
-        }
-
-        $month = $dateComponents[0];
-        $day = $dateComponents[1];
-        $year = $dateComponents[2];
-    } else {
-        $month = (localtime)[4];
-        $day = (localtime)[3];
-        $year = (localtime)[5] - 80;
-    }
-
-    $buildDate = $year;
-    $buildDate <<= 4;
-    $buildDate += $month;
-    $buildDate <<= 5;
-    $buildDate += $day;
-    $buildDate &= 0xFFFF;
-
-    return $buildDate;
-}
-
-#---------- exitHelp subroutine ----------
-sub exitHelp {
-    print(STDERR "$0: Generates ascii format #define for FILEVERSION
-    \tresource identifier used by Windows executable binaries.
-
-    \tUsage: $0 -v <major.minor.patch> [-d mm/dd/yy] [-o outfile]
-    \tExample: $0 -v 6.5.2 -d 1/19/2005 -o fileversion.h
-
-    \t-v <major.minor.patch>    Version number.
-    \t-d <mm/dd/yy>             Date. \(optional\)
-    \t-o <outfile>              Output header file. \(optional\)
-    \t-H                        Print this help message\n");
-    exit(0);
-}

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)$//;
     }

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;

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

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/

ldap/include/dirlite_strings.h

@@ -1,99 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-/* dirlite_strings.h - strings  used for Directory Lite */
-#ifndef _DIRLITE_STRINGS_H_
-#define _DIRLITE_STRINGS_H_
-
-#define LITE_PRODUCT_NAME "restricted-mode directory"
-#define LITE_UPGRADE_BLURB "To gain access to this feature, you must upgrade to the full verson of the directory."
-
-#define LITE_GENERIC_ERR "cannot be configured in the " LITE_PRODUCT_NAME ". " LITE_UPGRADE_BLURB
-
-
-
-/* Directory Lite: Error Strings related to configuring replication */
-#define LITE_CHANGELOG_DIR_ERR     "Error: changelog cannot be configured in DirectoryLite."
-#define LITE_CHANGELOG_SUFFIX_ERR  "Error: changelogsuffix cannot be configured in DirectoryLite."
-#define LITE_CHANGELOG_MAXAGE_ERR  "Error: changelogmaxage cannot be configured in DirectoryLite."
-#define LITE_CHANGELOG_MAXENTRIES_ERR "Error: changelogmaxentries cannot be configured in DirectoryLite."
-#define LITE_REPLICATIONDN_ERR "Error: replicationdn cannot be configured in DirectoryLite."
-#define LITE_REPLICATIONPW_ERR "Error: replicationpw cannot be configured in DirectoryLite."
-
-
-
-/* Directory Lite: Error Strings related to configurating referrals */
-#define LITE_DEFAULT_REFERRAL_ERR "Error: Referrals are disabled in the " LITE_PRODUCT_NAME ", The defaultreferral " LITE_GENERIC_ERR
-
-#define LITE_REFERRAL_MODE_ERR "Error: Referrals are disabled in the " LITE_PRODUCT_NAME ", The referralmode " LITE_GENERIC_ERR
-
-/* Directory Lite: Error Strings related to configuring password policy */
-#define LITE_PW_EXP_ERR "Error: password policy is disabled in the " LITE_PRODUCT_NAME ", pw_exp " LITE_GENERIC_ERR
-
-/* all plugins which need to be used for Directory Lite must use this as their vendor string */
-#define PLUGIN_MAGIC_VENDOR_STR "Fedora Project"
-
-/* plugins which contain this substring in their pluginid will not be aprroved in DS Lite */
-#define LITE_NTSYNCH_PLUGIN_ID_SUBSTR "nt-sync"
-
-/*Directory Lite: Error Strings related to configuring nt synch service */
-#define LITE_NTSYNCH_ERR "Error: NT Synch Service " LITE_GENERIC_ERR " nt_synch cannot be enabled."
-
-#define LITE_DISABLED_ATTRS_DN    "cn=attributes,cn=options,cn=features,cn=config"
-#define LITE_DISABLED_MODULES_DN  "cn=modules,cn=options,cn=features,cn=config"
-
-#define LITE_REPLICA_ERR "Error: Replication is disabled in the " LITE_PRODUCT_NAME ", replica " LITE_GENERIC_ERR
-
-/*Directory Lite: Error Strings related to configuring maxdescriptors */
-#define LITE_MAXDESCRIPTORS_ERR "Warning: The maximum number of concurent connections to the " LITE_PRODUCT_NAME " is 256. Maxdescriptors has a maximum value of 256, setting value for maxdescriptors to 256. To increase the maximum number of concurent connections, you must upgrade to the full version of the directory."
-#define SLAPD_LITE_MAXDESCRIPTORS 256
-
-/* on-line backup and restore */
-#define LITE_BACKUP_ERR "Error: The " LITE_PRODUCT_NAME " server must be in readonly mode before you can do this operation. You must upgrade to the full version of the directory to be able to perform online backup without first putting the server into readonly mode."
-
-/* Directory Lite: Error string related to enabling third party plugins */
-#define LITE_3RD_PARTY_PLUGIN_ERR "Error: Plugins written by third parties are disabled in " LITE_PRODUCT_NAME ". Plugin \"%s\" is disabled. " LITE_UPGRADE_BLURB
-
-#endif /* _DIRLITE_STRINGS_H_ */
-
-
-

ldap/include/litekey.h

@@ -1,67 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-/*
- * Defines function used to determine the type of DS based on the 
- * key.
- */
-#ifndef _LITEKEY_H
-#define _LITEKEY_H
-
-#include <dirlite_strings.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DS_NORMAL_TYPE 0
-#define DS_LITE_TYPE 1
-
-int is_directory_lite ( char *path);
-int generate_directory_key( int type);
-int is_key_validNormalKey ( int key );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _LITEKEY_H */

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"

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

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

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.

ldap/schema/slapd-collations.conf

@@ -37,7 +37,6 @@
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
-# Used by Fedora Directory Server
 #######################################################################
 # Collations
 #######################################################################

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 */

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

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 */

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 */
 

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 };
 
 

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

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;
 

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

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

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;

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

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"

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 };
 
 /*

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  

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

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 };
 
 

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;

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;

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 };
 
 /*

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"
 

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;

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 */

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 */

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;

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

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 */

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" };
 
 /*

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" };
 
 /**

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

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

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";
 

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 '}'

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;

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

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

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 );

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

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"
 };
 

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"};
 
 
 /*

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

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

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";
 

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 '}'

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

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"

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;

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,

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

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" };
 
 

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

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"
 };
 

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

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" };
 
 
 /*

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" };
 
 

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

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 )

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

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

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? */,

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

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

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? */,

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

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

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

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

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

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" };
 
 

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

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;

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;

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;

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;

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

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

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

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,

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
             {

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

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

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 );
 	}

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 )
 {

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

ldap/servers/slapd/lite_entries.c

@@ -1,143 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-/* lite_entries.c - 
- *
- * These entries are added under cn=options,cn=features,cn=config for 
- * Directory Lite. These entries tell the console which modules ( ds features )
- * are disabled, and which attributes in cn=config are disabled.
- */
-
-   
-   
-
-#include "slap.h"
-
-static void  del_dslite_entries();
-static void  add_dslite_entries();
-static const char *lite_entries[] = 
-{
-  "dn:" LITE_DISABLED_ATTRS_DN "\n"
-  "cn:attributes\n"
-  "objectclass:top\n"
-  "objectclass:extensibleObject\n"
-  "objectclass:directoryServerFeature\n"
-  "cn=config|nsslapd-referral:off\n"
-  "cn=config|nsslapd-maxdescriptors:off\n",
-  
-  "dn:" LITE_DISABLED_MODULES_DN "\n"
-  "objectclass:top\n"
-  "objectclass:directoryServerFeature\n"
-  "objectclass:extensibleObject\n"
-  "cn:modules\n"
-  "replication:off\n"
-  "passwordpolicy:off\n"
-  "accountlockout:off\n"
-  "snmpsettings:off\n"
-  "backup:off\n",
-
-  NULL
-};
-
-/* add_dslite_entries: 
- *
- * Add the DirLite specific entries.
- * First we try to delete them in case they were already loaded from dse.ldif
- * but are in some sort of invalid state.
- * Then we add them back.
- * It would have been better to make sure that these entries never get written
- * to dse.ldif, but it doesn't look like we're able to add a dse_callback function
- * on the DN's of these entries but they get added at the wrong time.
- */
-   
-   
-   
-static void
-add_dslite_entries() {
-  int i;
-
-  del_dslite_entries();
-  LDAPDebug( LDAP_DEBUG_TRACE, "Adding lite entries.\n",0,0,0);
-  for( i = 0; lite_entries[i]; i++ ) {
-	Slapi_PBlock *resultpb;
-	char *estr = slapi_ch_strdup ( lite_entries[i] );
-  	Slapi_Entry *e = slapi_str2entry( estr, 0 );
-	if ( NULL != e ) {
-	  resultpb = slapi_add_entry_internal( e, NULL, 0 );
-	  slapi_ch_free ( (void **) &resultpb );
-	  slapi_ch_free ( (void **) &estr );
-	}
-  }
-}
-
-
-/* del_dslite_entries: delete the DirLite specific entries */
-static void 
-del_dslite_entries() {
-  Slapi_PBlock *resultpb;
-  LDAPDebug( LDAP_DEBUG_TRACE, "Deleting lite entries if they exist\n",0,0,0);
-  resultpb = slapi_delete_internal (  LITE_DISABLED_ATTRS_DN, NULL, 0 );
-  slapi_pblock_destroy ( resultpb );
-  resultpb = slapi_delete_internal (  LITE_DISABLED_MODULES_DN,  NULL, 0 );
-  slapi_pblock_destroy ( resultpb );
-}
-
-/* lite_entries_init()
- * Add the appropriate entries under cn=options,cn=features,cn=config if the
- * server is running as Directory Lite.
- *
- * Otherwise, if the server is the Full Directory, try to delete the entries if
- * they're already there.
- */
-   
-void
-lite_entries_init() {
-  if ( config_is_slapd_lite() ) {
-	add_dslite_entries();
-  }
-  else {
-	del_dslite_entries();
-  }
-}
-  
-  
-

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

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