Commit 1d310fd6 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6755

parent 9a3fc601
OpenLDAP 2.4 Change Log OpenLDAP 2.4 Change Log
OpenLDAP 2.4.25 Engineering OpenLDAP 2.4.25 Engineering
Fixed ldapsearch pagedresults loop (ITS#6755)
Fixed tools for incompatible args (ITS#6849) Fixed tools for incompatible args (ITS#6849)
Fixed slapd add objectclasses in order (ITS#6837) Fixed slapd add objectclasses in order (ITS#6837)
Added slapd ordering for uidNumber and gidNumber (ITS#6852) Added slapd ordering for uidNumber and gidNumber (ITS#6852)
......
...@@ -908,6 +908,15 @@ main( int argc, char **argv ) ...@@ -908,6 +908,15 @@ main( int argc, char **argv )
tool_bind( ld ); tool_bind( ld );
getNextPage: getNextPage:
/* fp may have been closed, need to reopen if code jumps
* back here to getNextPage.
*/
if ( !fp && infile ) {
if (( fp = fopen( infile, "r" )) == NULL ) {
perror( infile );
return EXIT_FAILURE;
}
}
save_nctrls = nctrls; save_nctrls = nctrls;
i = nctrls; i = nctrls;
if ( nctrls > 0 if ( nctrls > 0
...@@ -1249,6 +1258,7 @@ getNextPage: ...@@ -1249,6 +1258,7 @@ getNextPage:
} }
if ( fp != stdin ) { if ( fp != stdin ) {
fclose( fp ); fclose( fp );
fp = NULL;
} }
} }
......
Supports Markdown
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