Trim both \n and \r\n from config files.

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index e80b9b78d4567b08cd1fd4f98b78f85a4f5b3761..fc71756e2a8741f3909193d5ccf75ba113512ad5 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -2227,7 +2227,9 @@ fp_getline( FILE *fp, int *lineno )
        }
 
        while ( fgets( buf, sizeof(buf), fp ) != NULL ) {
+               /* trim off \r\n or \n */
                if ( (p = strchr( buf, '\n' )) != NULL ) {
+                       if( p > buf && p[-1] == '\r' ) --p;
                        *p = '\0';
                }
                if ( ! isspace( (unsigned char) buf[0] ) ) {

diff --git a/servers/slurpd/config.c b/servers/slurpd/config.c
index 845e75b8e49e812f2d15cc0f3abb187762d7dda8..d56ca94f781e2285ca78d3cec48be7e71286abe1 100644 (file)
--- a/servers/slurpd/config.c
+++ b/servers/slurpd/config.c
@@ -259,13 +259,17 @@ getline(
     CATLINE( buf );
     while ( fgets( buf, sizeof(buf), fp ) != NULL ) {
        if ( (p = strchr( buf, '\n' )) != NULL ) {
-           *p = '\0';
+               if( p > buf && p[-1] == '\r' ) --p;       
+               *p = '\0';
        }
        lineno++;
        if ( ! isspace( (unsigned char) buf[0] ) ) {
            return( line );
        }
 
+       /* change leading whitespace to space */
+       buf[0] = ' ';
+
        CATLINE( buf );
     }
     buf[0] = '\0';