389-commits December 2013

389-commits@lists.fedoraproject.org

6 participants
107 discussions

Branch '389-ds-base-1.3.1' - rpm/add_patches.sh rpm.mk
by Mark Reynolds 10 Dec '13

10 Dec '13

rpm.mk | 16 +++++++++++++++ rpm/add_patches.sh | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) New commits: commit 2a92a6cccd1002f4fe976ee7a5b79d779b009f87 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Tue Dec 10 17:30:23 2013 -0500 Ticket 47611 - Add script to build patched RPMs This adds the ability to build patched RPMs, which can be useful for using with scanning tools like Coverity. The script will create the source tarball from HEAD of the current branch, but it will also add patch files to the specfile if any are found in the rpm directory in the source tree. The intended way of using this is as follows: git diff master workbranch > rpm/workbranch.patch make -f rpm.mk patch_rpms The patch files must end in .patch. Make targets are added for patch_srpms and patch_rpms. https://fedorahosted.org/389/ticket/47611 Reviewed by: mreynolds diff --git a/rpm.mk b/rpm.mk index dfbadc6..fffc528 100644 --- a/rpm.mk +++ b/rpm.mk @@ -43,9 +43,25 @@ srpms: rpmroot srpmdistdir tarballs rpmbuildprep cp $(RPMBUILD)/SRPMS/$(RPM_NAME_VERSION)-*.src.rpm dist/srpms/ rm -rf $(RPMBUILD) +patch_srpms: rpmroot srpmdistdir tarballs rpmbuildprep + cp rpm/*.patch $(RPMBUILD)/SOURCES/ + rpm/add_patches.sh rpm $(RPMBUILD)/SPECS/$(PACKAGE).spec + rpmbuild --define "_topdir $(RPMBUILD)" -bs $(RPMBUILD)/SPECS/$(PACKAGE).spec + cp $(RPMBUILD)/SRPMS/$(RPM_NAME_VERSION)-*.src.rpm dist/srpms/ + rm -rf $(RPMBUILD) + rpms: rpmroot srpmdistdir rpmdistdir tarballs rpmbuildprep rpmbuild --define "_topdir $(RPMBUILD)" -ba $(RPMBUILD)/SPECS/$(PACKAGE).spec cp $(RPMBUILD)/RPMS/*/$(RPM_NAME_VERSION)-*.rpm dist/rpms/ cp $(RPMBUILD)/RPMS/*/$(PACKAGE)-*-$(RPM_VERSION)-*.rpm dist/rpms/ cp $(RPMBUILD)/SRPMS/$(RPM_NAME_VERSION)-*.src.rpm dist/srpms/ rm -rf $(RPMBUILD) + +patch_rpms: rpmroot srpmdistdir rpmdistdir tarballs rpmbuildprep + cp rpm/*.patch $(RPMBUILD)/SOURCES/ + rpm/add_patches.sh rpm $(RPMBUILD)/SPECS/$(PACKAGE).spec + rpmbuild --define "_topdir $(RPMBUILD)" -ba $(RPMBUILD)/SPECS/$(PACKAGE).spec + cp $(RPMBUILD)/RPMS/*/$(RPM_NAME_VERSION)-*.rpm dist/rpms/ + cp $(RPMBUILD)/RPMS/*/$(PACKAGE)-*-$(RPM_VERSION)-*.rpm dist/rpms/ + cp $(RPMBUILD)/SRPMS/$(RPM_NAME_VERSION)-*.src.rpm dist/srpms/ + rm -rf $(RPMBUILD) diff --git a/rpm/add_patches.sh b/rpm/add_patches.sh new file mode 100755 index 0000000..690d0b2 --- /dev/null +++ b/rpm/add_patches.sh @@ -0,0 +1,55 @@ +#!/bin/sh + +function usage() +{ + echo "Adds patches to a specfile" + echo "" + echo "$0 <patchdir> <specfile>" + echo "" + echo " patchdir - directory containing patches with" + echo " .patch extension." + echo " specfile - the specfile to patch." + exit 1 +} + + +if [ $# -ne 2 ]; then + usage +fi + +patchdir=$1 +specfile=$2 + +# Validate our arguments. +if [ ! -d $1 ]; then + echo "Patch directory $1 does not exist or is not a directory." + exit 1 +elif [ ! -f $2 ]; then + echo "Specfile $2 does not exist or is not a file." + exit 1 +fi + +# These keep track of our spec file substitutions. +i=1 +prefix="Source0:" +prepprefix="%setup" + +# Find all patches in the the patch directory. +# to the spec file. +patches=`ls ${patchdir}/*.patch 2>/dev/null` + +# If no patches exist, just exit. +if [ -z "$patches" ]; then + echo "No patches found in $patchdir." + exit 0 +fi + +# Add the patches to the specfile. +for p in $patches; do + p=`basename $p` + echo "Adding patch to spec file - $p" + sed -i -e "/${prefix}/a Patch${i}: ${p}" -e "/$prepprefix/a %patch${i} -p1" $specfile + prefix="Patch${i}:" + prepprefix="%patch${i}" + i=$(($i+1)) +done

1 0

Branch '389-ds-base-1.3.1' - Makefile.am rpm/389-ds-base-devel.README rpm/389-ds-base-git.sh rpm/389-ds-base.spec.in rpm.mk rpm/rpmverrel.sh VERSION.sh
by Mark Reynolds 10 Dec '13

10 Dec '13

Makefile.am | 2 VERSION.sh | 10 rpm.mk | 51 + rpm/389-ds-base-devel.README | 4 rpm/389-ds-base-git.sh | 16 rpm/389-ds-base.spec.in | 1485 +++++++++++++++++++++++++++++++++++++++++++ rpm/rpmverrel.sh | 15 7 files changed, 1582 insertions(+), 1 deletion(-) New commits: commit 6a49bf31e3356ab9e8c30ab841ce712bd1b6de82 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Tue Dec 10 16:53:18 2013 -0500 Ticket 47611 - Add make rpms build target Description: Backported the changes made by nkinder to 1.3.1 c884bd9 Add make rpms build target bf49d6a Allow rpm builds to be run without configure 52fb682 Add git commit hash to developer rpm build names a77d3d1 Add hardened build option and correct changelog dates https://fedorahosted.org/389/ticket/47611 Reviewed by: rmeggins(Thanks!) diff --git a/Makefile.am b/Makefile.am index 8cf7ba7..3e65cd7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -137,6 +137,7 @@ CLEANFILES = dberrstrs.h ns-slapd.properties \ $(POSIX_WINSYNC_PLUGIN_LDIF) clean-local: + -rm -rf dist -rm -rf selinux-built dberrstrs.h: Makefile @@ -1676,3 +1677,4 @@ git-archive: gittag=HEAD ; \ fi ; \ git archive --prefix=$(distdir)/ $$gittag | bzip2 > $$srcdistdir/$(distdir).tar.bz2 + diff --git a/VERSION.sh b/VERSION.sh index 19b1383..e5da902 100644 --- a/VERSION.sh +++ b/VERSION.sh @@ -14,7 +14,7 @@ VERSION_MAINT=1.16 # if this is a PRERELEASE, set VERSION_PREREL # otherwise, comment it out # be sure to include the dot prefix in the prerel -# VERSION_PREREL=.pre.a1 +VERSION_PREREL=.a1 # NOTES on VERSION_PREREL # use aN for an alpha release e.g. a1, a2, etc. # use rcN for a release candidate e.g. rc1, rc2, etc. @@ -22,6 +22,13 @@ VERSION_MAINT=1.16 # RC1.`date +%Y%m%d` # a git commit may also be used +# Set the version and release numbers for local developer RPM builds. We +# set these here because we do not want the git commit hash in the RPM +# version since it can make RPM upgrades difficult. If we have a git +# commit hash, we add it into the release number below. +RPM_RELEASE=`date -u +%Y%m%d%H%M%S` +RPM_VERSION=$VERSION_MAJOR.$VERSION_MINOR.${VERSION_MAINT}$VERSION_PREREL + if test -n "$VERSION_PREREL"; then # if the source is from a git repo, put the last commit # in the version @@ -32,6 +39,7 @@ if test -n "$VERSION_PREREL"; then COMMIT=`cd $srcdir ; git log -1 --pretty=format:%h 2> /dev/null` if test -n "$COMMIT" ; then VERSION_PREREL=$VERSION_PREREL.git$COMMIT + RPM_RELEASE=$RPM_RELEASE.git$COMMIT fi fi diff --git a/rpm.mk b/rpm.mk new file mode 100644 index 0000000..dfbadc6 --- /dev/null +++ b/rpm.mk @@ -0,0 +1,51 @@ +RPMBUILD ?= $(PWD)/rpmbuild +RPM_VERSION ?= $(shell $(PWD)/rpm/rpmverrel.sh version) +RPM_RELEASE ?= $(shell $(PWD)/rpm/rpmverrel.sh release) +PACKAGE = 389-ds-base +RPM_NAME_VERSION = $(PACKAGE)-$(RPM_VERSION) +TARBALL = $(RPM_NAME_VERSION).tar.bz2 + +clean: + rm -rf dist + rm -rf rpmbuild + +local-archive: + -mkdir -p dist/$(RPM_NAME_VERSION) + rsync -a --exclude=dist --exclude=.git --exclude=rpmbuild . dist/$(RPM_NAME_VERSION) + +tarballs: local-archive + -mkdir -p dist/sources + cd dist; tar cfj sources/$(TARBALL) $(RPM_NAME_VERSION) + rm -rf dist/$(RPM_NAME_VERSION) + +rpmroot: + rm -rf $(RPMBUILD) + mkdir -p $(RPMBUILD)/BUILD + mkdir -p $(RPMBUILD)/RPMS + mkdir -p $(RPMBUILD)/SOURCES + mkdir -p $(RPMBUILD)/SPECS + mkdir -p $(RPMBUILD)/SRPMS + +rpmdistdir: + mkdir -p dist/rpms + +srpmdistdir: + mkdir -p dist/srpms + +rpmbuildprep: + cp dist/sources/$(TARBALL) $(RPMBUILD)/SOURCES/ + cp rpm/$(PACKAGE)-* $(RPMBUILD)/SOURCES/ + sed -e s/__VERSION__/$(RPM_VERSION)/ -e s/__RELEASE__/$(RPM_RELEASE)/ \ + rpm/$(PACKAGE).spec.in > $(RPMBUILD)/SPECS/$(PACKAGE).spec + +srpms: rpmroot srpmdistdir tarballs rpmbuildprep + rpmbuild --define "_topdir $(RPMBUILD)" -bs $(RPMBUILD)/SPECS/$(PACKAGE).spec + cp $(RPMBUILD)/SRPMS/$(RPM_NAME_VERSION)-*.src.rpm dist/srpms/ + rm -rf $(RPMBUILD) + +rpms: rpmroot srpmdistdir rpmdistdir tarballs rpmbuildprep + rpmbuild --define "_topdir $(RPMBUILD)" -ba $(RPMBUILD)/SPECS/$(PACKAGE).spec + cp $(RPMBUILD)/RPMS/*/$(RPM_NAME_VERSION)-*.rpm dist/rpms/ + cp $(RPMBUILD)/RPMS/*/$(PACKAGE)-*-$(RPM_VERSION)-*.rpm dist/rpms/ + cp $(RPMBUILD)/SRPMS/$(RPM_NAME_VERSION)-*.src.rpm dist/srpms/ + rm -rf $(RPMBUILD) diff --git a/rpm/389-ds-base-devel.README b/rpm/389-ds-base-devel.README new file mode 100644 index 0000000..190c874 --- /dev/null +++ b/rpm/389-ds-base-devel.README @@ -0,0 +1,4 @@ +For detailed information on developing plugins for +389 Directory Server visit. + +http://port389/wiki/Plugins diff --git a/rpm/389-ds-base-git.sh b/rpm/389-ds-base-git.sh new file mode 100644 index 0000000..e5aaa8a --- /dev/null +++ b/rpm/389-ds-base-git.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +DATE=`date +%Y%m%d` +# use a real tag name here +VERSION=1.3.0.5 +PKGNAME=389-ds-base +TAG=${TAG:-$PKGNAME-$VERSION} +URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" +SRCNAME=$PKGNAME-$VERSION + +wget -O $SRCNAME.tar.gz "$URL" + +echo convert tgz format to tar.bz2 format + +gunzip $PKGNAME-$VERSION.tar.gz +bzip2 $PKGNAME-$VERSION.tar diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in new file mode 100644 index 0000000..5d05f91 --- /dev/null +++ b/rpm/389-ds-base.spec.in @@ -0,0 +1,1485 @@ + +%global pkgname dirsrv +# for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release +# also remove the space between % and global - this space is needed because +# fedpkg verrel stupidly ignores comment lines +#% global prerel .rc3 +# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release +#% global relprefix 0. + +%global use_openldap 1 +%global use_db4 0 +# If perl-Socket-2.000 or newer is available, set 0 to use_Socket6. +%global use_Socket6 0 + +# fedora 15 and later uses tmpfiles.d +# otherwise, comment this out +%{!?with_tmpfiles_d: %global with_tmpfiles_d %{_sysconfdir}/tmpfiles.d} + +# systemd support +%global groupname %{pkgname}.target + +Summary: 389 Directory Server (base) +Name: 389-ds-base +Version: __VERSION__ +#Release: %{?relprefix}1%{?prerel}%{?dist} +Release: __RELEASE__%{?dist} +License: GPLv2 with exceptions +URL: http://port389.org/ +Group: System Environment/Daemons +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: %{name}-selinux +Conflicts: selinux-policy-base < 3.9.8 +Requires: %{name}-libs = %{version}-%{release} +Provides: ldif2ldbm + +BuildRequires: nspr-devel +BuildRequires: nss-devel +BuildRequires: svrcore-devel +%if %{use_openldap} +BuildRequires: openldap-devel +%else +BuildRequires: mozldap-devel +%endif +%if %{use_db4} +BuildRequires: db4-devel +%else +BuildRequires: libdb-devel +%endif +BuildRequires: cyrus-sasl-devel +BuildRequires: icu +BuildRequires: libicu-devel +BuildRequires: pcre-devel +BuildRequires: gcc-c++ +# The following are needed to build the snmp ldap-agent +BuildRequires: net-snmp-devel +%ifnarch sparc sparc64 ppc ppc64 s390 s390x +BuildRequires: lm_sensors-devel +%endif +BuildRequires: bzip2-devel +BuildRequires: zlib-devel +BuildRequires: openssl-devel +BuildRequires: tcp_wrappers +# the following is for the pam passthru auth plug-in +BuildRequires: pam-devel +BuildRequires: systemd-units + +# this is needed for using semanage from our setup scripts +Requires: policycoreutils-python + +# the following are needed for some of our scripts +%if %{use_openldap} +Requires: openldap-clients +%else +Requires: mozldap-tools +%endif +# use_openldap assumes perl-Mozilla-LDAP is built with openldap support +Requires: perl-Mozilla-LDAP + +# this is needed to setup SSL if you are not using the +# administration server package +Requires: nss-tools + +# these are not found by the auto-dependency method +# they are required to support the mandatory LDAP SASL mechs +Requires: cyrus-sasl-gssapi +Requires: cyrus-sasl-md5 + +# this is needed for verify-db.pl +%if %{use_db4} +Requires: db4-utils +%else +Requires: libdb-utils +%endif + +# This picks up libperl.so as a Requires, so we add this versioned one +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +# for the init script +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units + +# for setup-ds.pl to support ipv6 +%if %{use_Socket6} +Requires: perl-Socket6 +%else +Requires: perl-Socket +%endif +Requires: perl-NetAddr-IP + +Source0: http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2 +# 389-ds-git.sh should be used to generate the source tarball from git +Source1: %{name}-git.sh +Source2: %{name}-devel.README + +%description +389 Directory Server is an LDAPv3 compliant server. The base package includes +the LDAP server and command line utilities for server administration. + +%package libs +Summary: Core libraries for 389 Directory Server +Group: System Environment/Daemons +BuildRequires: nspr-devel +BuildRequires: nss-devel +BuildRequires: svrcore-devel +%if %{use_openldap} +BuildRequires: openldap-devel +%else +BuildRequires: mozldap-devel +%endif +%if %{use_db4} +BuildRequires: db4-devel +%else +BuildRequires: libdb-devel +%endif +BuildRequires: cyrus-sasl-devel +BuildRequires: libicu-devel +BuildRequires: pcre-devel + +%description libs +Core libraries for the 389 Directory Server base package. These libraries +are used by the main package and the -devel package. This allows the -devel +package to be installed with just the -libs package and without the main package. + +%package devel +Summary: Development libraries for 389 Directory Server +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} +Requires: pkgconfig +Requires: nspr-devel +Requires: nss-devel +Requires: svrcore-devel +%if %{use_openldap} +Requires: openldap-devel +%else +Requires: mozldap-devel +%endif + +%description devel +Development Libraries and headers for the 389 Directory Server base package. + +%prep +%setup -q -n %{name}-%{version}%{?prerel} +cp %{SOURCE2} README.devel + +%build +%if %{use_openldap} +OPENLDAP_FLAG="--with-openldap" +%endif +%{?with_tmpfiles_d: TMPFILES_FLAG="--with-tmpfiles-d=%{with_tmpfiles_d}"} +# hack hack hack https://bugzilla.redhat.com/show_bug.cgi?id=833529 +NSSARGS="--with-svrcore-inc=%{_includedir} --with-svrcore-lib=%{_libdir} --with-nss-lib=%{_libdir} --with-nss-inc=%{_includedir}/nss3" +%configure --enable-autobind --with-selinux $OPENLDAP_FLAG $TMPFILES_FLAG \ + --with-systemdsystemunitdir=%{_unitdir} \ + --with-systemdsystemconfdir=%{_sysconfdir}/systemd/system \ + --with-systemdgroupname=%{groupname} $NSSARGS + +# Generate symbolic info for debuggers +export XCFLAGS=$RPM_OPT_FLAGS + +%ifarch x86_64 ppc64 ia64 s390x sparc64 +export USE_64=1 +%endif + +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT + +make DESTDIR="$RPM_BUILD_ROOT" install + +mkdir -p $RPM_BUILD_ROOT/var/log/%{pkgname} +mkdir -p $RPM_BUILD_ROOT/var/lib/%{pkgname} +mkdir -p $RPM_BUILD_ROOT/var/lock/%{pkgname} + +# for systemd +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/%{groupname}.wants + +#remove libtool and static libs +rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.la + +# make sure perl scripts have a proper shebang +sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +output=/dev/null +%systemd_post %{pkgname}-snmp.service +# reload to pick up any changes to systemd files +/bin/systemctl daemon-reload >$output 2>&1 || : +# reload to pick up any shared lib changes +/sbin/ldconfig +# restart the snmp subagent if needed +/bin/systemctl try-restart %{pkgname}-snmp.service > $output 2>&1 || : +# find all instances +instances="" # instances that require a restart after upgrade +ninst=0 # number of instances found in total +if [ -n "$DEBUGPOSTTRANS" ] ; then + output=$DEBUGPOSTTRANS +fi +echo looking for services in %{_sysconfdir}/systemd/system/%{groupname}.wants/* > $output 2>&1 || : +for service in %{_sysconfdir}/systemd/system/%{groupname}.wants/* ; do + if [ ! -f "$service" ] ; then continue ; fi # in case nothing matches + inst=`echo $service | sed -e 's,%{_sysconfdir}/systemd/system/%{groupname}.wants/,,'` + echo found instance $inst - getting status > $output 2>&1 || : + if /bin/systemctl -q is-active $inst ; then + echo instance $inst is running > $output 2>&1 || : + instances="$instances $inst" + else + echo instance $inst is not running > $output 2>&1 || : + fi + ninst=`expr $ninst + 1` +done +if [ $ninst -eq 0 ] ; then + echo no instances to upgrade > $output 2>&1 || : + exit 0 # have no instances to upgrade - just skip the rest +fi +# shutdown all instances +echo shutting down all instances . . . > $output 2>&1 || : +/bin/systemctl stop %{groupname} > $output 2>&1 || : +echo remove pid files . . . > $output 2>&1 || : +/bin/rm -f /var/run/%{pkgname}*.pid /var/run/%{pkgname}*.startpid +# do the upgrade +echo upgrading instances . . . > $output 2>&1 || : +%{_sbindir}/setup-ds.pl -l $output -u -s General.UpdateMode=offline > $output 2>&1 || : +# restart instances that require it +for inst in $instances ; do + echo restarting instance $inst > $output 2>&1 || : + /bin/systemctl start $inst > $output 2>&1 || : +done +exit 0 + +%preun +if [ $1 -eq 0 ]; then # Final removal + # Package removal, not upgrade + %systemd_preun %{pkgname}-snmp.service %{groupname} + # remove instance specific service files/links + rm -rf %{_sysconfdir}/systemd/system/%{groupname}.wants/* > /dev/null 2>&1 || : +fi + +%postun +/sbin/ldconfig +if [ $1 = 0 ]; then # Final removal + rm -rf /var/run/%{pkgname} +fi + +%files +%defattr(-,root,root,-) +%doc LICENSE EXCEPTION LICENSE.GPLv2 +%dir %{_sysconfdir}/%{pkgname} +%dir %{_sysconfdir}/%{pkgname}/schema +%config(noreplace)%{_sysconfdir}/%{pkgname}/schema/*.ldif +%dir %{_sysconfdir}/%{pkgname}/config +%dir %{_sysconfdir}/systemd/system/%{groupname}.wants +%config(noreplace)%{_sysconfdir}/%{pkgname}/config/slapd-collations.conf +%config(noreplace)%{_sysconfdir}/%{pkgname}/config/certmap.conf +%config(noreplace)%{_sysconfdir}/%{pkgname}/config/ldap-agent.conf +%config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig +%config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname} +%config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}.systemd +%{_datadir}/%{pkgname} +%{_unitdir} +%{_bindir}/* +%{_sbindir}/* +%{_libdir}/%{pkgname}/libns-dshttpd.so* +%{_libdir}/%{pkgname}/perl +%dir %{_libdir}/%{pkgname}/plugins +%{_libdir}/%{pkgname}/plugins/*.so +%dir %{_localstatedir}/lib/%{pkgname} +%dir %{_localstatedir}/log/%{pkgname} +%ghost %dir %{_localstatedir}/lock/%{pkgname} +%{_mandir}/man1/* +%{_mandir}/man8/* + +%files devel +%defattr(-,root,root,-) +%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel +%{_includedir}/%{pkgname} +%{_libdir}/%{pkgname}/libslapd.so +%{_libdir}/pkgconfig/* + +%files libs +%defattr(-,root,root,-) +%doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel +%dir %{_libdir}/%{pkgname} +%{_libdir}/%{pkgname}/libslapd.so.* + +%changelog +* Thu Mar 28 2013 Noriko Hosoi <nhosoi(a)redhat.com> - 1.3.0.5-1 +- bump version to 1.3.0.5 +- Ticket 47308 - unintended information exposure when anonymous access is set to rootdse +- Ticket 628 - crash in aci evaluation +- Ticket 627 - ns-slapd crashes sporadically with segmentation fault in libslapd.so +- Ticket 634 - Deadlock in DNA plug-in Ticket #576 - DNA: use event queue for config update only at the start up +- Ticket 632 - 389-ds-base cannot handle Kerberos tickets with PAC +- Ticket 623 - cleanAllRUV task fails to cleanup config upon completion + +* Mon Mar 11 2013 Mark Reynolds <mreynolds(a)redhat.com> - 1.3.0.4-1 +- e53d691 bump version to 1.3.0.4 +- Bug 912964 - CVE-2013-0312 389-ds: unauthenticated denial of service vulnerability in handling of LDAPv3 control data +- Ticket 570 - DS returns error 20 when replacing values of a multi-valued attribute (only when replication is enabled) +- Ticket 490 - Slow role performance when using a lot of roles +- Ticket 590 - ns-slapd segfaults while trying to delete a tombstone entry + +* Wed Feb 13 2013 Noriko Hosoi <nhosoi(a)redhat.com> - 1.3.0.3-1 +- bump version to 1.3.0.3 +- Ticket #584 - Existence of an entry is not checked when its password is to be deleted +- Ticket 562 - Crash when deleting suffix + +* Fri Feb 01 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.3.0.2-2 +- Rebuild for icu 50 + +* Wed Jan 16 2013 Noriko Hosoi <nhosoi(a)redhat.com> - 1.3.0.2-1 +- bump version to 1.3.0.2 +- Ticket #542 - Cannot dynamically set nsslapd-maxbersize + +* Wed Jan 16 2013 Noriko Hosoi <nhosoi(a)redhat.com> - 1.3.0.1-1 +- bump version to 1.3.0.1 +- Ticket 556 - Don't overwrite certmap.conf during upgrade + +* Tue Jan 08 2013 Noriko Hosoi <nhosoi(a)redhat.com> - 1.3.0.0-1 +- bump version to 1.3.0.0 + +* Tue Jan 08 2013 Noriko Hosoi <nhosoi(a)redhat.com> - 1.3.0-0.3.rc3 +- bump version to 1.3.0.rc3 +- Ticket 549 - DNA plugin no longer reports additional info when range is depleted +- Ticket 541 - need to set plugin as off in ldif template +- Ticket 541 - RootDN Access Control plugin is missing after upgrade + +* Fri Dec 14 2012 Noriko Hosoi <nhosoi(a)redhat.com> - 1.3.0-0.2.rc2 +- bump version to 1.3.0.rc2 +- Trac Ticket #497 - Escaped character cannot be used in the substring search filter +- Ticket 509 - lock-free access to be->be_suffixlock +- Trac Ticket #522 - betxn: upgrade is not implemented yet + +* Tue Dec 11 2012 Noriko Hosoi <nhosoi(a)redhat.com> - 1.3.0-0.1.rc1 +- bump version to 1.3.0.rc1 +- Ticket #322 - Create DOAP description for the 389 Directory Server project +- Trac Ticket #499 - Handling URP results is not corrrect +- Ticket 509 - lock-free access to be->be_suffixlock +- Ticket 456 - improve entry cache sizing +- Trac Ticket #531 - loading an entry from the database should use str2entry_f +- Trac Ticket #536 - Clean up compiler warnings for 1.3 +- Trac Ticket #531 - loading an entry from the database should use str2entry_fast +- Ticket 509 - lock-free access to be->be_suffixlock +- Ticket 527 - ns-slapd segfaults if it cannot rename the logs +- Ticket 395 - RFE: 389-ds shouldn't advertise in the rootDSE that we can handle a sasl mech if we really can't +- Ticket 216 - disable replication agreements +- Ticket 518 - dse.ldif is 0 length after server kill or machine kill +- Ticket 393 - Change in winSyncInterval does not take immediate effect +- Ticket 20 - Allow automember to work on entries that have already been added +- Coverity Fixes +- Ticket 349 - nsViewFilter syntax issue in 389DS 1.2.5 +- Ticket 337 - improve CLEANRUV functionality +- Fix for ticket 504 +- Ticket 394 - modify-delete userpassword +- minor fixes for bdb 4.2/4.3 and mozldap +- Trac Ticket #276 - Multiple threads simultaneously working on connection's private buffer causes ns-slapd to abort +- Fix for ticket 465: cn=monitor showing stats for other db instances +- Ticket 507 - use mutex for FrontendConfig lock instead of rwlock +- Fix for ticket 510 Avoid creating an attribute just to determine the syntax for a type, look up the syntax directly by type +- Coverity defect: Resource leak 13110 +- Ticket 517 - crash in DNA if no dnaMagicRegen is specified +- Trac Ticket #520 - RedHat Directory Server crashes (segfaults) when moving ldap entry +- Trac Ticket #519 - Search with a complex filter including range search is slow +- Trac Ticket #500 - Newly created users with organizationalPerson objectClass fails to sync from AD to DS with missing attribute error +- Trac Ticket #311 - IP lookup failing with multiple DNS entries +- Trac Ticket #447 - Possible to add invalid attribute to nsslapd-allowed-to-delete-attrs +- Trac Ticket #443 - Deleting attribute present in nsslapd-allowed-to-delete-attrs returns Operations error +- Ticket #503 - Improve AD version in winsync log message +- Trac Ticket #190 - Un-resolvable server in replication agreement produces unclear error message +- Coverity fixes +- Trac Ticket #391 - Slapd crashes when deleting backends while operations are still in progress +- Trac Ticket #448 - Possible to set invalid macros in Macro ACIs +- Trac Ticket #498 - Cannot abaondon simple paged result search +- Coverity defects +- Trac Ticket #494 - slapd entered to infinite loop during new index addition +- Fixing compiler warnings in the posix-winsync plugin +- Coverity defects +- Ticket 147 - Internal Password Policy usage very inefficient +- Ticket 495 - internalModifiersname not updated by DNA plugin +- Revert "Ticket 495 - internalModifiersname not updated by DNA plugin" +- Ticket 495 - internalModifiersname not updated by DNA plugin +- Ticket 468 - if pam_passthru is enabled, need to AC_CHECK_HEADERS([security/pam_appl.h]) +- Ticket 486 - nsslapd-enablePlugin should not be multivalued +- Ticket 488 - Doc: DS error log messages with typo +- Trac Ticket #451 - Allow db2ldif to be quiet +- Ticket #491 - multimaster_extop_cleanruv returns wrong error codes +- Ticket #481 - expand nested posix groups +- Trac Ticket #455 - Insufficient rights to unhashed#user#password when user deletes his password +- Ticket #446 - anonymous limits are being applied to directory manager + +* Tue Oct 9 2012 Mark Reynolds <mareynol(a)redhat.com> - 1.3.0.a1-1 +Ticket #28 MOD operations with chained delete/add get back error 53 on backend config +Ticket #173 ds-logpipe.py script's man page and script help should be updated for -t option. +Ticket #196 RFE: Interpret IPV6 addresses for ACIs, replication, and chaining +Ticket #218 RFE - Make RIP working with Replicated Entries +Ticket #328 make sure all internal search filters are properly escaped +Ticket #329 389-admin build fails on F-18 with new apache +Ticket #344 deadlock in replica_write_ruv +Ticket #351 use betxn plugins by default +Ticket #352 make cos, roles, views betxn aware +Ticket #356 logconv.pl - RFE - track bind info +Ticket #365 Audit log - clear text password in user changes +Ticket #370 Opening merge qualifier CoS entry using RHDS console changes the entry. +Ticket #372 Setting nsslapd-listenhost or nsslapd-securelistenhost breaks ACI processing +Ticket #386 Overconsumption of memory with large cachememsize and heavy use of ldapmodify +Ticket #402 unhashedTicket #userTicket #password in entry extension +Ticket #408 Create a normalized dn cache +Ticket #453 db2index with -tattrname:type,type fails +Ticket #461 fix build problem with mozldap c sdk +Ticket #462 add test for include file mntent.h +Ticket #463 different parameters of getmntent in Solaris + +* Tue Sep 25 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.15-1 +- Trac Ticket #470 - 389 prevents from adding a posixaccount with userpassword after schema reload +- Ticket 477 - CLEANALLRUV if there are only winsync agmts task will hang +- Ticket 457 - dirsrv init script returns 0 even when few or all instances fail to start +- Ticket 473 - change VERSION.sh to have console version be major.minor +- Ticket 475 - Root DN Access Control - improve value checking for config +- Trac Ticket #466 - entry_apply_mod - ADD: Failed to set unhashed#user#password to extension +- Ticket 474 - Root DN Access Control - days allowed not working correctly +- Ticket 467 - CLEANALLRUV abort task should be able to ignore down replicas +- 0b79915 fix compiler warnings in ticket 374 code +- Ticket 452 - automember rebuild task adds users to groups that do not match the configuration scope + +* Fri Sep 7 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.14-1 +- Ticket 450 - CLEANALLRUV task gets stuck on winsync replication agreement +- Ticket 386 - large memory growth with ldapmodify(heap fragmentation) +- this patch doesn't fix the bug - it allows us to experiment with +- different values of mxfast +- Ticket #374 - consumer can go into total update mode for no reason + +* Tue Sep 4 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.13-1 +- Ticket #426 - support posix schema for user and group sync +- 1) plugin config ldif must contain pluginid, etc. during upgrade or it +- will fail due to schema errors +- 2) posix winsync should have a lower precedence (25) than the default (50) +- so that it will be run first +- 3) posix winsync should support the Winsync API v3 - the v2 functions are +- just stubs for now - but the precedence cb is active + +* Thu Aug 30 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.12-1 +- 8e5087a Coverity defects - 13089: Dereference after null check ldbm_back_delete +- Trac Ticket #437 - variable dn should not be used in ldbm_back_delete +- ba1f5b2 fix coverity resource leak in windows_plugin_add +- e3e81db Simplify program flow: change while loops to for +- a0d5dc0 Fix logic errors: del_mod should be latched (might not be last mod), and avoid skipping add-mods (int value 0) +- 0808f7e Simplify program flow: make adduids/moduids/deluids action blocks all similar +- 77eb760 Simplify program flow: eliminate unnecessary continue +- c9e9db7 Memory leaks: unmatched slapi_attr_get_valueset and slapi_value_new +- a4ca0cc Change "return"s in modGroupMembership to "break"s to avoid leaking +- d49035c Factorize into new isPosixGroup function +- 3b61c03 coverity - posix winsync mem leaks, null check, deadcode, null ref, use after free +- 33ce2a9 fix mem leaks with parent dn log message, setting winsync windows domain +- Ticket #440 - periodic dirsync timed event causes server to loop repeatedly +- Ticket #355 - winsync should not delete entry that appears to be out of scope +- Ticket 436 - nsds5ReplicaEnabled can be set with any invalid values. +- 487932d coverity - mbo dead code - winsync leaks, deadcode, null check, test code +- 2734a71 CLEANALLRUV coverity fixes +- Ticket #426 - support posix schema for user and group sync +- Ticket #430 - server to server ssl client auth broken with latest openldap + +* Mon Aug 20 2012 Mark Reynolds <mareynol(a)redhat.com> - 1.2.11.11-1 +6c0778f bumped version to 1.2.11.11 +Ticket 429 - added nsslapd-readonly to DS schema +Ticket 403 - fix CLEANALLRUV regression from last commit +Trac Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values + +* Tue Aug 14 2012 Mark Reynolds <mareynol(a)redhat.com> - 1.2.11.10-1 +db6b354 bumped version to 1.2.11.10 +Ticket 403 - CLEANALLRUV revisions + +* Tue Aug 7 2012 Mark Reynolds <mareynol(a)redhat.com> - 1.2.11.9-1 +ea05e69 Bumped version to 1.2.11.9 +Ticket 407 - dna memory leak - fix crash from prev fix + +* Fri Aug 3 2012 Mark Reynolds <mareynol(a)redhat.com> - 1.2.11.8-1 +ddcf669 bump version to 1.2.11.8 for offical release +Ticket #425 - support multiple winsync plugins +Ticket 403 - cleanallruv coverity fixes +Ticket 407 - memory leak in dna plugin +Ticket 403 - CLEANALLRUV feature +Ticket 413 - "Server is unwilling to perform" when running ldapmodify on nsds5ReplicaStripAttrs +3168f04 Coverity defects +5ff0a02 COVERITY FIXES +Ticket #388 - Improve replication agreement status messages +0760116 Update the slapi-plugin documentation on new slapi functions, and added a slapi function for checking on shutdowns +Ticket #369 - restore of replica ldif file on second master after deleting two records shows only 1 deletion +Ticket #409 - Report during startup if nsslapd-cachememsize is too small +Ticket #412 - memberof performance enhancement +12813: Uninitialized pointer read string_values2keys +Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values +Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values +Ticket #410 - Referential integrity plug-in does not work when update interval is not zero +Ticket #406 - Impossible to rename entry (modrdn) with Attribute Uniqueness plugin enabled +Ticket #405 - referint modrdn not working if case is different +Ticket 399 - slapi_ldap_bind() doesn't check bind results + +* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.11.7-2.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 28 2012 Petr Pisar <ppisar(a)redhat.com> - 1.2.11.7-2.1 +- Perl 5.16 rebuild + +* Wed Jun 27 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.7-2 +- Ticket 378 - unhashed#user#password visible after changing password +- fix func declaration from previous patch +- Ticket 366 - Change DS to purge ticket from krb cache in case of authentication error + +* Wed Jun 27 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.7-1 +- Trac Ticket 396 - Account Usability Control Not Working + +* Thu Jun 21 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.6-1 +- Ticket #378 - audit log does not log unhashed password: enabled, by default. +- Ticket #378 - unhashed#user#password visible after changing password +- Ticket #365 - passwords in clear text in the audit log + +* Tue Jun 19 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.5-2 +- workaround for https://bugzilla.redhat.com/show_bug.cgi?id=833529 + +* Mon Jun 18 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.5-1 +- Ticket #387 - managed entry sometimes doesn't delete the managed entry +- 5903815 improve txn test index handling +- Ticket #360 - ldapmodify returns Operations error - fix delete caching +- bcfa9e3 Coverity Fix for CLEANALLRUV +- Trac Ticket #335 - transaction retries need to be cache aware +- Ticket #389 - ADD operations not in audit log +- 44cdc84 fix coverity issues with uninit vals, no return checking +- Ticket 368 - Make the cleanAllRUV task one step +- Ticket #110 - RFE limiting root DN by host, IP, time of day, day of week + +* Mon Jun 11 2012 Petr Pisar <ppisar(a)redhat.com> - 1.2.11.4-1.1 +- Perl 5.16 rebuild + +* Tue May 22 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.4-1 +- Ticket #360 - ldapmodify returns Operations error +- Ticket #321 - krbExtraData is being null modified and replicated on each ssh login +- Trac Ticket #359 - Database RUV could mismatch the one in changelog under the stress +- Ticket #361: Bad DNs in ACIs can segfault ns-slapd +- Trac Ticket #338 - letters in object's cn get converted to lowercase when renaming object +- Ticket #337 - Improve CLEANRUV task + +* Sat May 5 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.3-1 +- Ticket #358 - managed entry doesn't delete linked entry + +* Fri May 4 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.2-1 +- Ticket #351 - use betxn plugins by default +- revert - make no plugins betxn by default - too great a risk +- for deadlocks until we can test this better +- Ticket #348 - crash in ldap_initialize with multiple threads +- fixes PR_Init problem in ldclt + +* Wed May 2 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11.1-1 +- f227f11 Suppress alert on unavailable port with forced setup +- Ticket #353 - coverity 12625-12629 - leaks, dead code, unchecked return +- Ticket #351 - use betxn plugins by default +- Trac Ticket #345 - db deadlock return should not log error +- Ticket #348 - crash in ldap_initialize with multiple threads +- Ticket #214 - Adding Replication agreement should complain if required nsds5ReplicaCredentials not supplied +- Ticket #207 - [RFE] enable attribute that tracks when a password was last set +- Ticket #216 - RFE - Disable replication agreements +- Ticket #337 - RFE - Improve CLEANRUV functionality +- Ticket #326 - MemberOf plugin should work on all backends +- Trac Ticket #19 - Convert entryUSN plugin to transaction aware type +- Ticket #347 - IPA dirsvr seg-fault during system longevity test +- Trac Ticket #310 - Avoid calling escape_string() for logged DNs +- Trac Ticket #338 - letters in object's cn get converted to lowercase when renaming object +- Ticket #183 - passwordMaxFailure should lockout password one sooner +- Trac Ticket #335 - transaction retries need to be cache aware +- Ticket #336 - [abrt] 389-ds-base-1.2.10.4-2.fc16: index_range_read_ext: Process /usr/sbin/ns-slapd was killed by signal 11 (SIGSEGV) +- Ticket #325 - logconv.pl : use of getopts to parse command line options +- Ticket #336 - [abrt] 389-ds-base-1.2.10.4-2.fc16: index_range_read_ext: Process /usr/sbin/ns-slapd was killed by signal 11 (SIGSEGV) +- 554e29d Coverity Fixes +- Trac Ticket #46 - (additional 2) setup-ds-admin.pl does not like ipv6 only hostnames +- Ticket #183 - passwordMaxFailure should lockout password one sooner - and should be configurable to avoid regressions +- Ticket #315 - small fix to libglobs +- Ticket #315 - ns-slapd exits/crashes if /var fills up +- Ticket #20 - Allow automember to work on entries that have already been added +- Trac Ticket #45 - Fine Grained Password policy: if passwordHistory is on, deleting the password fails. + +* Fri Mar 30 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.11-0.1.a1 +- 453eb97 schema def must have DESC '' - close paren must be preceded by space +- Trac Ticket #46 - (additional) setup-ds-admin.pl does not like ipv6 only hostnames +- Ticket #331 - transaction errors with db 4.3 and db 4.2 +- Ticket #261 - Add Solaris i386 +- Ticket #316 and Ticket #70 - add post add/mod and AD add callback hooks +- Ticket #324 - Sync with group attribute containing () fails +- Ticket #319 - ldap-agent crashes on start with signal SIGSEGV +- 77cacd9 coverity 12606 Logically dead code +- Trac Ticket #303 - make DNA range requests work with transactions +- Ticket #320 - allow most plugins to be betxn plugins +- Ticket #24 - Add nsTLS1 to the DS schema +- Ticket #271 - Slow shutdown when you have 100+ replication agreements +- TIcket #285 - compilation fixes for '--format-security' +- Ticket 211 - Avoid preop range requests non-DNA operations +- Ticket #271 - replication code cleanup +- Ticket 317 - RHDS fractional replication with excluded password policy attributes leads to wrong error messages. +- Ticket #308 - Automembership plugin fails if data and config area mixed in the plugin configuration +- Ticket #292 - logconv.pl reporting unindexed search with different search base than shown in access logs +- 6f8680a coverity 12563 Read from pointer after free (fix 2) +- e6a9b22 coverity 12563 Read from pointer after free +- 245d494 Config changes fail because of unknown attribute "internalModifiersname" +- Ticket #191 - Implement SO_KEEPALIVE in network calls +- Ticket #289 - allow betxn plugin config changes +- 93adf5f destroy the entry cache and dn cache in the dse post op delete callback +- e2532d8 init txn thread private data for all database modes +- Ticket #291 - cannot use & in a sasl map search filter +- 6bf6e79 Schema Reload crash fix +- 60b2d12 Fixing compiler warnings +- Trac Ticket #260 - 389 DS does not support multiple paging controls on a single connection +- Ticket #302 - use thread local storage for internalModifiersName & internalCreatorsName +- fdcc256 Minor bug fix introcuded by commit 69c9f3bf7dd9fe2cadd5eae0ab72ce218b78820e +- Ticket #306 - void function cannot return value +- ticket 181 - Allow PAM passthru plug-in to have multiple config entries +- ticket 211 - Use of uninitialized variables in ldbm_back_modify() +- Ticket #74 - Add schema for DNA plugin (RFE) +- Ticket #301 - implement transaction support using thread local storage +- Ticket #211 - dnaNextValue gets incremented even if the user addition fails +- 144af59 coverity uninit var and resource leak +- Trac Ticket #34 - remove-ds.pl does not remove everything +- Trac Ticket #169 - allow 389 to use db5 +- bc78101 fix compiler warning in acct policy plugin +- Trac Ticket #84 - 389 Directory Server Unnecessary Checkpoints +- Trac Ticket #27 - SASL/PLAIN binds do not work +- Ticket #129 - Should only update modifyTimestamp/modifiersName on MODIFYops +- Ticket #17 - new replication optimizations + +* Tue Mar 27 2012 Noriko Hosoi <nhosoi(a)redhat.com> - 1.2.10.4-4 +- Ticket #46 - (revised) setup-ds-admin.pl does not like ipv6 only hostnames +- Ticket #66 - 389-ds-base spec file does not have a BuildRequires on gcc-c++ + +* Fri Mar 23 2012 Noriko Hosoi <nhosoi(a)redhat.com> - 1.2.10.4-3 +- Ticket #46 - setup-ds-admin.pl does not like ipv6 only hostnames + +* Wed Mar 21 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10.4-2 +- get rid of posttrans - move update code to post + +* Tue Mar 13 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10.4-1 +- Ticket #305 - Certain CMP operations hang or cause ns-slapd to crash + +* Mon Mar 5 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10.3-1 +- b05139b memleak in normalize_mods2bvals +- c0eea24 memleak in mep_parse_config_entry +- 90bc9eb handle null smods +- Ticket #305 - Certain CMP operations hang or cause ns-slapd to crash +- Ticket #306 - void function cannot return value +- ticket 304 - Fix kernel version checking in dsktune + +* Thu Feb 23 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10.2-1 +- Trac Ticket #298 - crash when replicating orphaned tombstone entry +- Ticket #281 - TLS not working with latest openldap +- Trac Ticket #290 - server hangs during shutdown if betxn pre/post op fails +- Trac Ticket #26 - Please support setting defaultNamingContext in the rootdse + +* Tue Feb 14 2012 Noriko Hosoi <nhosoi(a)redhat.com> - 1.2.10.1-2 +- Ticket #124 - add Provides: ldif2ldbm to rpm + +* Tue Feb 14 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10.1-1 +- Ticket #294 - 389 DS Segfaults during replica install in FreeIPA + +* Mon Feb 13 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10.0-1 +- Ticket 284 - Remove unnecessary SNMP MIB files +- Ticket 51 - memory leaks in 389-ds-base-1.2.8.2-1.el5? +- Ticket 175 - logconv.pl improvements + +* Fri Feb 10 2012 Noriko Hosoi <nhosoi(a)redhat.com> - 1.2.10-0.10.rc1.2 +- Introducing use_db4 macro to support db5 (libdb). + +* Fri Feb 10 2012 Petr Pisar <ppisar(a)redhat.com> - 1.2.10-0.10.rc1.1 +- Rebuild against PCRE 8.30 + +* Thu Feb 2 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10-0.10.rc1 +- ad9dd30 coverity 12488 Resource leak In attr_index_config(): Leak of memory or pointers to system resources +- Ticket #281 - TLS not working with latest openldap +- Ticket #280 - extensible binary filters do not work +- Ticket #279 - filter normalization does not use matching rules +- Trac Ticket #275 - Invalid read reported by valgrind +- Ticket #277 - cannot set repl referrals or state +- Ticket #278 - Schema replication update failed: Invalid syntax +- Ticket #39 - Account Policy Plugin does not work for simple binds when PAM Pass Through Auth plugin is enabled +- Ticket #13 - slapd process exits when put the database on read only mode while updates are coming to the server +- Ticket #87 - Manpages fixes +- c493fb4 fix a couple of minor coverity issues +- Ticket #55 - Limit of 1024 characters for nsMatchingRule +- Trac Ticket #274 - Reindexing entryrdn fails if ancestors are also tombstoned +- Ticket #6 - protocol error from proxied auth operation +- Ticket #38 - nisDomain schema is incorrect +- Ticket #273 - ruv tombstone searches don't work after reindex entryrdn +- Ticket #29 - Samba3-schema is missing sambaTrustedDomainPassword +- Ticket #22 - RFE: Support sendmail LDAP routing schema +- Ticket #161 - Review and address latest Coverity issues +- Ticket #140 - incorrect memset parameters +- Trac Ticket 35 - Log not clear enough on schema errors +- Trac Ticket 139 - eliminate the use of char *dn in favor of Slapi_DN *dn +- Trac Ticket #52 - FQDN set to nsslapd-listenhost makes the server start fail if IPv4-mapped-IPv6 address is given + +* Tue Jan 24 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10-0.9.a8 +- Ticket #272 - add tombstonenumsubordinates to schema + +* Mon Jan 23 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10-0.8.a7 +- fixes for systemd - remove .pid files after shutting down servers +- Ticket #263 - add systemd include directive +- Ticket #264 - upgrade needs better check for "server is running" + +* Fri Jan 20 2012 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10-0.7.a7 +- Ticket #262 - pid file not removed with systemd +- Ticket #50 - server should not call a plugin after the plugin close function is called +- Ticket #18 - Data inconsitency during replication +- Ticket #49 - better handling for server shutdown while long running tasks are active +- Ticket #15 - Get rid of rwlock.h/rwlock.c and just use slapi_rwlock instead +- Ticket #257 - repl-monitor doesn't work if leftmost hostnames are the same +- Ticket #12 - 389 DS DNA Plugin / Replication failing on GSSAPI +- 6aaeb77 add a hack to disable sasl hostname canonicalization +- Ticket 168 - minssf should not apply to rootdse +- Ticket #177 - logconv.pl doesn't detect restarts +- Ticket #159 - Managed Entry Plugin runs against managed entries upon any update without validating +- Ticket 75 - Unconfigure plugin opperations are being called. +- Ticket 26 - Please support setting defaultNamingContext in the rootdse. +- Ticket #71 - unable to delete managed entry config +- Ticket #167 - Mixing transaction and non-transaction plugins can cause deadlock +- Ticket #256 - debug build assertion in ACL_EvalDestroy() +- Ticket #4 - bak2db gets stuck in infinite loop +- Ticket #162 - Infinite loop / spin inside strcmpi_fast, acl_read_access_allowed_on_attr, server DoS +- Ticket #3: acl cache overflown problem +- Ticket 1 - pre-normalize filter and pre-compile substring regex - and other optimizations +- Ticket 2 - If node entries are tombstone'd, subordinate entries fail to get the full DN. + +* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.10-0.6.a6.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Dec 15 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10-0.6.a6 +- Bug 755725 - 389 programs linked against openldap crash during shutdown +- Bug 755754 - Unable to start dirsrv service using systemd +- Bug 745259 - Incorrect entryUSN index under high load in replicated environment +- d439e3a use slapi_hexchar2int and slapi_str_to_u8 everywhere +- 5910551 csn_init_as_string should not use sscanf +- b53ba00 reduce calls to csn_as_string and slapi_log_error +- c897267 fix member variable name error in slapi_uniqueIDFormat +- 66808e5 uniqueid formatting - use slapi_u8_to_hex instead of sprintf +- 580a875 csn_as_string - use slapi_uN_to_hex instead of sprintf +- Bug 751645 - crash when simple paged fails to send entry to client +- Bug 752155 - Use restorecon after creating init script lock file + +* Fri Nov 4 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10-0.5.a5 +- Bug 751495 - 'setup-ds.pl -u' fails with undefined routine 'updateSystemD' +- Bug 750625 750624 750622 744946 Coverity issues +- Bug 748575 - part 2 - rhds81 modrdn operation and 100% cpu use in replication +- Bug 748575 - rhds81 modrn operation and 100% cpu use in replication +- Bug 745259 - Incorrect entryUSN index under high load in replicated environment +- f639711 Reduce the number of DN normalization +- c06a8fa Keep unhashed password psuedo-attribute in the adding entry +- Bug 744945 - nsslapd-counters attribute value cannot be set to "off" +- 8d3b921 Use new PLUGIN_CONFIG_ENTRY feature to allow switching between txn and regular +- d316a67 Change referential integrity to be a betxnpostoperation plugin + +* Fri Oct 7 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10-0.4.a4 +- Bug 741744 - part3 - MOD operations with chained delete/add get back error 53 +- 1d2f5a0 make memberof transaction aware and able to be a betxnpostoperation plug in +- b6d3ba7 pass the plugin config entry to the plugin init function +- 28f7bfb set the ENTRY_POST_OP for modrdn betxnpostoperation plugins +- Bug 743966 - Compiler warnings in account usability plugin + +* Wed Oct 5 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10.a3-0.3 +- 498c42b fix transaction support in ldbm_delete + +* Wed Oct 5 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10.a2-0.2 +- Bug 740942 - allow resource limits to be set for paged searches independently of limits for other searches/operations +- Bug 741744 - MOD operations with chained delete/add get back error 53 on backend config +- Bug 742324 - allow nsslapd-idlistscanlimit to be set dynamically and per-user + +* Wed Sep 21 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.10.a1-0.1 +- Bug 695736 - Providing native systemd file + +* Wed Sep 7 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.10-2 +- corrected source + +* Wed Sep 7 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.10-1 +- Bug 735114 - renaming a managed entry does not update mepmanagedby + +* Thu Sep 1 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.9-1 +- Bug 735121 - simple paged search + ip/dns based ACI hangs server +- Bug 722292 - (cov#11030) Leak of mapped_sdn in winsync rename code +- Bug 703990 - cross-platform - Support upgrade from Red Hat Directory Server +- Introducing an environment variable USE_VALGRIND to clean up the entry cache and dn cache on exit. + +* Wed Aug 31 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.8-1 +- Bug 732153 - subtree and user account lockout policies implemented? +- Bug 722292 - Entries in DS are not updated properly when using WinSync API + +* Wed Aug 24 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.7-1 +- Bug 733103 - large targetattr list with syntax errors cause server to crash or hang +- Bug 633803 - passwordisglobalpolicy attribute brakes TLS chaining +- Bug 732541 - Ignore error 32 when adding automember config +- Bug 728592 - Allow ns-slapd to start with an invalid server cert + +* Wed Aug 10 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.6-1 +- Bug 728510 - Run dirsync after sending updates to AD +- Bug 729717 - Fatal error messages when syncing deletes from AD +- Bug 729369 - upgrade DB to upgrade from entrydn to entryrdn format is not working. +- Bug 729378 - delete user subtree container in AD + modify password in DS == DS crash +- Bug 723937 - Slapi_Counter API broken on 32-bit F15 +- fixed again - separate tests for atomic ops and atomic bool cas + +* Mon Aug 8 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.5-1 +- Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error +- Fix another coverity NULL deref in previous patch + +* Thu Aug 4 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.4-1 +- Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error +- Fix coverity NULL deref in previous patch + +* Wed Aug 3 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.3-1 +- Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error +- previous patch broke build on el5 + +* Wed Aug 3 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.2-1 +- Bug 727511 - ldclt SSL search requests are failing with "illegal error number -1" error + +* Tue Aug 2 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.1-2 +- Bug 723937 - Slapi_Counter API broken on 32-bit F15 +- fixed to use configure test for GCC provided 64-bit atomic functions + +* Wed Jul 27 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.1-1 +- Bug 663752 - Cert renewal for attrcrypt and encchangelog +- this was "re-fixed" due to a deadlock condition with cl2ldif task cancel +- Bug 725953 - Winsync: DS entries fail to sync to AD, if the User's CN entry contains a comma +- Bug 725743 - Make memberOf use PRMonitor for it's operation lock +- Bug 725542 - Instance upgrade fails when upgrading 389-ds-base package +- Bug 723937 - Slapi_Counter API broken on 32-bit F15 + +* Thu Jul 21 2011 Petr Sabata <contyk(a)redhat.com> - 1.2.9.0-1.2 +- Perl mass rebuild + +* Wed Jul 20 2011 Petr Sabata <contyk(a)redhat.com> - 1.2.9.0-1.1 +- Perl mass rebuild + +* Fri Jul 15 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9.0-1 +- Bug 720059 - RDN with % can cause crashes or missing entries +- Bug 709468 - RSA Authentication Server timeouts when using simple paged results on RHDS 8.2. +- Bug 691313 - Need TLS/SSL error messages in repl status and errors log +- Bug 712855 - Directory Server 8.2 logs "Netscape Portable Runtime error -5961 (TCP connection reset by peer.)" to error log whereas Directory Server 8.1 did not +- Bug 713209 - Update sudo schema +- Bug 719069 - clean up compiler warnings in 389-ds-base 1.2.9 +- Bug 718303 - Intensive updates on masters could break the consumer's cache +- Bug 711679 - unresponsive LDAP service when deleting vlv on replica + +* Mon Jun 27 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9-0.2.a2 +- 389-ds-base-1.2.9.a2 +- look for separate openldap ldif library +- Split automember regex rules into separate entries +- writing Inf file shows SchemaFile = ARRAY(0xhexnum) +- add support for ldif files with changetype: add +- Bug 716980 - winsync uses old AD entry if new one not found +- Bug 697694 - rhds82 - incr update state stop_fatal_error "requires administrator action", with extop_result: 9 +- bump console version to 1.2.6 +- Bug 711679 - unresponsive LDAP service when deleting vlv on replica +- Bug 703703 - setup-ds-admin.pl asks for legal agreement to a non-existant file +- Bug 706209 - LEGAL: RHEL6.1 License issue for 389-ds-base package +- Bug 663752 - Cert renewal for attrcrypt and encchangelog +- Bug 706179 - DS can not restart after create a new objectClass has entryusn attribute +- Bug 711906 - ns-slapd segfaults using suffix referrals +- Bug 707384 - only allow FIPS approved cipher suites in FIPS mode +- Bug 710377 - Import with chain-on-update crashes ns-slapd +- Bug 709826 - Memory leak: when extra referrals configured + +* Fri Jun 17 2011 Marcela Mašláňová <mmaslano(a)redhat.com> - 1.2.9-0.1.a1.2 +- Perl mass rebuild + +* Fri Jun 10 2011 Marcela Mašláňová <mmaslano(a)redhat.com> - 1.2.9-0.1.a1.1 +- Perl 5.14 mass rebuild + +* Thu May 26 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.9-0.1.a1 +- 389-ds-base-1.2.9.a1 +- Auto Membership +- More Coverity fixes + +* Mon May 2 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.8.3-1 +- 389-ds-base-1.2.8.3 +- Bug 700145 - userpasswd not replicating +- Bug 700557 - Linked attrs callbacks access free'd pointers after close +- Bug 694336 - Group sync hangs Windows initial Sync +- Bug 700215 - ldclt core dumps +- Bug 695779 - windows sync can lose old values when a new value is added +- Bug 697027 - 12 - minor memory leaks found by Valgrind + TET + +* Thu Apr 14 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.8.2-1 +- 389-ds-base-1.2.8.2 +- Bug 696407 - If an entry with a mixed case RDN is turned to be +- a tombstone, it fails to assemble DN from entryrdn + +* Fri Apr 8 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.8.1-1 +- 389-ds-base-1.2.8.1 +- Bug 693962 - Full replica push loses some entries with multi-valued RDNs + +* Tue Apr 5 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.8.0-1 +- 389-ds-base-1.2.8.0 +- Bug 693473 - rhds82 rfe - windows_tot_run to log Sizelimit exceeded instead of LDAP error - -1 +- Bug 692991 - rhds82 - windows_tot_run: failed to obtain data to send to the consumer; LDAP error - -1 +- Bug 693466 - Unable to change schema online +- Bug 693503 - matching rules do not inherit from superior attribute type +- Bug 693455 - nsMatchingRule does not work with multiple values +- Bug 693451 - cannot use localized matching rules +- Bug 692331 - Segfault on index update during full replication push on 1.2.7.5 + +* Mon Apr 4 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.8-0.10.rc5 +- 389-ds-base-1.2.8.rc5 +- Bug 692469 - Replica install fails after step for "enable GSSAPI for replication" + +* Tue Mar 29 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.8-0.9.rc4 +- 389-ds-base-1.2.8.rc4 +- Bug 668385 - DS pipe log script is executed as many times as the dirsrv serv +ice is restarted +- 389-ds-base-1.2.8.rc3 +- Bug 690955 - Mrclone fails due to the replica generation id mismatch + +* Tue Mar 22 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.8-0.8.rc2 +- 389-ds-base-1.2.8 release candidate 2 - git tag 389-ds-base-1.2.8.rc2 +- Bug 689537 - (cov#10610) Fix Coverity NULL pointer dereferences +- Bug 689866 - ns-newpwpolicy.pl needs to use the new DN format +- Bug 681015 - RFE: allow fine grained password policy duration attributes +- in days, hours, minutes, as well +- Bug 684996 - Exported tombstone cannot be imported correctly +- Bug 683250 - slapd crashing when traffic replayed +- Bug 668909 - Can't modify replication agreement in some cases +- Bug 504803 - Allow maxlogsize to be set if logmaxdiskspace is -1 +- Bug 644784 - Memory leak in "testbind.c" plugin +- Bug 680558 - Winsync plugin fails to restrain itself to the configured subtree + +* Mon Mar 7 2011 Caolán McNamara <caolanm(a)redhat.com> - 1.2.8-0.7.rc1 +- rebuild for icu 4.6 + +* Wed Mar 2 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.8-0.6.rc1 +- 389-ds-base-1.2.8 release candidate 1 - git tag 389-ds-base-1.2.8.rc1 +- Bug 518890 - setup-ds-admin.pl - improve hostname validation +- Bug 681015 - RFE: allow fine grained password policy duration attributes in +- days, hours, minutes, as well +- Bug 514190 - setup-ds-admin.pl --debug does not log to file +- Bug 680555 - ns-slapd segfaults if I have more than 100 DBs +- Bug 681345 - setup-ds.pl should set SuiteSpotGroup automatically +- Bug 674852 - crash in ldap-agent when using OpenLDAP +- Bug 679978 - modifying attr value crashes the server, which is supposed to +- be indexed as substring type, but has octetstring syntax +- Bug 676655 - winsync stops working after server restart +- Bug 677705 - ds-logpipe.py script is failing to validate "-s" and +- "--serverpid" options with "-t". +- Bug 625424 - repl-monitor.pl doesn't work in hub node + +* Mon Feb 28 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.8-0.5.a3 +- Bug 676598 - 389-ds-base multilib: file conflicts +- split off libs into a separate -libs package + +* Thu Feb 24 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.8-0.4.a3 +- do not create /var/run/dirsrv - setup will create it instead +- remove the fedora-ds initscript upgrade stuff - we do not support that anymore +- convert the remaining lua stuff to plain old shell script + +* Wed Feb 9 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.8-0.3.a3 +- 1.2.8.a3 release - git tag 389-ds-base-1.2.8.a3 +- Bug 675320 - empty modify operation with repl on or lastmod off will crash server +- Bug 675265 - preventryusn gets added to entries on a failed delete +- Bug 677774 - added support for tmpfiles.d +- Bug 666076 - dirsrv crash (1.2.7.5) with multiple simple paged result search +es +- Bug 672468 - Don't use empty path elements in LD_LIBRARY_PATH +- Bug 671199 - Don't allow other to write to rundir +- Bug 678646 - Ignore tombstone operations in managed entry plug-in +- Bug 676053 - export task followed by import task causes cache assertion +- Bug 677440 - clean up compiler warnings in 389-ds-base 1.2.8 +- Bug 675113 - ns-slapd core dump in windows_tot_run if oneway sync is used +- Bug 676689 - crash while adding a new user to be synced to windows +- Bug 604881 - admin server log files have incorrect permissions/ownerships +- Bug 668385 - DS pipe log script is executed as many times as the dirsrv serv +ice is restarted +- Bug 675853 - dirsrv crash segfault in need_new_pw() + +* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.8-0.2.a2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Feb 3 2011 Rich Megginson <rmeggins(a)redhat.com> - 1.2.8-0.2.a2 +- 1.2.8.a2 release - git tag 389-ds-base-1.2.8.a2 +- Bug 674430 - Improve error messages for attribute uniqueness +- Bug 616213 - insufficient stack size for HP-UX on PA-RISC +- Bug 615052 - intrinsics and 64-bit atomics code fails to compile +- on PA-RISC +- Bug 151705 - Need to update Console Cipher Preferences with new ciphers +- Bug 668862 - init scripts return wrong error code +- Bug 670616 - Allow SSF to be set for local (ldapi) connections +- Bug 667935 - DS pipe log script's logregex.py plugin is not redirecting the +- log output to the text file +- Bug 668619 - slapd stops responding +- Bug 624547 - attrcrypt should query the given slot/token for +- supported ciphers +- Bug 646381 - Faulty password for nsmultiplexorcredentials does not give any +- error message in logs + +* Fri Jan 21 2011 Nathan Kinder <nkinder(a)redhat.com> - 1.2.8-0.1.a1 +- 1.2.8-0.1.a1 release - git tag 389-ds-base-1.2.8.a1 +- many bug fixes + +* Thu Dec 16 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7.5-1 +- 1.2.7.5 release - git tag 389-ds-base-1.2.7.5 +- Bug 663597 - Memory leaks in normalization code + +* Tue Dec 14 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7.4-2 +- Resolves: bug 656541 - use %ghost on files in /var/lock + +* Fri Dec 10 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7.4-1 +- 1.2.7.4 release - git tag 389-ds-base-1.2.7.4 +- Bug 661792 - Valid managed entry config rejected + +* Wed Dec 8 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7.3-1 +- 1.2.7.3 release - git tag 389-ds-base-1.2.7.3 +- Bug 658312 - Invalid free in Managed Entry plug-in +- Bug 641944 - Don't normalize non-DN RDN values + +* Fri Dec 3 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7.2-1 +- 1.2.7.2 release - git tag 389-ds-base-1.2.7.2 +- Bug 659456 - Incorrect usage of ber_printf() in winsync code +- Bug 658309 - Process escaped characters in managed entry mappings +- Bug 197886 - Initialize return value for UUID generation code +- Bug 658312 - Allow mapped attribute types to be quoted +- Bug 197886 - Avoid overflow of UUID generator + +* Tue Nov 23 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7.1-2 +- last commit had bogus commit log + +* Tue Nov 23 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7.1-1 +- 1.2.7.1 release - git tag 389-ds-base-1.2.7.1 +- Bug 656515 - Allow Name and Optional UID syntax for grouping attributes +- Bug 656392 - Remove calls to ber_err_print() +- Bug 625950 - hash nsslapd-rootpw changes in audit log + +* Tue Nov 16 2010 Nathan Kinder <nkinder(a)redhat.com> - 1.2.7-2 +- 1.2.7 release - git tag 389-ds-base-1.2.7 + +* Fri Nov 12 2010 Nathan Kinder <nkinder(a)redhat.com> - 1.2.7-1 +- Bug 648949 - Merge dirsrv and dirsrv-admin policy modules into base policy + +* Tue Nov 9 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7-0.6.a5 +- 1.2.7.a5 release - git tag 389-ds-base-1.2.7.a5 +- Bug 643979 - Strange byte sequence for attribute with no values (nsslapd-ref +erral) +- Bug 635009 - Add one-way AD sync capability +- Bug 572018 - Upgrading from 1.2.5 to 1.2.6.a2 deletes userRoot +- put replication config entries in separate file +- Bug 567282 - server can not abandon searchRequest of "simple paged results" +- Bug 329751 - "nested" filtered roles searches candidates more than needed +- Bug 521088 - DNA should check ACLs before getting a value from the range + +* Mon Nov 1 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7-0.5.a4 +- 1.2.7.a4 release - git tag 389-ds-base-1.2.7.a4 +- Bug 647932 - multiple memberOf configuration adding memberOf where there is +no member +- Bug 491733 - dbtest crashes +- Bug 606545 - core schema should include numSubordinates +- Bug 638773 - permissions too loose on pid and lock files +- Bug 189985 - Improve attribute uniqueness error message +- Bug 619623 - attr-unique-plugin ignores requiredObjectClass on modrdn operat +ions +- Bug 619633 - Make attribute uniqueness obey requiredObjectClass + +* Wed Oct 27 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7-0.4.a3 +- 1.2.7.a3 release - a2 was never released - this is a rebuild to pick up +- Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs +- Adding the ancestorid fix code to ##upgradednformat.pl. + +* Fri Oct 22 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7-0.3.a3 +- 1.2.7.a3 release - a2 was never released +- Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs +- Bug 629681 - Retro Changelog trimming does not behave as expected +- Bug 645061 - Upgrade: 06inetorgperson.ldif and 05rfc4524.ldif +- are not upgraded in the server instance schema dir + +* Tue Oct 19 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7-0.2.a2 +- 1.2.7.a2 release - a1 was the OpenLDAP testday release +- git tag 389-ds-base-1.2.7.a2 +- added openldap support on platforms that use openldap with moznss +- for crypto (F-14 and later) +- many bug fixes +- Account Policy Plugin (keep track of last login, disable old accounts) + +* Fri Oct 8 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.7-0.1.a1 +- added openldap support + +* Wed Sep 29 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.6.1-3 +- bump rel to rebuild again + +* Mon Sep 27 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.6.1-2 +- bump rel to rebuild + +* Thu Sep 23 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.6.1-1 +- This is the 1.2.6.1 release - git tag 389-ds-base-1.2.6.1 +- Bug 634561 - Server crushes when using Windows Sync Agreement +- Bug 635987 - Incorrect sub scope search result with ACL containing ldap:///self +- Bug 612264 - ACI issue with (targetattr='userPassword') +- Bug 606920 - anonymous resource limit- nstimelimit - also applied to "cn=directory manager" +- Bug 631862 - crash - delete entries not in cache + referint + +* Thu Aug 26 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.6-1 +- This is the final 1.2.6 release + +* Tue Aug 10 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.6-0.11.rc7 +- 1.2.6 release candidate 7 +- git tag 389-ds-base-1.2.6.rc7 +- Bug 621928 - Unable to enable replica (rdn problem?) on 1.2.6 rc6 + +* Mon Aug 2 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.6-0.10.rc6 +- 1.2.6 release candidate 6 +- git tag 389-ds-base-1.2.6.rc6 +- Bug 617013 - repl-monitor.pl use cpu upto 90% +- Bug 616618 - 389 v1.2.5 accepts 2 identical entries with different DN formats +- Bug 547503 - replication broken again, with 389 MMR replication and TCP errors +- Bug 613833 - Allow dirsrv_t to bind to rpc ports +- Bug 612242 - membership change on DS does not show on AD +- Bug 617629 - Missing aliases in new schema files +- Bug 619595 - Upgrading sub suffix under non-normalized suffix disappears +- Bug 616608 - SIGBUS in RDN index reads on platforms with strict alignments +- Bug 617862 - Replication: Unable to delete tombstone errors +- Bug 594745 - Get rid of dirsrv_lib_t label + +* Wed Jul 14 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.6-0.9.rc3 +- make selinux-devel explicit Require the base package in order +- to comply with Fedora Licensing Guidelines + +* Thu Jul 1 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.6-0.8.rc3 +- 1.2.6 release candidate 3 +- git tag 389-ds-base-1.2.6.rc3 +- Bug 603942 - null deref in _ger_parse_control() for subjectdn +- 609256 - Selinux: pwdhash fails if called via Admin Server CGI +- 578296 - Attribute type entrydn needs to be added when subtree rename switch is on +- 605827 - In-place upgrade: upgrade dn format should not run in setup-ds-admin.pl +- Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll +- Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll +- 606920 - anonymous resource limit - nstimelimit - also applied to "cn=directory manager" + +* Wed Jun 16 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.6-0.7.rc2 +- 1.2.6 release candidate 2 + +* Mon Jun 14 2010 Nathan Kinder <nkinder(a)redhat.com> - 1.2.6-0.6.rc1 +- install replication session plugin header with devel package + +* Wed Jun 9 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.6-0.5.rc1 +- 1.2.6 release candidate 1 + +* Tue Jun 01 2010 Marcela Maslanova <mmaslano(a)redhat.com> - 1.2.6-0.4.a4.1 +- Mass rebuild with perl-5.12.0 + +* Wed May 26 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.6-0.4.a4 +- 1.2.6.a4 release + +* Wed Apr 7 2010 Nathan Kinder <nkinder(a)redhat.com> - 1.2.6-0.4.a3 +- 1.2.6.a3 release +- add managed entries plug-in +- many bug fixes +- moved selinux subpackage into base package + +* Fri Apr 2 2010 Caolán McNamara <caolanm(a)redhat.com> - 1.2.6-0.3.a2 +- rebuild for icu 4.4 + +* Tue Mar 2 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.6-0.2.a2 +- 1.2.6.a2 release +- add support for matching rules +- many bug fixes + +* Thu Jan 14 2010 Nathan Kinder <nkinder(a)redhat.com> - 1.2.6-0.1.a1 +- 1.2.6.a1 release +- Added SELinux policy and subpackages + +* Tue Jan 12 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.5-1 +- 1.2.5 final release + +* Mon Jan 4 2010 Rich Megginson <rmeggins(a)redhat.com> - 1.2.5-0.5.rc4 +- 1.2.5.rc4 release + +* Thu Dec 17 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.5-0.4.rc3 +- 1.2.5.rc3 release + +* Mon Dec 7 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.5-0.3.rc2 +- 1.2.5.rc2 release + +* Wed Dec 2 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.5-0.2.rc1 +- 1.2.5.rc1 release + +* Thu Nov 12 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.5-0.1.a1 +- 1.2.5.a1 release + +* Thu Oct 29 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.4-1 +- 1.2.4 release +- resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration +- resolves bug 529258 - Make upgrade remove obsolete schema from 99user.ldif + +* Mon Sep 14 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.3-1 +- 1.2.3 release +- added template-initconfig to %files +- %posttrans now runs update to update the server instances +- servers are shutdown, then restarted if running before install +- scriptlets mostly use lua now to pass data among scriptlet phases + +* Tue Sep 01 2009 Caolán McNamara <caolanm(a)redhat.com> - 1.2.2-2 +- rebuild with new openssl to fix dependencies + +* Tue Aug 25 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.2-1 +- backed out - added template-initconfig to %files - this change is for the next major release +- bump version to 1.2.2 +- fix reopened 509472 db2index all does not reindex all the db backends correctly +- fix 518520 - pre hashed salted passwords do not work +- see https://bugzilla.redhat.com/show_bug.cgi?id=518519 for the list of +- bugs fixed in 1.2.2 + +* Fri Aug 21 2009 Tomas Mraz <tmraz(a)redhat.com> - 1.2.1-5 +- rebuilt with new openssl + +* Wed Aug 19 2009 Noriko Hosoi <nhosoi(a)redhat.com> - 1.2.1-4 +- added template-initconfig to %files + +* Wed Aug 12 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.1-3 +- added BuildRequires pcre + +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon May 18 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.1-1 +- change name to 389 +- change version to 1.2.1 +- added initial support for numeric string syntax +- added initial support for syntax validation +- added initial support for paged results including sorting + +* Tue Apr 28 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.0-4 +- final release 1.2.0 +- Resolves: bug 475338 - LOG: the intenal type of maxlogsize, maxdiskspace and minfreespace should be 64-bit integer +- Resolves: bug 496836 - SNMP ldap-agent on Solaris: Unable to open semaphore for server: 389 +- CVS tag: FedoraDirSvr_1_2_0 FedoraDirSvr_1_2_0_20090428 + +* Mon Apr 6 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.0-3 +- re-enable ppc builds + +* Thu Apr 2 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.0-2 +- exclude ppc builds - needs extensive porting work + +* Mon Mar 30 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.2.0-1 +- new release 1.2.0 +- Made devel package depend on mozldap-devel +- only create run dir if it does not exist +- CVS tag: FedoraDirSvr_1_2_0_RC1 FedoraDirSvr_1_2_0_RC1_20090330 + +* Thu Oct 30 2008 Noriko Hosoi <nhosoi(a)redhat.com> - 1.1.3-7 +- added db4-utils to Requires for verify-db.pl + +* Mon Oct 13 2008 Noriko Hosoi <nhosoi(a)redhat.com> - 1.1.3-6 +- Enabled LDAPI autobind + +* Thu Oct 9 2008 Rich Megginson <rmeggins(a)redhat.com> - 1.1.3-5 +- updated update to patch bug463991-bdb47.patch + +* Thu Oct 9 2008 Rich Megginson <rmeggins(a)redhat.com> - 1.1.3-4 +- updated patch bug463991-bdb47.patch + +* Mon Sep 29 2008 Rich Megginson <rmeggins(a)redhat.com> - 1.1.3-3 +- added patch bug463991-bdb47.patch +- make ds work with bdb 4.7 + +* Wed Sep 24 2008 Rich Megginson <rmeggins(a)redhat.com> - 1.1.3-2 +- rolled back bogus winsync memory leak fix + +* Tue Sep 23 2008 Rich Megginson <rmeggins(a)redhat.com> - 1.1.3-1 +- winsync api improvements for modify operations + +* Fri Jun 13 2008 Rich Megginson <rmeggins(a)redhat.com> - 1.1.2-1 +- This is the 1.1.2 release. The bugs fixed can be found here +- https://bugzilla.redhat.com/showdependencytree.cgi?id=452721 +- Added winsync-plugin.h to the devel subpackage + +* Fri Jun 6 2008 Rich Megginson <rmeggins(a)redhat.com> - 1.1.1-2 +- bump rev to rebuild and pick up new version of ICU + +* Fri May 23 2008 Rich Megginson <rmeggins(a)redhat.com> - 1.1.1-1 +- 1.1.1 release candidate - several bug fixes + +* Wed Apr 16 2008 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0.1-4 +- fix bugzilla 439829 - patch to allow working with NSS 3.11.99 and later + +* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 1.1.0.1-3 +- add patch to allow server to work with NSS 3.11.99 and later +- do NSS_Init after fork but before detaching from console + +* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 1.1.0.1-3 +- add Requires for versioned perl (libperl.so) + +* Wed Feb 27 2008 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0.1-2 +- previous fix for 434403 used the wrong patch +- this is the right one + +* Wed Feb 27 2008 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0.1-1 +- Resolves bug 434403 - GCC 4.3 build fails +- Rolled new source tarball which includes Nathan's fix for the struct ucred +- NOTE: Change version back to 1.1.1 for next release +- this release was pulled from CVS tag FedoraDirSvr110_gcc43 + +* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 1.1.0-5 +- Autorebuild for GCC 4.3 + +* Thu Dec 20 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-4 +- This is the GA release of Fedora DS 1.1 +- Removed version numbers for BuildRequires and Requires +- Added full URL to source tarball + +* Fri Dec 07 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.1.0-3 +- Rebuild for deps + +* Wed Nov 7 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-2.0 +- This is the beta2 release +- new file added to package - /etc/sysconfig/dirsrv - for setting +- daemon environment as is usual in other linux daemons + +* Thu Aug 16 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-1.2 +- fix build breakage due to open() +- mock could not find BuildRequires: db4-devel >= 4.2.52 +- mock works if >= version is removed - it correctly finds db4.6 + +* Fri Aug 10 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-1.1 +- Change pathnames to use the pkgname macro which is dirsrv +- get rid of cvsdate in source name + +* Fri Jul 20 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-0.3.20070720 +- Added Requires for perldap, cyrus sasl plugins +- Removed template-migrate* files +- Added perl module directory +- Removed install.inf - setup-ds.pl can now easily generate one + +* Mon Jun 18 2007 Nathan Kinder <nkinder(a)redhat.com> - 1.1.0-0.2.20070320 +- added requires for mozldap-tools + +* Tue Mar 20 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-0.1.20070320 +- update to latest sources +- added migrateTo11 to allow migrating instances from 1.0.x to 1.1 +- ldapi support +- fixed pam passthru plugin ENTRY method + +* Fri Feb 23 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-0.1.20070223 +- Renamed package to fedora-ds-base, but keep names of paths/files/services the same +- use the shortname macro (fedora-ds) for names of paths, files, and services instead +- of name, so that way we can continue to use e.g. /etc/fedora-ds instead of /etc/fedora-ds-base +- updated to latest sources + +* Tue Feb 13 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-0.1.20070213 +- More cleanup suggested by Dennis Gilmore +- This is the fedora extras candidate based on cvs tag FedoraDirSvr110a1 + +* Fri Feb 9 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-1.el4.20070209 +- latest sources +- added init scripts +- use /etc as instconfigdir + +* Wed Feb 7 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-1.el4.20070207 +- latest sources +- moved all executables to _bindir + +* Mon Jan 29 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-1.el4.20070129 +- latest sources +- added /var/tmp/fedora-ds to dirs + +* Fri Jan 26 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-8.el4.20070125 +- added logconv.pl +- added slapi-plugin.h to devel package +- added explicit dirs for /var/log/fedora-ds et. al. + +* Thu Jan 25 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-7.el4.20070125 +- just move all .so files into the base package from the devel package + +* Thu Jan 25 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-6.el4.20070125 +- Move the plugin *.so files into the main package instead of the devel +- package because they are loaded directly by name via dlopen + +* Fri Jan 19 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-5.el4.20070125 +- Move the script-templates directory to datadir/fedora-ds + +* Fri Jan 19 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-4.el4.20070119 +- change mozldap to mozldap6 + +* Fri Jan 19 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-3.el4.20070119 +- remove . from cvsdate define + +* Fri Jan 19 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-2.el4.20070119 +- Having a problem building in Brew - may be Release format + +* Fri Jan 19 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1.0-1.el4.cvs20070119 +- Changed version to 1.1.0 and added Release 1.el4.cvs20070119 +- merged in changes from Fedora Extras candidate spec file + +* Mon Jan 15 2007 Rich Megginson <rmeggins(a)redhat.com> - 1.1-0.1.cvs20070115 +- Bump component versions (nspr, nss, svrcore, mozldap) to their latest +- remove unneeded patches + +* Tue Jan 09 2007 Dennis Gilmore <dennis(a)ausil.us> - 1.1-0.1.cvs20070108 +- update to a cvs snapshot +- fedorafy the spec +- create -devel subpackage +- apply a patch to use mozldap not mozldap6 +- apply a patch to allow --prefix to work correctly + +* Mon Dec 4 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-16 +- Fixed the problem where the server would crash upon shutdown in dblayer +- due to a race condition among the database housekeeping threads +- Fix a problem with normalized absolute paths for db directories + +* Tue Nov 28 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-15 +- Touch all of the ldap/admin/src/scripts/*.in files so that they +- will be newer than their corresponding script template files, so +- that make will rebuild them. + +* Mon Nov 27 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-14 +- Chown new schema files when copying during instance creation + +* Tue Nov 21 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-13 +- Configure will get ldapsdk_bindir from pkg-config, or $libdir/mozldap6 + +* Tue Nov 21 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-12 +- use eval to sed ./configure into ../configure + +* Tue Nov 21 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-11 +- jump through hoops to be able to run ../configure + +* Tue Nov 21 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-10 +- Need to make built dir in setup section + +* Tue Nov 21 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-9 +- The template scripts needed to use @libdir@ instead of hardcoding +- /usr/lib +- Use make DESTDIR=$RPM_BUILD_ROOT install instead of % makeinstall +- do the actual build in a "built" subdirectory, until we remove +- the old script templates + +* Thu Nov 16 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-8 +- Make replication plugin link with libdb + +* Wed Nov 15 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-7 +- Have make define LIBDIR, BINDIR, etc. for C code to use +- especially for create_instance.h + +* Tue Nov 14 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-6 +- Forgot to checkin new config.h.in for AC_CONFIG_HEADERS + +* Tue Nov 14 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-5 +- Add perldap as a Requires; update sources + +* Thu Nov 9 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-4 +- Fix ds_newinst.pl +- Remove obsolete #defines + +* Thu Nov 9 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-3 +- Update sources; rebuild to populate brew yum repo with dirsec-nss + +* Tue Nov 7 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-2 +- Update sources + +* Thu Nov 2 2006 Rich Megginson <rmeggins(a)redhat.com> - 1.0.99-1 +- initial revision diff --git a/rpm/rpmverrel.sh b/rpm/rpmverrel.sh new file mode 100755 index 0000000..86b808e --- /dev/null +++ b/rpm/rpmverrel.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Set srcdir so VERSION.sh is able to +# determine the last git commit hash. +srcdir=`pwd` + +# Source VERSION.sh to set the version +# and release environment variables. +source ./VERSION.sh + +if [ "$1" = "version" ]; then + echo $RPM_VERSION +elif [ "$1" = "release" ]; then + echo $RPM_RELEASE +fi

1 0

Branch '389-ds-base-1.3.1' - ldap/servers
by Noriko Hosoi 10 Dec '13

10 Dec '13

ldap/servers/slapd/back-ldbm/seq.c | 1 + 1 file changed, 1 insertion(+) New commits: commit 08dc37dc832e1ce78d27012a60b1691dba2f6501 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Mon Nov 25 09:36:25 2013 -0500 Ticket 47599 - fix memory leak Coverity 12410 https://fedorahosted.org/389/ticket/47599 Reviewed by: richm(Thanks!) (cherry picked from commit a16bf1b3c4ff0412c2481baace9b427750c11f8c) (cherry picked from commit c7e7c68ea4779601ec4896b1d90f3b6d347f047f) diff --git a/ldap/servers/slapd/back-ldbm/seq.c b/ldap/servers/slapd/back-ldbm/seq.c index 27da2a4..10484fd 100644 --- a/ldap/servers/slapd/back-ldbm/seq.c +++ b/ldap/servers/slapd/back-ldbm/seq.c @@ -242,6 +242,7 @@ ldbm_back_seq( Slapi_PBlock *pb ) key.flags = 0; for (retry_count = 0; retry_count < IDL_FETCH_RETRY_COUNT; retry_count++) { err = NEW_IDL_DEFAULT; + idl_free(idl); idl = idl_fetch( be, db, &key, txn.back_txn_txn, ai, &err ); if(err == DB_LOCK_DEADLOCK) { ldbm_nasty("ldbm_back_seq deadlock retry", 1600, err);

1 0

Branch '389-ds-base-1.3.2' - ldap/servers
by Richard Allen Megginson 10 Dec '13

10 Dec '13

ldap/servers/slapd/pagedresults.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 5d3ae5f709964cd7dfb73b631a22389223f5ef25 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Tue Dec 10 08:08:35 2013 -0700 Ticket #47623 fix memleak caused by 47347 https://fedorahosted.org/389/ticket/47623 Reviewed by: tbordaz, nhosoi (Thanks!) Branch: 389-ds-base-1.3.2 Fix Description: Create the mutex if it doesn't exist. Platforms tested: RHEL6 x86_64 Flag Day: no Doc impact: no (cherry picked from commit 0d4849dd7551347f0e24ac1027f4d0501084dcf3) diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c index a835d6b..9af5773 100644 --- a/ldap/servers/slapd/pagedresults.c +++ b/ldap/servers/slapd/pagedresults.c @@ -122,7 +122,6 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, sizeof(PagedResults) * maxlen); } *index = maxlen; /* the first position in the new area */ - conn->c_pagedresults.prl_list[*index].pr_mutex = PR_NewLock(); } else { for (i = 0; i < conn->c_pagedresults.prl_maxlen; i++) { if (!conn->c_pagedresults.prl_list[i].pr_current_be) { @@ -131,6 +130,9 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, } } } + if (!conn->c_pagedresults.prl_list[*index].pr_mutex) { + conn->c_pagedresults.prl_list[*index].pr_mutex = PR_NewLock(); + } conn->c_pagedresults.prl_count++; } else { /* Repeated paged results request.

1 0

ldap/servers
by Richard Allen Megginson 10 Dec '13

10 Dec '13

ldap/servers/slapd/pagedresults.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 0d4849dd7551347f0e24ac1027f4d0501084dcf3 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Tue Dec 10 08:08:35 2013 -0700 Ticket #47623 fix memleak caused by 47347 https://fedorahosted.org/389/ticket/47623 Reviewed by: tbordaz, nhosoi (Thanks!) Branch: master Fix Description: Create the mutex if it doesn't exist. Platforms tested: RHEL6 x86_64 Flag Day: no Doc impact: no diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c index a835d6b..9af5773 100644 --- a/ldap/servers/slapd/pagedresults.c +++ b/ldap/servers/slapd/pagedresults.c @@ -122,7 +122,6 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, sizeof(PagedResults) * maxlen); } *index = maxlen; /* the first position in the new area */ - conn->c_pagedresults.prl_list[*index].pr_mutex = PR_NewLock(); } else { for (i = 0; i < conn->c_pagedresults.prl_maxlen; i++) { if (!conn->c_pagedresults.prl_list[i].pr_current_be) { @@ -131,6 +130,9 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, } } } + if (!conn->c_pagedresults.prl_list[*index].pr_mutex) { + conn->c_pagedresults.prl_list[*index].pr_mutex = PR_NewLock(); + } conn->c_pagedresults.prl_count++; } else { /* Repeated paged results request.

1 0

Branch '389-ds-base-1.2.11' - ldap/servers
by Richard Allen Megginson 10 Dec '13

10 Dec '13

ldap/servers/slapd/pagedresults.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 1eb281a8a1c5d6c1a22c198a23a8ba7b65991d77 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Tue Dec 10 08:08:35 2013 -0700 Ticket #47623 fix memleak caused by 47347 https://fedorahosted.org/389/ticket/47623 Reviewed by: tbordaz, nhosoi (Thanks!) Branch: 389-ds-base-1.2.11 Fix Description: Create the mutex if it doesn't exist. Platforms tested: RHEL6 x86_64 Flag Day: no Doc impact: no (cherry picked from commit 0d4849dd7551347f0e24ac1027f4d0501084dcf3) (cherry picked from commit 5d3ae5f709964cd7dfb73b631a22389223f5ef25) (cherry picked from commit 5c649ddacd1d2c11b6e922b29472094b780c2a0e) (cherry picked from commit 75ed4b36722eeff8dc2d6aad0cf5e32dc474c3a7) diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c index a835d6b..9af5773 100644 --- a/ldap/servers/slapd/pagedresults.c +++ b/ldap/servers/slapd/pagedresults.c @@ -122,7 +122,6 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, sizeof(PagedResults) * maxlen); } *index = maxlen; /* the first position in the new area */ - conn->c_pagedresults.prl_list[*index].pr_mutex = PR_NewLock(); } else { for (i = 0; i < conn->c_pagedresults.prl_maxlen; i++) { if (!conn->c_pagedresults.prl_list[i].pr_current_be) { @@ -131,6 +130,9 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, } } } + if (!conn->c_pagedresults.prl_list[*index].pr_mutex) { + conn->c_pagedresults.prl_list[*index].pr_mutex = PR_NewLock(); + } conn->c_pagedresults.prl_count++; } else { /* Repeated paged results request.

1 0

Branch '389-ds-base-1.3.0' - ldap/servers
by Richard Allen Megginson 10 Dec '13

10 Dec '13

ldap/servers/slapd/pagedresults.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 75ed4b36722eeff8dc2d6aad0cf5e32dc474c3a7 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Tue Dec 10 08:08:35 2013 -0700 Ticket #47623 fix memleak caused by 47347 https://fedorahosted.org/389/ticket/47623 Reviewed by: tbordaz, nhosoi (Thanks!) Branch: 389-ds-base-1.3.0 Fix Description: Create the mutex if it doesn't exist. Platforms tested: RHEL6 x86_64 Flag Day: no Doc impact: no (cherry picked from commit 0d4849dd7551347f0e24ac1027f4d0501084dcf3) (cherry picked from commit 5d3ae5f709964cd7dfb73b631a22389223f5ef25) (cherry picked from commit 5c649ddacd1d2c11b6e922b29472094b780c2a0e) diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c index a835d6b..9af5773 100644 --- a/ldap/servers/slapd/pagedresults.c +++ b/ldap/servers/slapd/pagedresults.c @@ -122,7 +122,6 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, sizeof(PagedResults) * maxlen); } *index = maxlen; /* the first position in the new area */ - conn->c_pagedresults.prl_list[*index].pr_mutex = PR_NewLock(); } else { for (i = 0; i < conn->c_pagedresults.prl_maxlen; i++) { if (!conn->c_pagedresults.prl_list[i].pr_current_be) { @@ -131,6 +130,9 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, } } } + if (!conn->c_pagedresults.prl_list[*index].pr_mutex) { + conn->c_pagedresults.prl_list[*index].pr_mutex = PR_NewLock(); + } conn->c_pagedresults.prl_count++; } else { /* Repeated paged results request.

1 0

Branch '389-ds-base-1.3.1' - ldap/servers
by Richard Allen Megginson 10 Dec '13

10 Dec '13

ldap/servers/slapd/pagedresults.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 5c649ddacd1d2c11b6e922b29472094b780c2a0e Author: Rich Megginson <rmeggins(a)redhat.com> Date: Tue Dec 10 08:08:35 2013 -0700 Ticket #47623 fix memleak caused by 47347 https://fedorahosted.org/389/ticket/47623 Reviewed by: tbordaz, nhosoi (Thanks!) Branch: 389-ds-base-1.3.1 Fix Description: Create the mutex if it doesn't exist. Platforms tested: RHEL6 x86_64 Flag Day: no Doc impact: no (cherry picked from commit 0d4849dd7551347f0e24ac1027f4d0501084dcf3) (cherry picked from commit 5d3ae5f709964cd7dfb73b631a22389223f5ef25) diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c index a835d6b..9af5773 100644 --- a/ldap/servers/slapd/pagedresults.c +++ b/ldap/servers/slapd/pagedresults.c @@ -122,7 +122,6 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, sizeof(PagedResults) * maxlen); } *index = maxlen; /* the first position in the new area */ - conn->c_pagedresults.prl_list[*index].pr_mutex = PR_NewLock(); } else { for (i = 0; i < conn->c_pagedresults.prl_maxlen; i++) { if (!conn->c_pagedresults.prl_list[i].pr_current_be) { @@ -131,6 +130,9 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, } } } + if (!conn->c_pagedresults.prl_list[*index].pr_mutex) { + conn->c_pagedresults.prl_list[*index].pr_mutex = PR_NewLock(); + } conn->c_pagedresults.prl_count++; } else { /* Repeated paged results request.

1 0

Branch '389-ds-base-1.3.1' - ldap/servers
by Mark Reynolds 10 Dec '13

10 Dec '13

ldap/servers/plugins/automember/automember.c | 151 +++++++++++++++++++++------ ldap/servers/slapd/back-ldbm/ldbm_add.c | 4 ldap/servers/slapd/back-ldbm/ldbm_delete.c | 5 ldap/servers/slapd/back-ldbm/ldbm_modify.c | 2 ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 3 ldap/servers/slapd/plugin.c | 3 6 files changed, 137 insertions(+), 31 deletions(-) New commits: commit 6de4616f2506b4e093429cc1093e4ad21b22e6c9 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Mon Dec 9 16:57:35 2013 -0500 Ticket 47622 - Automember betxnpreoperation - transaction not aborted when group entry does not exist Bug Description: If the group defined in the automember plugin does not exist, than any add operation that should trigger an update, succeeds even though the automember update failed. Fix Description: Return an error if a automember post operation update fails - previously we always returned success. Updated plugin_call_func() to check the result of betxn postop plugins. Also added return text to the result message when a betxn plugin fails. This is useful for clients to explain why the operation failed. https://fedorahosted.org/389/ticket/47622 Jenkins: passed Valgrind: passed Coverity: passed Reviewed by: rmeggins(Thanks!) (cherry picked from commit 1214168a222a35627b2bb9964600fad0246558cd) diff --git a/ldap/servers/plugins/automember/automember.c b/ldap/servers/plugins/automember/automember.c index 4856681..a32e6b9 100644 --- a/ldap/servers/plugins/automember/automember.c +++ b/ldap/servers/plugins/automember/automember.c @@ -103,8 +103,8 @@ static struct automemberRegexRule *automember_parse_regex_rule(char *rule_string static void automember_free_regex_rule(struct automemberRegexRule *rule); static int automember_parse_grouping_attr(char *value, char **grouping_attr, char **grouping_value); -static void automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileDesc *ldif_fd); -static void automember_add_member_value(Slapi_Entry *member_e, const char *group_dn, +static int automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileDesc *ldif_fd); +static int automember_add_member_value(Slapi_Entry *member_e, const char *group_dn, char *grouping_attr, char *grouping_value, PRFileDesc *ldif_fd); const char *fetch_attr(Slapi_Entry *e, const char *attrname, const char *default_val); @@ -1401,7 +1401,7 @@ automember_parse_grouping_attr(char *value, char **grouping_attr, char **groupin * Determines which target groups need to be updated according to * the rules in config, then performs the updates. */ -static void +static int automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileDesc *ldif_fd) { PRCList *rule = NULL; @@ -1412,10 +1412,11 @@ automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileD Slapi_DN *last = NULL; PRCList *curr_exclusion = NULL; char **vals = NULL; + int rc = 0; int i = 0; if (!config || !e) { - return; + return -1; } slapi_log_error(SLAPI_LOG_PLUGIN, AUTOMEMBER_PLUGIN_SUBSYSTEM, @@ -1555,15 +1556,23 @@ automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileD if (PR_CLIST_IS_EMPTY(&targets)) { /* Add to each default group. */ for (i = 0; config->default_groups && config->default_groups[i]; i++) { - automember_add_member_value(e, config->default_groups[i], - config->grouping_attr, config->grouping_value, ldif_fd); + if(automember_add_member_value(e, config->default_groups[i], config->grouping_attr, + config->grouping_value, ldif_fd)) + { + rc = SLAPI_PLUGIN_FAILURE; + goto out; + } } } else { /* Update the target groups. */ dnitem = (struct automemberDNListItem *)PR_LIST_HEAD(&targets); while ((PRCList *)dnitem != &targets) { - automember_add_member_value(e, slapi_sdn_get_dn(dnitem->dn), - config->grouping_attr, config->grouping_value, ldif_fd); + if(automember_add_member_value(e, slapi_sdn_get_dn(dnitem->dn),config->grouping_attr, + config->grouping_value, ldif_fd)) + { + rc = SLAPI_PLUGIN_FAILURE; + goto out; + } dnitem = (struct automemberDNListItem *)PR_NEXT_LINK((PRCList *)dnitem); } } @@ -1582,6 +1591,9 @@ automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileD slapi_ch_free((void**)&dnitem); } +out: + + return rc; } /* @@ -1589,7 +1601,7 @@ automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileD * * Adds a member entry to a group. */ -static void +static int automember_add_member_value(Slapi_Entry *member_e, const char *group_dn, char *grouping_attr, char *grouping_value, PRFileDesc *ldif_fd) { @@ -1600,6 +1612,7 @@ automember_add_member_value(Slapi_Entry *member_e, const char *group_dn, char *g char *vals[2]; char *member_value = NULL; int freeit = 0; + int rc = 0; /* If grouping_value is dn, we need to fetch the dn instead. */ if (slapi_attr_type_cmp(grouping_value, "dn", SLAPI_TYPE_CMP_EXACT) == 0) { @@ -1649,6 +1662,7 @@ automember_add_member_value(Slapi_Entry *member_e, const char *group_dn, char *g "a \"%s\" value to group \"%s\" (%s).\n", member_value, grouping_attr, group_dn, ldap_err2string(result)); + rc = result; } } else { slapi_log_error(SLAPI_LOG_FATAL, AUTOMEMBER_PLUGIN_SUBSYSTEM, @@ -1662,8 +1676,9 @@ out: if (freeit) { slapi_ch_free_string(&member_value); } - slapi_pblock_destroy(mod_pb); + + return rc; } @@ -1833,6 +1848,7 @@ automember_add_post_op(Slapi_PBlock *pb) Slapi_DN *sdn = NULL; struct configEntry *config = NULL; PRCList *list = NULL; + int rc = SLAPI_PLUGIN_SUCCESS; slapi_log_error(SLAPI_LOG_TRACE, AUTOMEMBER_PLUGIN_SUBSYSTEM, "--> automember_add_post_op\n"); @@ -1848,8 +1864,9 @@ automember_add_post_op(Slapi_PBlock *pb) } } else { slapi_log_error(SLAPI_LOG_PLUGIN, AUTOMEMBER_PLUGIN_SUBSYSTEM, - "automember_add_post_op: Error " - "retrieving dn\n"); + "automember_add_post_op: Error retrieving dn\n"); + + rc = SLAPI_PLUGIN_FAILURE; goto bail; } @@ -1863,12 +1880,11 @@ automember_add_post_op(Slapi_PBlock *pb) if (e) { /* If the entry is a tombstone, just bail. */ - Slapi_Value *tombstone = - slapi_value_new_string(SLAPI_ATTR_VALUE_TOMBSTONE); - int rc = slapi_entry_attr_has_syntax_value(e, SLAPI_ATTR_OBJECTCLASS, - tombstone); + Slapi_Value *tombstone = slapi_value_new_string(SLAPI_ATTR_VALUE_TOMBSTONE); + int is_tombstone = slapi_entry_attr_has_syntax_value(e, SLAPI_ATTR_OBJECTCLASS, + tombstone); slapi_value_free(&tombstone); - if (rc) { + if (is_tombstone) { return SLAPI_PLUGIN_SUCCESS; } @@ -1891,7 +1907,10 @@ automember_add_post_op(Slapi_PBlock *pb) if (slapi_dn_issuffix(slapi_sdn_get_dn(sdn), config->scope) && (slapi_filter_test_simple(e, config->filter) == 0)) { /* Find out what membership changes are needed and make them. */ - automember_update_membership(config, e, NULL); + if(automember_update_membership(config, e, NULL)){ + rc = SLAPI_PLUGIN_FAILURE; + break; + } } list = PR_NEXT_LINK(list); @@ -1904,11 +1923,21 @@ automember_add_post_op(Slapi_PBlock *pb) "automember_add_post_op: Error " "retrieving post-op entry %s\n", slapi_sdn_get_dn(sdn)); } + bail: slapi_log_error(SLAPI_LOG_TRACE, AUTOMEMBER_PLUGIN_SUBSYSTEM, - "<-- automember_add_post_op\n"); + "<-- automember_add_post_op (%d)\n", rc); - return SLAPI_PLUGIN_SUCCESS; + if(rc){ + char errtxt[SLAPI_DSE_RETURNTEXT_SIZE]; + int result = LDAP_UNWILLING_TO_PERFORM; + + PR_snprintf(errtxt, SLAPI_DSE_RETURNTEXT_SIZE, "Automember Plugin update unexpectedly failed.\n"); + slapi_pblock_set(pb, SLAPI_RESULT_CODE, &result); + slapi_pblock_set(pb, SLAPI_PB_RESULT_TEXT, &errtxt); + } + + return rc; } /* @@ -2216,7 +2245,11 @@ void automember_rebuild_task_thread(void *arg){ if (slapi_dn_issuffix(slapi_entry_get_dn(entries[i]), config->scope) && (slapi_filter_test_simple(entries[i], config->filter) == 0)) { - automember_update_membership(config, entries[i], NULL); + if(automember_update_membership(config, entries[i], NULL)){ + result = SLAPI_PLUGIN_FAILURE; + automember_config_unlock(); + goto out; + } } list = PR_NEXT_LINK(list); } @@ -2417,7 +2450,7 @@ void automember_export_task_thread(void *arg){ /* make sure the plugin is still up, as this loop could run for awhile */ if (!g_plugin_started) { automember_config_unlock(); - result = -1; + result = SLAPI_DSE_CALLBACK_ERROR; goto out; } if (!PR_CLIST_IS_EMPTY(g_automember_config)) { @@ -2427,7 +2460,11 @@ void automember_export_task_thread(void *arg){ if (slapi_dn_issuffix(slapi_sdn_get_dn(td->base_dn), config->scope) && (slapi_filter_test_simple(entries[i], config->filter) == 0)) { - automember_update_membership(config, entries[i], ldif_fd); + if(automember_update_membership(config, entries[i], ldif_fd)){ + result = SLAPI_DSE_CALLBACK_ERROR; + automember_config_unlock(); + goto out; + } } list = PR_NEXT_LINK(list); } @@ -2627,7 +2664,13 @@ void automember_map_task_thread(void *arg){ if (slapi_dn_issuffix(slapi_entry_get_dn_const(e), config->scope) && (slapi_filter_test_simple(e, config->filter) == 0)) { - automember_update_membership(config, e, ldif_fd_out); + if(automember_update_membership(config, e, ldif_fd_out)){ + result = SLAPI_DSE_CALLBACK_ERROR; + slapi_entry_free(e); + slapi_ch_free_string(&entrystr); + automember_config_unlock(); + goto out; + } } list = PR_NEXT_LINK(list); } @@ -2638,7 +2681,7 @@ void automember_map_task_thread(void *arg){ slapi_task_log_notice(task, "Automember map task, skipping invalid entry."); slapi_task_log_status(task, "Automember map task, skipping invalid entry."); } - slapi_ch_free((void **)&entrystr); + slapi_ch_free_string(&entrystr); } automember_config_unlock(); @@ -2669,6 +2712,9 @@ automember_modrdn_post_op(Slapi_PBlock *pb) Slapi_DN *old_sdn = NULL; Slapi_DN *new_sdn = NULL; Slapi_Entry *post_e = NULL; + struct configEntry *config = NULL; + PRCList *list = NULL; + int rc = SLAPI_PLUGIN_SUCCESS; slapi_log_error(SLAPI_LOG_TRACE, AUTOMEMBER_PLUGIN_SUBSYSTEM, "--> automember_modrdn_post_op\n"); @@ -2687,7 +2733,7 @@ automember_modrdn_post_op(Slapi_PBlock *pb) slapi_log_error(SLAPI_LOG_PLUGIN, AUTOMEMBER_PLUGIN_SUBSYSTEM, "automember_modrdn_post_op: Error " "retrieving post-op entry\n"); - return 0; + return SLAPI_PLUGIN_FAILURE; } if ((old_sdn = automember_get_sdn(pb))) { @@ -2697,11 +2743,58 @@ automember_modrdn_post_op(Slapi_PBlock *pb) slapi_log_error(SLAPI_LOG_PLUGIN, AUTOMEMBER_PLUGIN_SUBSYSTEM, "automember_modrdn_post_op: Error " "retrieving dn\n"); + return SLAPI_PLUGIN_FAILURE; } - slapi_log_error(SLAPI_LOG_TRACE, AUTOMEMBER_PLUGIN_SUBSYSTEM, - "<-- automember_modrdn_post_op\n"); + /* If replication, just bail. */ + if (automember_isrepl(pb)) { + return SLAPI_PLUGIN_SUCCESS; + } - return 0; + /* + * Check if a config entry applies to the entry(post modrdn) + */ + automember_config_read_lock(); + + /* Bail out if the plug-in close function was just called. */ + if (!g_plugin_started) { + automember_config_unlock(); + return SLAPI_PLUGIN_SUCCESS; + } + + if (!PR_CLIST_IS_EMPTY(g_automember_config)) { + list = PR_LIST_HEAD(g_automember_config); + while (list != g_automember_config) { + config = (struct configEntry *)list; + + /* Does the entry meet scope and filter requirements? */ + if (slapi_dn_issuffix(slapi_sdn_get_dn(new_sdn), config->scope) && + (slapi_filter_test_simple(post_e, config->filter) == 0)) { + /* Find out what membership changes are needed and make them. */ + if(automember_update_membership(config, post_e, NULL)){ + rc = SLAPI_PLUGIN_FAILURE; + break; + } + } + + list = PR_NEXT_LINK(list); + } + } + + automember_config_unlock(); + + if(rc){ + char errtxt[SLAPI_DSE_RETURNTEXT_SIZE]; + int result = LDAP_UNWILLING_TO_PERFORM; + + PR_snprintf(errtxt, SLAPI_DSE_RETURNTEXT_SIZE, "Automember Plugin update unexpectedly failed. " + "Please see the server errors log for more information.\n"); + slapi_pblock_set(pb, SLAPI_RESULT_CODE, &result); + slapi_pblock_set(pb, SLAPI_PB_RESULT_TEXT, &errtxt); + } + + slapi_log_error(SLAPI_LOG_TRACE, AUTOMEMBER_PLUGIN_SUBSYSTEM, + "<-- automember_modrdn_post_op (%d)\n", rc); + return rc; } diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c b/ldap/servers/slapd/back-ldbm/ldbm_add.c index fa1e9bc..e5b9eeb 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_add.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c @@ -357,7 +357,7 @@ ldbm_back_add( Slapi_PBlock *pb ) /* make sure opreturn is set for the postop plugins */ slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &rc); } - + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } /* @@ -795,6 +795,7 @@ ldbm_back_add( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } @@ -1046,6 +1047,7 @@ ldbm_back_add( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c index 6725123..367ab99 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c @@ -325,6 +325,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set( pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &rc ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } /* the flag could be set in a preop plugin (e.g., USN) */ @@ -354,6 +355,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) ldap_result_code ? &ldap_result_code : &retval ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } @@ -603,6 +605,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) ldap_result_code ? &ldap_result_code : &retval ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } } @@ -633,6 +636,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) &ldap_result_code : &rc ); } /* retval is -1 */ + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } slapi_pblock_set( pb, SLAPI_DELETE_BEPREOP_ENTRY, orig_entry ); @@ -1105,6 +1109,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set( pb, SLAPI_PLUGIN_OPRETURN, &retval ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c index b5bdb41..f3b099d 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c @@ -582,6 +582,7 @@ ldbm_back_modify( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } @@ -752,6 +753,7 @@ ldbm_back_modify( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c index 4908751..1162fdb 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c @@ -466,6 +466,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set( pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &rc ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } /* @@ -890,6 +891,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set( pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } @@ -1130,6 +1132,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set( pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } diff --git a/ldap/servers/slapd/plugin.c b/ldap/servers/slapd/plugin.c index 5f66ab2..1ca4dc5 100644 --- a/ldap/servers/slapd/plugin.c +++ b/ldap/servers/slapd/plugin.c @@ -1467,7 +1467,8 @@ plugin_call_func (struct slapdplugin *list, int operation, Slapi_PBlock *pb, int } else if (SLAPI_PLUGIN_BEPREOPERATION == list->plg_type || SLAPI_PLUGIN_BETXNPREOPERATION == list->plg_type || - SLAPI_PLUGIN_BEPOSTOPERATION == list->plg_type) + SLAPI_PLUGIN_BEPOSTOPERATION == list->plg_type || + SLAPI_PLUGIN_BETXNPOSTOPERATION == list->plg_type ) { /* * respect fatal error SLAPI_PLUGIN_FAILURE (-1);

1 0

Branch '389-ds-base-1.3.2' - ldap/servers
by Mark Reynolds 10 Dec '13

10 Dec '13

ldap/servers/plugins/automember/automember.c | 151 +++++++++++++++++++++------ ldap/servers/slapd/back-ldbm/ldbm_add.c | 4 ldap/servers/slapd/back-ldbm/ldbm_delete.c | 5 ldap/servers/slapd/back-ldbm/ldbm_modify.c | 2 ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 3 ldap/servers/slapd/plugin.c | 3 6 files changed, 137 insertions(+), 31 deletions(-) New commits: commit 1214168a222a35627b2bb9964600fad0246558cd Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Mon Dec 9 16:57:35 2013 -0500 Ticket 47622 - Automember betxnpreoperation - transaction not aborted when group entry does not exist Bug Description: If the group defined in the automember plugin does not exist, than any add operation that should trigger an update, succeeds even though the automember update failed. Fix Description: Return an error if a automember post operation update fails - previously we always returned success. Updated plugin_call_func() to check the result of betxn postop plugins. Also added return text to the result message when a betxn plugin fails. This is useful for clients to explain why the operation failed. https://fedorahosted.org/389/ticket/47622 Jenkins: passed Valgrind: passed Coverity: passed Reviewed by: rmeggins(Thanks!) diff --git a/ldap/servers/plugins/automember/automember.c b/ldap/servers/plugins/automember/automember.c index 4856681..a32e6b9 100644 --- a/ldap/servers/plugins/automember/automember.c +++ b/ldap/servers/plugins/automember/automember.c @@ -103,8 +103,8 @@ static struct automemberRegexRule *automember_parse_regex_rule(char *rule_string static void automember_free_regex_rule(struct automemberRegexRule *rule); static int automember_parse_grouping_attr(char *value, char **grouping_attr, char **grouping_value); -static void automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileDesc *ldif_fd); -static void automember_add_member_value(Slapi_Entry *member_e, const char *group_dn, +static int automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileDesc *ldif_fd); +static int automember_add_member_value(Slapi_Entry *member_e, const char *group_dn, char *grouping_attr, char *grouping_value, PRFileDesc *ldif_fd); const char *fetch_attr(Slapi_Entry *e, const char *attrname, const char *default_val); @@ -1401,7 +1401,7 @@ automember_parse_grouping_attr(char *value, char **grouping_attr, char **groupin * Determines which target groups need to be updated according to * the rules in config, then performs the updates. */ -static void +static int automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileDesc *ldif_fd) { PRCList *rule = NULL; @@ -1412,10 +1412,11 @@ automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileD Slapi_DN *last = NULL; PRCList *curr_exclusion = NULL; char **vals = NULL; + int rc = 0; int i = 0; if (!config || !e) { - return; + return -1; } slapi_log_error(SLAPI_LOG_PLUGIN, AUTOMEMBER_PLUGIN_SUBSYSTEM, @@ -1555,15 +1556,23 @@ automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileD if (PR_CLIST_IS_EMPTY(&targets)) { /* Add to each default group. */ for (i = 0; config->default_groups && config->default_groups[i]; i++) { - automember_add_member_value(e, config->default_groups[i], - config->grouping_attr, config->grouping_value, ldif_fd); + if(automember_add_member_value(e, config->default_groups[i], config->grouping_attr, + config->grouping_value, ldif_fd)) + { + rc = SLAPI_PLUGIN_FAILURE; + goto out; + } } } else { /* Update the target groups. */ dnitem = (struct automemberDNListItem *)PR_LIST_HEAD(&targets); while ((PRCList *)dnitem != &targets) { - automember_add_member_value(e, slapi_sdn_get_dn(dnitem->dn), - config->grouping_attr, config->grouping_value, ldif_fd); + if(automember_add_member_value(e, slapi_sdn_get_dn(dnitem->dn),config->grouping_attr, + config->grouping_value, ldif_fd)) + { + rc = SLAPI_PLUGIN_FAILURE; + goto out; + } dnitem = (struct automemberDNListItem *)PR_NEXT_LINK((PRCList *)dnitem); } } @@ -1582,6 +1591,9 @@ automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileD slapi_ch_free((void**)&dnitem); } +out: + + return rc; } /* @@ -1589,7 +1601,7 @@ automember_update_membership(struct configEntry *config, Slapi_Entry *e, PRFileD * * Adds a member entry to a group. */ -static void +static int automember_add_member_value(Slapi_Entry *member_e, const char *group_dn, char *grouping_attr, char *grouping_value, PRFileDesc *ldif_fd) { @@ -1600,6 +1612,7 @@ automember_add_member_value(Slapi_Entry *member_e, const char *group_dn, char *g char *vals[2]; char *member_value = NULL; int freeit = 0; + int rc = 0; /* If grouping_value is dn, we need to fetch the dn instead. */ if (slapi_attr_type_cmp(grouping_value, "dn", SLAPI_TYPE_CMP_EXACT) == 0) { @@ -1649,6 +1662,7 @@ automember_add_member_value(Slapi_Entry *member_e, const char *group_dn, char *g "a \"%s\" value to group \"%s\" (%s).\n", member_value, grouping_attr, group_dn, ldap_err2string(result)); + rc = result; } } else { slapi_log_error(SLAPI_LOG_FATAL, AUTOMEMBER_PLUGIN_SUBSYSTEM, @@ -1662,8 +1676,9 @@ out: if (freeit) { slapi_ch_free_string(&member_value); } - slapi_pblock_destroy(mod_pb); + + return rc; } @@ -1833,6 +1848,7 @@ automember_add_post_op(Slapi_PBlock *pb) Slapi_DN *sdn = NULL; struct configEntry *config = NULL; PRCList *list = NULL; + int rc = SLAPI_PLUGIN_SUCCESS; slapi_log_error(SLAPI_LOG_TRACE, AUTOMEMBER_PLUGIN_SUBSYSTEM, "--> automember_add_post_op\n"); @@ -1848,8 +1864,9 @@ automember_add_post_op(Slapi_PBlock *pb) } } else { slapi_log_error(SLAPI_LOG_PLUGIN, AUTOMEMBER_PLUGIN_SUBSYSTEM, - "automember_add_post_op: Error " - "retrieving dn\n"); + "automember_add_post_op: Error retrieving dn\n"); + + rc = SLAPI_PLUGIN_FAILURE; goto bail; } @@ -1863,12 +1880,11 @@ automember_add_post_op(Slapi_PBlock *pb) if (e) { /* If the entry is a tombstone, just bail. */ - Slapi_Value *tombstone = - slapi_value_new_string(SLAPI_ATTR_VALUE_TOMBSTONE); - int rc = slapi_entry_attr_has_syntax_value(e, SLAPI_ATTR_OBJECTCLASS, - tombstone); + Slapi_Value *tombstone = slapi_value_new_string(SLAPI_ATTR_VALUE_TOMBSTONE); + int is_tombstone = slapi_entry_attr_has_syntax_value(e, SLAPI_ATTR_OBJECTCLASS, + tombstone); slapi_value_free(&tombstone); - if (rc) { + if (is_tombstone) { return SLAPI_PLUGIN_SUCCESS; } @@ -1891,7 +1907,10 @@ automember_add_post_op(Slapi_PBlock *pb) if (slapi_dn_issuffix(slapi_sdn_get_dn(sdn), config->scope) && (slapi_filter_test_simple(e, config->filter) == 0)) { /* Find out what membership changes are needed and make them. */ - automember_update_membership(config, e, NULL); + if(automember_update_membership(config, e, NULL)){ + rc = SLAPI_PLUGIN_FAILURE; + break; + } } list = PR_NEXT_LINK(list); @@ -1904,11 +1923,21 @@ automember_add_post_op(Slapi_PBlock *pb) "automember_add_post_op: Error " "retrieving post-op entry %s\n", slapi_sdn_get_dn(sdn)); } + bail: slapi_log_error(SLAPI_LOG_TRACE, AUTOMEMBER_PLUGIN_SUBSYSTEM, - "<-- automember_add_post_op\n"); + "<-- automember_add_post_op (%d)\n", rc); - return SLAPI_PLUGIN_SUCCESS; + if(rc){ + char errtxt[SLAPI_DSE_RETURNTEXT_SIZE]; + int result = LDAP_UNWILLING_TO_PERFORM; + + PR_snprintf(errtxt, SLAPI_DSE_RETURNTEXT_SIZE, "Automember Plugin update unexpectedly failed.\n"); + slapi_pblock_set(pb, SLAPI_RESULT_CODE, &result); + slapi_pblock_set(pb, SLAPI_PB_RESULT_TEXT, &errtxt); + } + + return rc; } /* @@ -2216,7 +2245,11 @@ void automember_rebuild_task_thread(void *arg){ if (slapi_dn_issuffix(slapi_entry_get_dn(entries[i]), config->scope) && (slapi_filter_test_simple(entries[i], config->filter) == 0)) { - automember_update_membership(config, entries[i], NULL); + if(automember_update_membership(config, entries[i], NULL)){ + result = SLAPI_PLUGIN_FAILURE; + automember_config_unlock(); + goto out; + } } list = PR_NEXT_LINK(list); } @@ -2417,7 +2450,7 @@ void automember_export_task_thread(void *arg){ /* make sure the plugin is still up, as this loop could run for awhile */ if (!g_plugin_started) { automember_config_unlock(); - result = -1; + result = SLAPI_DSE_CALLBACK_ERROR; goto out; } if (!PR_CLIST_IS_EMPTY(g_automember_config)) { @@ -2427,7 +2460,11 @@ void automember_export_task_thread(void *arg){ if (slapi_dn_issuffix(slapi_sdn_get_dn(td->base_dn), config->scope) && (slapi_filter_test_simple(entries[i], config->filter) == 0)) { - automember_update_membership(config, entries[i], ldif_fd); + if(automember_update_membership(config, entries[i], ldif_fd)){ + result = SLAPI_DSE_CALLBACK_ERROR; + automember_config_unlock(); + goto out; + } } list = PR_NEXT_LINK(list); } @@ -2627,7 +2664,13 @@ void automember_map_task_thread(void *arg){ if (slapi_dn_issuffix(slapi_entry_get_dn_const(e), config->scope) && (slapi_filter_test_simple(e, config->filter) == 0)) { - automember_update_membership(config, e, ldif_fd_out); + if(automember_update_membership(config, e, ldif_fd_out)){ + result = SLAPI_DSE_CALLBACK_ERROR; + slapi_entry_free(e); + slapi_ch_free_string(&entrystr); + automember_config_unlock(); + goto out; + } } list = PR_NEXT_LINK(list); } @@ -2638,7 +2681,7 @@ void automember_map_task_thread(void *arg){ slapi_task_log_notice(task, "Automember map task, skipping invalid entry."); slapi_task_log_status(task, "Automember map task, skipping invalid entry."); } - slapi_ch_free((void **)&entrystr); + slapi_ch_free_string(&entrystr); } automember_config_unlock(); @@ -2669,6 +2712,9 @@ automember_modrdn_post_op(Slapi_PBlock *pb) Slapi_DN *old_sdn = NULL; Slapi_DN *new_sdn = NULL; Slapi_Entry *post_e = NULL; + struct configEntry *config = NULL; + PRCList *list = NULL; + int rc = SLAPI_PLUGIN_SUCCESS; slapi_log_error(SLAPI_LOG_TRACE, AUTOMEMBER_PLUGIN_SUBSYSTEM, "--> automember_modrdn_post_op\n"); @@ -2687,7 +2733,7 @@ automember_modrdn_post_op(Slapi_PBlock *pb) slapi_log_error(SLAPI_LOG_PLUGIN, AUTOMEMBER_PLUGIN_SUBSYSTEM, "automember_modrdn_post_op: Error " "retrieving post-op entry\n"); - return 0; + return SLAPI_PLUGIN_FAILURE; } if ((old_sdn = automember_get_sdn(pb))) { @@ -2697,11 +2743,58 @@ automember_modrdn_post_op(Slapi_PBlock *pb) slapi_log_error(SLAPI_LOG_PLUGIN, AUTOMEMBER_PLUGIN_SUBSYSTEM, "automember_modrdn_post_op: Error " "retrieving dn\n"); + return SLAPI_PLUGIN_FAILURE; } - slapi_log_error(SLAPI_LOG_TRACE, AUTOMEMBER_PLUGIN_SUBSYSTEM, - "<-- automember_modrdn_post_op\n"); + /* If replication, just bail. */ + if (automember_isrepl(pb)) { + return SLAPI_PLUGIN_SUCCESS; + } - return 0; + /* + * Check if a config entry applies to the entry(post modrdn) + */ + automember_config_read_lock(); + + /* Bail out if the plug-in close function was just called. */ + if (!g_plugin_started) { + automember_config_unlock(); + return SLAPI_PLUGIN_SUCCESS; + } + + if (!PR_CLIST_IS_EMPTY(g_automember_config)) { + list = PR_LIST_HEAD(g_automember_config); + while (list != g_automember_config) { + config = (struct configEntry *)list; + + /* Does the entry meet scope and filter requirements? */ + if (slapi_dn_issuffix(slapi_sdn_get_dn(new_sdn), config->scope) && + (slapi_filter_test_simple(post_e, config->filter) == 0)) { + /* Find out what membership changes are needed and make them. */ + if(automember_update_membership(config, post_e, NULL)){ + rc = SLAPI_PLUGIN_FAILURE; + break; + } + } + + list = PR_NEXT_LINK(list); + } + } + + automember_config_unlock(); + + if(rc){ + char errtxt[SLAPI_DSE_RETURNTEXT_SIZE]; + int result = LDAP_UNWILLING_TO_PERFORM; + + PR_snprintf(errtxt, SLAPI_DSE_RETURNTEXT_SIZE, "Automember Plugin update unexpectedly failed. " + "Please see the server errors log for more information.\n"); + slapi_pblock_set(pb, SLAPI_RESULT_CODE, &result); + slapi_pblock_set(pb, SLAPI_PB_RESULT_TEXT, &errtxt); + } + + slapi_log_error(SLAPI_LOG_TRACE, AUTOMEMBER_PLUGIN_SUBSYSTEM, + "<-- automember_modrdn_post_op (%d)\n", rc); + return rc; } diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c b/ldap/servers/slapd/back-ldbm/ldbm_add.c index dbcc914..7834b40 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_add.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c @@ -357,7 +357,7 @@ ldbm_back_add( Slapi_PBlock *pb ) /* make sure opreturn is set for the postop plugins */ slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &rc); } - + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } /* @@ -795,6 +795,7 @@ ldbm_back_add( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } @@ -1046,6 +1047,7 @@ ldbm_back_add( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c index 42e26de..ce2a154 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c @@ -325,6 +325,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set( pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &rc ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } /* the flag could be set in a preop plugin (e.g., USN) */ @@ -354,6 +355,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) ldap_result_code ? &ldap_result_code : &retval ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } @@ -603,6 +605,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) ldap_result_code ? &ldap_result_code : &retval ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } } @@ -633,6 +636,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) &ldap_result_code : &rc ); } /* retval is -1 */ + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } slapi_pblock_set( pb, SLAPI_DELETE_BEPREOP_ENTRY, orig_entry ); @@ -1105,6 +1109,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set( pb, SLAPI_PLUGIN_OPRETURN, &retval ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c index def314e..92692f0 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c @@ -623,6 +623,7 @@ ldbm_back_modify( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } @@ -793,6 +794,7 @@ ldbm_back_modify( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set(pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c index fc66ae6..09f1cea 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c @@ -466,6 +466,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set( pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &rc ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } /* @@ -890,6 +891,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set( pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } @@ -1130,6 +1132,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb ) if (!opreturn) { slapi_pblock_set( pb, SLAPI_PLUGIN_OPRETURN, ldap_result_code ? &ldap_result_code : &retval ); } + slapi_pblock_get(pb, SLAPI_PB_RESULT_TEXT, &ldap_result_message); goto error_return; } diff --git a/ldap/servers/slapd/plugin.c b/ldap/servers/slapd/plugin.c index 66b011b..de9c01b 100644 --- a/ldap/servers/slapd/plugin.c +++ b/ldap/servers/slapd/plugin.c @@ -1476,7 +1476,8 @@ plugin_call_func (struct slapdplugin *list, int operation, Slapi_PBlock *pb, int } else if (SLAPI_PLUGIN_BEPREOPERATION == list->plg_type || SLAPI_PLUGIN_BETXNPREOPERATION == list->plg_type || - SLAPI_PLUGIN_BEPOSTOPERATION == list->plg_type) + SLAPI_PLUGIN_BEPOSTOPERATION == list->plg_type || + SLAPI_PLUGIN_BETXNPOSTOPERATION == list->plg_type ) { /* * respect fatal error SLAPI_PLUGIN_FAILURE (-1);

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits December 2013