mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-22 16:45:58 +01:00
Code Activity

Don't set permissions if clients overrides.

Browse source
This commit is contained in:
Juliusz Chroboczek 2020-11-29 16:42:42 +01:00
parent 1ed2540bd7
commit 4b420e5bd6
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
group/group.go
View file

@ -269,19 +269,17 @@ func AddClient(name string, c Client) (*Group, error) {
return nil, err return nil, err
} }
override := c.OverridePermissions(g)
g.mu.Lock() g.mu.Lock()
defer g.mu.Unlock() defer g.mu.Unlock()
perms, err := g.description.GetPermission(c.Credentials()) if(!c.OverridePermissions(g)) {
if !override && err != nil { perms, err := g.description.GetPermission(c.Credentials())
return nil, err if err != nil {
} return nil, err
}
c.SetPermissions(perms) c.SetPermissions(perms)
if !override {
if !perms.Op && g.locked != nil { if !perms.Op && g.locked != nil {
m := *g.locked m := *g.locked
if m == "" { if m == "" {