Commit 8a43ee82 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

reflect latest changes from HEAD

parent c000d4f6
...@@ -2,6 +2,10 @@ OpenLDAP 2.1 Change Log ...@@ -2,6 +2,10 @@ OpenLDAP 2.1 Change Log
OpenLDAP 2.1.10 Engineering OpenLDAP 2.1.10 Engineering
Fixed slapd empty values return filter control bug (ITS#2219) Fixed slapd empty values return filter control bug (ITS#2219)
Fixed slapd empty oid control bug
Fixed ldapsearch empty baseObject bug
Fixed slapd acl/group value_find_ex() bug (ITS#2227)
Fixed slapd NameAndOptionalUID bug
OpenLDAP 2.1.9 Release OpenLDAP 2.1.9 Release
Fixed back-bdb moddn newSuperior bug Fixed back-bdb moddn newSuperior bug
......
...@@ -98,7 +98,8 @@ main( int argc, char **argv ) ...@@ -98,7 +98,8 @@ main( int argc, char **argv )
{ {
char buf[ 4096 ]; char buf[ 4096 ];
FILE *fp; FILE *fp;
int i, rc, authmethod, referrals, want_bindpw, version, debug, manageDSAit, noop, crit; int i, rc, retval, authmethod, referrals, want_bindpw;
int version, debug, manageDSAit, noop, crit;
char *pw_file; char *pw_file;
char *control, *cvalue; char *control, *cvalue;
...@@ -730,14 +731,17 @@ main( int argc, char **argv ) ...@@ -730,14 +731,17 @@ main( int argc, char **argv )
} }
} }
rc = 0; retval = rc = 0;
if ( fp == NULL ) { if ( fp == NULL ) {
for ( ; optind < argc; ++optind ) { for ( ; optind < argc; ++optind ) {
rc = dodelete( ld, argv[ optind ] ); rc = dodelete( ld, argv[ optind ] );
/* Stop on error and no -c option */ /* Stop on error and no -c option */
if( rc != 0 && contoper == 0) break; if( rc != 0 ) {
retval = rc;
if( contoper == 0 ) break;
}
} }
} else { } else {
while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) { while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) {
...@@ -745,13 +749,15 @@ main( int argc, char **argv ) ...@@ -745,13 +749,15 @@ main( int argc, char **argv )
if ( *buf != '\0' ) { if ( *buf != '\0' ) {
rc = dodelete( ld, buf ); rc = dodelete( ld, buf );
if ( rc != 0 )
retval = rc;
} }
} }
} }
ldap_unbind( ld ); ldap_unbind( ld );
return( rc ); return( retval );
} }
......
...@@ -111,7 +111,8 @@ main(int argc, char **argv) ...@@ -111,7 +111,8 @@ main(int argc, char **argv)
{ {
char *infile, *entrydn = NULL, *rdn = NULL, buf[ 4096 ]; char *infile, *entrydn = NULL, *rdn = NULL, buf[ 4096 ];
FILE *fp; FILE *fp;
int rc, i, remove, havedn, authmethod, version, want_bindpw, debug, manageDSAit, noop, crit; int rc, retval, i, remove, havedn, authmethod, version;
int want_bindpw, debug, manageDSAit, noop, crit;
int referrals; int referrals;
char *newSuperior=NULL; char *newSuperior=NULL;
char *pw_file = NULL; char *pw_file = NULL;
...@@ -765,9 +766,9 @@ main(int argc, char **argv) ...@@ -765,9 +766,9 @@ main(int argc, char **argv)
} }
} }
rc = 0; retval = rc = 0;
if (havedn) if (havedn)
rc = domodrdn( ld, entrydn, rdn, newSuperior, remove ); retval = domodrdn( ld, entrydn, rdn, newSuperior, remove );
else while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) { else while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) {
if ( *buf != '\0' ) { /* blank lines optional, skip */ if ( *buf != '\0' ) { /* blank lines optional, skip */
buf[ strlen( buf ) - 1 ] = '\0'; /* remove nl */ buf[ strlen( buf ) - 1 ] = '\0'; /* remove nl */
...@@ -778,6 +779,8 @@ main(int argc, char **argv) ...@@ -778,6 +779,8 @@ main(int argc, char **argv)
return( EXIT_FAILURE ); return( EXIT_FAILURE );
} }
rc = domodrdn(ld, entrydn, rdn, newSuperior, remove ); rc = domodrdn(ld, entrydn, rdn, newSuperior, remove );
if ( rc != 0 )
retval = rc;
havedn = 0; havedn = 0;
} else if ( !havedn ) { /* don't have DN yet */ } else if ( !havedn ) { /* don't have DN yet */
if (( entrydn = strdup( buf )) == NULL ) { if (( entrydn = strdup( buf )) == NULL ) {
...@@ -791,8 +794,7 @@ main(int argc, char **argv) ...@@ -791,8 +794,7 @@ main(int argc, char **argv)
ldap_unbind( ld ); ldap_unbind( ld );
/* UNREACHABLE */ return( retval );
return( rc );
} }
static int domodrdn( static int domodrdn(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment