diff --git a/libraries/libldif/line64.c b/libraries/libldif/line64.c
index a3eabb88c3..626dc6f556 100644
--- a/libraries/libldif/line64.c
+++ b/libraries/libldif/line64.c
@@ -280,16 +280,12 @@ ldif_getline( char **next )
 			}
 #endif
 
-			if ( (*next)[1] == '\r' ) {
-				if( (*next)[2] == '\n' ) {
+			if ( (*next)[1] != ' ' ) {
+				if ( (*next)[1] == '\r' && (*next)[2] == '\n' ) {
 					*(*next)++ = '\0';
 				}
 				*(*next)++ = '\0';
 				break;
-				
-			} else if ( (*next)[1] != ' ' ) {
-				*(*next)++ = '\0';
-				break;
 			}
 
 			**next = CONTINUED_LINE_MARKER;