Skip to content

Commit d496de1

Browse files
committed
Add check to not change admin flag if no LDAP admin filter is set
1 parent dc137fb commit d496de1

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

models/user.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,7 @@ func SyncExternalUsers() {
14021402
} else if updateExisting {
14031403
existingUsers = append(existingUsers, usr.ID)
14041404
// Check if user data has changed
1405-
if usr.IsAdmin != su.IsAdmin ||
1405+
if (len(s.LDAP().AdminFilter) > 0 && usr.IsAdmin != su.IsAdmin) ||
14061406
strings.ToLower(usr.Email) != strings.ToLower(su.Mail) ||
14071407
usr.FullName != fullName ||
14081408
!usr.IsActive {
@@ -1411,7 +1411,10 @@ func SyncExternalUsers() {
14111411

14121412
usr.FullName = fullName
14131413
usr.Email = su.Mail
1414-
usr.IsAdmin = su.IsAdmin
1414+
// Change existing admin flag only if AdminFilter option is set
1415+
if len(s.LDAP().AdminFilter) > 0 {
1416+
usr.IsAdmin = su.IsAdmin
1417+
}
14151418
usr.IsActive = true
14161419

14171420
err = UpdateUser(usr)

0 commit comments

Comments
 (0)