Commit 106a4b90 authored by Howard Chu's avatar Howard Chu
Browse files

More for ITS#4365 refix CR/LF handling

Was rejecting "-\r\n" in input LDIF
parent 5c878c1b
......@@ -853,11 +853,16 @@ ldif_read_record(
line[++len] = '\0';
}
/* Squash \r\n to \n */
if ( len > 1 && line[len-2] == '\r' ) {
len--;
line[len-1] = '\n';
}
if ( last_ch == '\n' ) {
(*lno)++;
if ( line[0] == '\n' ||
( line[0] == '\r' && line[1] == '\n' )) {
if ( line[0] == '\n' ) {
if ( !found_entry ) {
lcur = 0;
top_comment = 0;
......@@ -887,10 +892,6 @@ ldif_read_record(
len--;
line[len] = '\0';
}
if ( line[len-1] == '\r' ) {
len--;
line[len] = '\0';
}
ptr = line + STRLENOF("include:");
while (isspace((unsigned char) *ptr)) ptr++;
......
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