Hello community, here is the log from the commit of package openldap2 checked in at Mon Aug 11 23:19:10 CEST 2008. -------- --- openldap2/openldap2.changes 2008-07-31 11:41:35.000000000 +0200 +++ openldap2/openldap2.changes 2008-08-11 11:09:44.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Aug 11 11:06:08 CEST 2008 - rhafer@suse.de + +- /usr/lib/sasl2/slapd.conf was moved to /etc/sasl2/slapd.conf + (bnc#412652) +- adjust ownerships of database directories even when using + back-config + +------------------------------------------------------------------- openldap2-client.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.v13319/_old 2008-08-11 23:09:10.000000000 +0200 +++ /var/tmp/diff_new_pack.v13319/_new 2008-08-11 23:09:10.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package openldap2-client (Version 2.4.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -35,7 +42,7 @@ %endif AutoReqProv: on Version: 2.4.11 -Release: 1 +Release: 7 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: addonschema.tar.gz @@ -480,6 +487,11 @@ %endif %changelog +* Mon Aug 11 2008 rhafer@suse.de +- /usr/lib/sasl2/slapd.conf was moved to /etc/sasl2/slapd.conf + (bnc#412652) +- adjust ownerships of database directories even when using + back-config * Thu Jul 31 2008 rhafer@suse.de - Enable back-config delete support * Tue Jul 29 2008 rhafer@suse.de ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.v13319/_old 2008-08-11 23:09:10.000000000 +0200 +++ /var/tmp/diff_new_pack.v13319/_new 2008-08-11 23:09:11.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package openldap2 (Version 2.4.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -35,7 +42,7 @@ %endif AutoReqProv: on Version: 2.4.11 -Release: 1 +Release: 9 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: addonschema.tar.gz @@ -483,6 +490,11 @@ %endif %changelog +* Mon Aug 11 2008 rhafer@suse.de +- /usr/lib/sasl2/slapd.conf was moved to /etc/sasl2/slapd.conf + (bnc#412652) +- adjust ownerships of database directories even when using + back-config * Thu Jul 31 2008 rhafer@suse.de - Enable back-config delete support * Tue Jul 29 2008 rhafer@suse.de ++++++ openldap-rc.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rc.ldap new/rc.ldap --- old/rc.ldap 2007-11-27 13:49:54.000000000 +0100 +++ new/rc.ldap 2008-08-11 11:04:22.000000000 +0200 @@ -105,6 +105,16 @@ depth=0; +function chown_database_dirs_bconfig() { + ldapdir=$(grep -i olcdbdirectory `find $1 -name olcDatabase*` | awk '{print $2}') + for dir in $ldapdir; do + [ -d "$dir" ] && [ -n "$OPENLDAP_USER" ] && \ + chown -R $OPENLDAP_USER $dir 2>/dev/null + [ -d "$dir" ] && [ -n "$OPENLDAP_GROUP" ] && \ + chgrp -R $OPENLDAP_GROUP $dir 2>/dev/null + done +} + function chown_database_dirs() { ldapdir=`grep ^directory $1 | awk '{print $2}'` for dir in $ldapdir; do @@ -163,13 +173,14 @@ if [ -n "$OPENLDAP_CONFIG_BACKEND" -a "$OPENLDAP_CONFIG_BACKEND" = "ldap" ]; then chown -R $OPENLDAP_USER /etc/openldap/slapd.d 2>/dev/null chgrp -R $OPENLDAP_GROUP /etc/openldap/slapd.d 2>/dev/null + chown_database_dirs_bconfig "/etc/openldap/slapd.d" else chown_database_dirs "/etc/openldap/slapd.conf" chgrp $OPENLDAP_GROUP /etc/openldap/slapd.conf 2>/dev/null fi - if test -f /usr/lib/sasl2/slapd.conf ; then - chgrp $OPENLDAP_GROUP /usr/lib/sasl2/slapd.conf 2>/dev/null - chmod 640 /usr/lib/sasl2/slapd.conf 2>/dev/null + if test -f /etc/sasl2/slapd.conf ; then + chgrp $OPENLDAP_GROUP /etc/sasl2/slapd.conf 2>/dev/null + chmod 640 /etc/sasl2/slapd.conf 2>/dev/null fi if [ -n "$OPENLDAP_KRB5_KEYTAB" ]; then keytabfile=${OPENLDAP_KRB5_KEYTAB/#FILE:/} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org