Skip to content

Commit ed3bc11

Browse files
committed
Merge remote-tracking branch 'origin/main' into develop
# Conflicts: # webui/package-lock.json # webui/package.json
2 parents 65855cb + b58c26e commit ed3bc11

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

config/dynamic/parse.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func parse(c *Config) (interface{}, error) {
6969
result, err = parseYaml(b, result)
7070
case ".json":
7171
result, err = parseJson(b, result)
72-
case ".lua", ".js", ".cjs", ".mjs", ".ts":
72+
case ".lua", ".js", ".cjs", ".mjs", ".ts", ".ldif":
7373
result = string(b)
7474
default:
7575
// try parse from JSON and YAML

examples/mail/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/mail/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"dependencies": {
3-
"nodemailer": "^7.0.11"
3+
"nodemailer": "^8.0.5"
44
}
55
}

providers/directory/search.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ func (d *Directory) serveSearch(rw ldap.ResponseWriter, r *ldap.Request) {
8080
if dn := strings.Join(parts[1:], ","); dn != msg.BaseDN {
8181
continue
8282
}
83+
case ldap.ScopeWholeSubtree:
84+
if !strings.HasSuffix(strings.ToLower(e.Dn), strings.ToLower(msg.BaseDN)) {
85+
continue
86+
}
8387
}
8488
if d.skip(&e, msg.BaseDN) {
8589
continue

0 commit comments

Comments
 (0)