jengelh/openldap2
SHA256
1
0
Fork 2
forked from pool/openldap2
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=38

Browse Source
This commit is contained in:
OBS User unknown 2008-09-26 13:06:42 +00:00 committed by Git OBS Bridge
parent 14b479698a
commit 0ac43469c6
6 changed files with 287 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openldap-rc.tgz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:397f6b72a9680efaeac76606855e62d5f3beba798fb0bbf5dadb18fb8836e681
size 4387
oid sha256:267eca4a573951a6641eb55a7f70814771a479586b4aeb3dc068e29fb337b4c7
size 4392

19
openldap2-client.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Wed Sep 24 10:58:09 CEST 2008 - rhafer@suse.de
- Mark Schema and SuSEfirewall files as %config
- openldap2-back-perl requires perl
- Give more meaningful error messages when index configuration
fails (bnc#429150)
-------------------------------------------------------------------
Fri Sep 19 17:52:55 CEST 2008 - rhafer@suse.de
- Reduced debug-level during "make test" to reduce required disk
space and buildtime
-------------------------------------------------------------------
Thu Sep 18 13:02:21 CEST 2008 - rhafer@suse.de
- Fixed init-script dependencies (bnc#426214)
-------------------------------------------------------------------
Fri Sep 12 10:09:28 CEST 2008 - rhafer@suse.de

25
openldap2-client.spec
View File

@ -27,7 +27,7 @@ BuildRequires: -pwdutils
BuildRequires: -db-devel -pwdutils libdb-4_5-devel
%endif
Version: 2.4.11
Release: 26
Release: 29
Url: http://www.openldap.org
License: BSD 3-Clause
%if "%{name}" == "openldap2"
@ -63,6 +63,7 @@ Patch10: slapd-overlay_register_control.dif
Patch11: slapd-bconfig-del-db.dif
Patch12: slapd-bconfig-adjust-idx.dif
Patch13: slapd-bdb-stop-checkpoint.dif
Patch14: slapd-bdb-index-config.dif
Patch100: openldap-2.3.37.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -80,7 +81,7 @@ Authors:
%package -n openldap2-back-perl
License: BSD 3-Clause
Summary: OpenLDAP Perl Back-End
Requires: openldap2 = %{version}
Requires: openldap2 = %{version} perl = %{perl_version}
AutoReqProv: on
Group: Productivity/Networking/LDAP/Servers
@ -167,6 +168,7 @@ Authors:
%patch11
%patch12
%patch13
%patch14
cp %{SOURCE5} .
cd ../openldap-2.3.37
%patch100
@ -242,7 +244,7 @@ fi
export SLAPD_BASEPORT
%ifnarch %arm alpha
rm -f tests/scripts/test022-ppolicy
make test
make SLAPD_DEBUG=0 test
%endif
%install
@ -269,6 +271,7 @@ install -m 644 SuSEfirewall2.openldap $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall
rm -f `find doc/guide ! -name *.html -a ! -name *.gif -a ! -name *.png -a ! -type d`
rm -rf doc/guide/release
rm -f $RPM_BUILD_ROOT/etc/openldap/DB_CONFIG.example
rm -f $RPM_BUILD_ROOT/etc/openldap/schema/README
rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example
# install 2.3 slapcat
install -m 755 ../openldap-2.3.37/servers/slapd/slapcat $RPM_BUILD_ROOT/usr/sbin/openldap-2.3-slapcat
@ -287,13 +290,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
cat >openldap2.filelist <<EOF
/var/adm/fillup-templates/sysconfig.openldap
%config /etc/init.d/ldap
/etc/sysconfig/SuSEfirewall2.d/services/openldap
%config /etc/sysconfig/SuSEfirewall2.d/services/openldap
/usr/sbin/rcldap
/usr/sbin/slap*
/usr/sbin/openldap-2.3-slapcat
%dir /etc/openldap
%dir %attr(0770, ldap, ldap) /etc/openldap/slapd.d
/etc/openldap/schema
%dir /etc/openldap/schema
%config /etc/openldap/schema/*.schema
%config /etc/openldap/schema/*.ldif
%config(noreplace) %attr(640, root, ldap) /etc/openldap/slapd.conf
%config(noreplace) %attr(640, ldap, ldap) /var/lib/ldap/DB_CONFIG
%config /var/lib/ldap/DB_CONFIG.example
@ -492,6 +497,16 @@ fi
%endif
%changelog
* Wed Sep 24 2008 rhafer@suse.de
- Mark Schema and SuSEfirewall files as %%config
- openldap2-back-perl requires perl
- Give more meaningful error messages when index configuration
fails (bnc#429150)
* Fri Sep 19 2008 rhafer@suse.de
- Reduced debug-level during "make test" to reduce required disk
space and buildtime
* Thu Sep 18 2008 rhafer@suse.de
- Fixed init-script dependencies (bnc#426214)
* Fri Sep 12 2008 rhafer@suse.de
- Backported fix for a crash in back-config when adding entries with
a too large index (ITS#5684)

19
openldap2.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Wed Sep 24 10:58:09 CEST 2008 - rhafer@suse.de
- Mark Schema and SuSEfirewall files as %config
- openldap2-back-perl requires perl
- Give more meaningful error messages when index configuration
fails (bnc#429150)
-------------------------------------------------------------------
Fri Sep 19 17:52:55 CEST 2008 - rhafer@suse.de
- Reduced debug-level during "make test" to reduce required disk
space and buildtime
-------------------------------------------------------------------
Thu Sep 18 13:02:21 CEST 2008 - rhafer@suse.de
- Fixed init-script dependencies (bnc#426214)
-------------------------------------------------------------------
Fri Sep 12 10:09:28 CEST 2008 - rhafer@suse.de

25
openldap2.spec
View File

@ -27,7 +27,7 @@ BuildRequires: -pwdutils
BuildRequires: -db-devel -pwdutils libdb-4_5-devel
%endif
Version: 2.4.11
Release: 24
Release: 27
Url: http://www.openldap.org
License: BSD 3-Clause; openldap 2.8
%if "%{name}" == "openldap2"
@ -63,6 +63,7 @@ Patch10: slapd-overlay_register_control.dif
Patch11: slapd-bconfig-del-db.dif
Patch12: slapd-bconfig-adjust-idx.dif
Patch13: slapd-bdb-stop-checkpoint.dif
Patch14: slapd-bdb-index-config.dif
Patch100: openldap-2.3.37.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -83,7 +84,7 @@ Authors:
%package -n openldap2-back-perl
License: BSD 3-Clause
Summary: OpenLDAP Perl Back-End
Requires: openldap2 = %{version}
Requires: openldap2 = %{version} perl = %{perl_version}
AutoReqProv: on
Group: Productivity/Networking/LDAP/Servers
@ -170,6 +171,7 @@ Authors:
%patch11
%patch12
%patch13
%patch14
cp %{SOURCE5} .
cd ../openldap-2.3.37
%patch100
@ -245,7 +247,7 @@ fi
export SLAPD_BASEPORT
%ifnarch %arm alpha
rm -f tests/scripts/test022-ppolicy
make test
make SLAPD_DEBUG=0 test
%endif
%install
@ -272,6 +274,7 @@ install -m 644 SuSEfirewall2.openldap $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall
rm -f `find doc/guide ! -name *.html -a ! -name *.gif -a ! -name *.png -a ! -type d`
rm -rf doc/guide/release
rm -f $RPM_BUILD_ROOT/etc/openldap/DB_CONFIG.example
rm -f $RPM_BUILD_ROOT/etc/openldap/schema/README
rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example
# install 2.3 slapcat
install -m 755 ../openldap-2.3.37/servers/slapd/slapcat $RPM_BUILD_ROOT/usr/sbin/openldap-2.3-slapcat
@ -290,13 +293,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
cat >openldap2.filelist <<EOF
/var/adm/fillup-templates/sysconfig.openldap
%config /etc/init.d/ldap
/etc/sysconfig/SuSEfirewall2.d/services/openldap
%config /etc/sysconfig/SuSEfirewall2.d/services/openldap
/usr/sbin/rcldap
/usr/sbin/slap*
/usr/sbin/openldap-2.3-slapcat
%dir /etc/openldap
%dir %attr(0770, ldap, ldap) /etc/openldap/slapd.d
/etc/openldap/schema
%dir /etc/openldap/schema
%config /etc/openldap/schema/*.schema
%config /etc/openldap/schema/*.ldif
%config(noreplace) %attr(640, root, ldap) /etc/openldap/slapd.conf
%config(noreplace) %attr(640, ldap, ldap) /var/lib/ldap/DB_CONFIG
%config /var/lib/ldap/DB_CONFIG.example
@ -495,6 +500,16 @@ fi
%endif
%changelog
* Wed Sep 24 2008 rhafer@suse.de
- Mark Schema and SuSEfirewall files as %%config
- openldap2-back-perl requires perl
- Give more meaningful error messages when index configuration
fails (bnc#429150)
* Fri Sep 19 2008 rhafer@suse.de
- Reduced debug-level during "make test" to reduce required disk
space and buildtime
* Thu Sep 18 2008 rhafer@suse.de
- Fixed init-script dependencies (bnc#426214)
* Fri Sep 12 2008 rhafer@suse.de
- Backported fix for a crash in back-config when adding entries with
a too large index (ITS#5684)

207
slapd-bdb-index-config.dif Normal file
View File

@ -0,0 +1,207 @@
Index: servers/slapd/back-bdb/attr.c
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/back-bdb/attr.c,v
retrieving revision 1.39
diff -u -r1.39 attr.c
--- servers/slapd/back-bdb/attr.c 26 May 2008 15:38:32 -0000 1.39
+++ servers/slapd/back-bdb/attr.c 23 Sep 2008 13:09:29 -0000
@@ -23,6 +23,7 @@
#include "slap.h"
#include "back-bdb.h"
+#include "config.h"
#include "lutil.h"
/* Find the ad, return -1 if not found,
@@ -92,7 +93,8 @@
const char *fname,
int lineno,
int argc,
- char **argv )
+ char **argv,
+ struct config_reply_s *c_reply)
{
int rc = 0;
int i;
@@ -132,9 +134,14 @@
rc = slap_str2index( indexes[i], &index );
if( rc != LDAP_SUCCESS ) {
- fprintf( stderr, "%s: line %d: "
- "index type \"%s\" undefined\n",
- fname, lineno, indexes[i] );
+ if ( c_reply )
+ {
+ snprintf(c_reply->msg, sizeof(c_reply->msg),
+ "index type \"%s\" undefined", indexes[i] );
+
+ fprintf( stderr, "%s: line %d: %s\n",
+ fname, lineno, c_reply->msg );
+ }
rc = LDAP_PARAM_ERROR;
goto done;
}
@@ -144,9 +151,13 @@
}
if( !mask ) {
- fprintf( stderr, "%s: line %d: "
- "no indexes selected\n",
- fname, lineno );
+ if ( c_reply )
+ {
+ snprintf(c_reply->msg, sizeof(c_reply->msg),
+ "no indexes selected" );
+ fprintf( stderr, "%s: line %d: %s\n",
+ fname, lineno, c_reply->msg );
+ }
rc = LDAP_PARAM_ERROR;
goto done;
}
@@ -169,9 +180,14 @@
if ( is_component_reference( attrs[i] ) ) {
rc = extract_component_reference( attrs[i], &cr );
if ( rc != LDAP_SUCCESS ) {
- fprintf( stderr, "%s: line %d: "
- "index component reference\"%s\" undefined\n",
- fname, lineno, attrs[i] );
+ if ( c_reply )
+ {
+ snprintf(c_reply->msg, sizeof(c_reply->msg),
+ "index component reference\"%s\" undefined",
+ attrs[i] );
+ fprintf( stderr, "%s: line %d: %s\n",
+ fname, lineno, c_reply->msg );
+ }
goto done;
}
cr->cr_indexmask = mask;
@@ -187,16 +203,25 @@
rc = slap_str2ad( attrs[i], &ad, &text );
if( rc != LDAP_SUCCESS ) {
- fprintf( stderr, "%s: line %d: "
- "index attribute \"%s\" undefined\n",
- fname, lineno, attrs[i] );
+ if ( c_reply )
+ {
+ snprintf(c_reply->msg, sizeof(c_reply->msg),
+ "index attribute \"%s\" undefined",
+ attrs[i] );
+
+ fprintf( stderr, "%s: line %d: %s\n",
+ fname, lineno, c_reply->msg );
+ }
goto done;
}
if( slap_ad_is_binary( ad ) ) {
- fprintf( stderr, "%s: line %d: "
- "index of attribute \"%s\" disallowed\n",
- fname, lineno, attrs[i] );
+ if (c_reply) {
+ snprintf(c_reply->msg, sizeof(c_reply->msg),
+ "index of attribute \"%s\" disallowed", attrs[i] );
+ fprintf( stderr, "%s: line %d: %s\n",
+ fname, lineno, c_reply->msg );
+ }
rc = LDAP_UNWILLING_TO_PERFORM;
goto done;
}
@@ -206,9 +231,12 @@
&& ad->ad_type->sat_approx->smr_indexer
&& ad->ad_type->sat_approx->smr_filter ) )
{
- fprintf( stderr, "%s: line %d: "
- "approx index of attribute \"%s\" disallowed\n",
- fname, lineno, attrs[i] );
+ if (c_reply) {
+ snprintf(c_reply->msg, sizeof(c_reply->msg),
+ "approx index of attribute \"%s\" disallowed", attrs[i] );
+ fprintf( stderr, "%s: line %d: %s\n",
+ fname, lineno, c_reply->msg );
+ }
rc = LDAP_INAPPROPRIATE_MATCHING;
goto done;
}
@@ -218,9 +246,12 @@
&& ad->ad_type->sat_equality->smr_indexer
&& ad->ad_type->sat_equality->smr_filter ) )
{
- fprintf( stderr, "%s: line %d: "
- "equality index of attribute \"%s\" disallowed\n",
- fname, lineno, attrs[i] );
+ if (c_reply) {
+ snprintf(c_reply->msg, sizeof(c_reply->msg),
+ "equality index of attribute \"%s\" disallowed", attrs[i] );
+ fprintf( stderr, "%s: line %d: %s\n",
+ fname, lineno, c_reply->msg );
+ }
rc = LDAP_INAPPROPRIATE_MATCHING;
goto done;
}
@@ -230,9 +261,12 @@
&& ad->ad_type->sat_substr->smr_indexer
&& ad->ad_type->sat_substr->smr_filter ) )
{
- fprintf( stderr, "%s: line %d: "
- "substr index of attribute \"%s\" disallowed\n",
- fname, lineno, attrs[i] );
+ if (c_reply) {
+ snprintf(c_reply->msg, sizeof(c_reply->msg),
+ "substr index of attribute \"%s\" disallowed", attrs[i] );
+ fprintf( stderr, "%s: line %d: %s\n",
+ fname, lineno, c_reply->msg );
+ }
rc = LDAP_INAPPROPRIATE_MATCHING;
goto done;
}
@@ -295,9 +329,13 @@
rc = 0;
continue;
}
- fprintf( stderr,
- "%s: line %d: duplicate index definition for attr \"%s\".\n",
- fname, lineno, attrs[i] );
+ if (c_reply) {
+ snprintf(c_reply->msg, sizeof(c_reply->msg),
+ "duplicate index definition for attr \"%s\"",
+ attrs[i] );
+ fprintf( stderr, "%s: line %d: %s\n",
+ fname, lineno, c_reply->msg );
+ }
rc = LDAP_PARAM_ERROR;
goto done;
Index: servers/slapd/back-bdb/config.c
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/back-bdb/config.c,v
retrieving revision 1.108
diff -u -r1.108 config.c
--- servers/slapd/back-bdb/config.c 26 Aug 2008 23:45:35 -0000 1.108
+++ servers/slapd/back-bdb/config.c 23 Sep 2008 13:09:29 -0000
@@ -736,7 +736,7 @@
case BDB_INDEX:
rc = bdb_attr_index_config( bdb, c->fname, c->lineno,
- c->argc - 1, &c->argv[1] );
+ c->argc - 1, &c->argv[1], &c->reply);
if( rc != LDAP_SUCCESS ) return 1;
if (( bdb->bi_flags & BDB_IS_OPEN ) && !bdb->bi_index_task ) {
Index: servers/slapd/back-bdb/proto-bdb.h
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/back-bdb/proto-bdb.h,v
retrieving revision 1.160
diff -u -r1.160 proto-bdb.h
--- servers/slapd/back-bdb/proto-bdb.h 26 Aug 2008 23:45:35 -0000 1.160
+++ servers/slapd/back-bdb/proto-bdb.h 23 Sep 2008 13:09:29 -0000
@@ -49,7 +49,7 @@
int bdb_attr_index_config LDAP_P(( struct bdb_info *bdb,
const char *fname, int lineno,
- int argc, char **argv ));
+ int argc, char **argv, struct config_reply_s *cr ));
void bdb_attr_index_unparse LDAP_P(( struct bdb_info *bdb, BerVarray *bva ));
void bdb_attr_index_destroy LDAP_P(( struct bdb_info *bdb ));