Merge pull request #938 from fastrde/fix_multiline_comments

marle3003 · web-flow · commit 2fb20912adff · 2026-04-17T22:21:01.000+02:00
fix(ldap): ldif comments can be multiline too.
diff --git a/providers/directory/ldif.go b/providers/directory/ldif.go
@@ -63,9 +63,6 @@ func (l *Ldif) Parse(config *dynamic.Config, reader dynamic.Reader) error {
 			}
 			continue
 		}
-		if line[0] == '#' || line[0] == '-' {
-			continue
-		}
 
 		if isMultiLine(i + 1) {
 			parsedLine += trim(line)
@@ -75,6 +72,10 @@ func (l *Ldif) Parse(config *dynamic.Config, reader dynamic.Reader) error {
 			parsedLine = ""
 		}
 
+		if line[0] == '#' || line[0] == '-' {
+			continue
+		}
+
 		kv := strings.SplitN(line, ":", 2)
 		if len(kv) != 2 {
 			return fmt.Errorf("invalid line %v: %s", i, line)

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,6 @@ func (l Ldif) Parse(config dynamic.Config, reader dynamic.Reader) error {`
`63`	`63`	`}`
`64`	`64`	`continue`
`65`	`65`	`}`
`66`		`- if line[0] == '#' \|\| line[0] == '-' {`
`67`		`- continue`
`68`		`- }`
`69`	`66`
`70`	`67`	`if isMultiLine(i + 1) {`
`71`	`68`	`parsedLine += trim(line)`
`@@ -75,6 +72,10 @@ func (l Ldif) Parse(config dynamic.Config, reader dynamic.Reader) error {`
`75`	`72`	`parsedLine = ""`
`76`	`73`	`}`
`77`	`74`
	`75`	`+ if line[0] == '#' \|\| line[0] == '-' {`
	`76`	`+ continue`
	`77`	`+ }`
	`78`	`+`
`78`	`79`	`kv := strings.SplitN(line, ":", 2)`
`79`	`80`	`if len(kv) != 2 {`
`80`	`81`	`return fmt.Errorf("invalid line %v: %s", i, line)`