Hallvard B Furuseth wrote:
Quanah Gibson-Mount writes:
> Please test RE24 in preparation for 2.4.8.
Passes all tests on Linux - Ubuntu/x86_64 and RHEL/i386.
CHANGES says:
> Fixed ldapmodify exit code init (ITS#5317)
ldapsearch, not ldapmodify.
Right, that should be fixed in the CHANGES file.
And only half fixed, I asked a
question and let the other half wait. The other half looks
trivial, though I don't have time to test it now:
It's a lost cause. What do you do if a second error (or further) occurs?
--- ldapsearch.c.~1.249.~ 2008-01-09 22:03:44.000000000 +0100
+++ ldapsearch.c 2008-02-12 16:27:04.000000000 +0100
@@ -627,3 +627,3 @@
FILE *fp = NULL;
- int rc, i, first;
+ int rc, rc1, i, first;
LDAP *ld = NULL;
@@ -992,7 +992,9 @@
}
- rc = dosearch( ld, base, scope, filtpattern, line,
+ rc1 = dosearch( ld, base, scope, filtpattern, line,
attrs, attrsonly, NULL, NULL, NULL, -1 );
- if ( rc != 0&& !contoper ) {
- break;
+ if ( rc1 != 0 ) {
+ rc = rc1;
+ if ( !contoper )
+ break;
}
> Fixed slapd indexing with component matching (ITS#4112)
Disabled the broken code, not fixed it, according to the cvs log.
(So the ITS should mention it's been disabled, I guess.)
I was skeptical about recording this in RE24 changes. LDAP_COMP_MATCH is still
behind #ifdef LDAP_DEVEL so this patch shouldn't have had any effect on RE24
either way.
--
-- Howard Chu
Chief Architect, Symas Corp.
http://www.symas.com
Director, Highland Sun
http://highlandsun.com/hyc/
Chief Architect, OpenLDAP
http://www.openldap.org/project/