thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Change default email domain for LDAP users (#25425) (#25434)

Browse source 
Backport #25425 by @Zettat123

Fixes #21169

Change `localhost` to `localhost.local`

Co-authored-by: Zettat123 <zettat123@gmail.com>
This commit is contained in:
Giteabot 2023-06-22 06:53:15 -04:00 committed by GitHub
parent ea00ed320d
commit f18b8e7d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/auth/source/ldap/source_authenticate.go
View file

@ -76,7 +76,7 @@ func (source *Source) Authenticate(user *user_model.User, userName, password str
}
if len(sr.Mail) == 0 {
sr.Mail = fmt.Sprintf("%s@localhost", sr.Username)
sr.Mail = fmt.Sprintf("%s@localhost.local", sr.Username)
}
user = &user_model.User{

2
services/auth/source/ldap/source_sync.go
View file

@ -104,7 +104,7 @@ func (source *Source) Sync(ctx context.Context, updateExisting bool) error {
}
if len(su.Mail) == 0 {
su.Mail = fmt.Sprintf("%s@localhost", su.Username)
su.Mail = fmt.Sprintf("%s@localhost.local", su.Username)
}
fullName := composeFullName(su.Name, su.Surname, su.Username)