mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-06-09 16:50:05 -04:00
Fix last fix.
This commit is contained in:
parent
5d13816520
commit
fde1ff5bf6
1 changed files with 0 additions and 5 deletions
|
|
@ -152,10 +152,6 @@ main( int argc, char **argv )
|
|||
|
||||
len = strlen( line );
|
||||
if ( buf == NULL || *buf == '\0' ) {
|
||||
<<<<<<< ldif2id2entry.c
|
||||
sprintf( idbuf, "%d\n", id + 1 );
|
||||
idlen = strlen( idbuf );
|
||||
=======
|
||||
if (!isdigit(line[0])) {
|
||||
sprintf( idbuf, "%d\n", id + 1 );
|
||||
idlen = strlen( idbuf );
|
||||
|
|
@ -163,7 +159,6 @@ main( int argc, char **argv )
|
|||
id = atol(line) - 1;
|
||||
idlen = 0;
|
||||
}
|
||||
>>>>>>> 1.4.2.3
|
||||
} else {
|
||||
idlen = 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue