YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '11.1.1.2' into dev

Browse source
This commit is contained in:
Alexandre Aubin 2023-01-06 00:19:48 +01:00
commit faa74c4063
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
debian/changelog vendored
View file

@ -1,3 +1,15 @@
yunohost (11.1.1.2) testing; urgency=low
- group mailalias: the ldap class is in fact mailGroup, not mailAccount -_- (1cb5e43e)
-- Alexandre Aubin <alex.aubin@mailoo.org> Sat, 03 Dec 2022 15:57:22 +0100
yunohost (11.1.1.1) testing; urgency=low
- Fix again the legacy patch for yunohost user create @_@ (46d6fab0)
-- Alexandre Aubin <alex.aubin@mailoo.org> Sat, 03 Dec 2022 14:13:09 +0100
yunohost (11.1.1) testing; urgency=low
- groups: add mail-aliases management (#1539) (0f9d9388)

8
src/user.py
View file

@ -1242,11 +1242,11 @@ def user_group_update(
logger.info(m18n.n("group_update_aliases", group=groupname))
new_attr_dict["mail"] = set(new_group_mail)
if new_attr_dict["mail"] and "mailAccount" not in group["objectClass"]:
new_attr_dict["objectClass"] = group["objectClass"] + ["mailAccount"]
elif not new_attr_dict["mail"] and "mailAccount" in group["objectClass"]:
if new_attr_dict["mail"] and "mailGroup" not in group["objectClass"]:
new_attr_dict["objectClass"] = group["objectClass"] + ["mailGroup"]
if not new_attr_dict["mail"] and "mailGroup" in group["objectClass"]:
new_attr_dict["objectClass"] = [
c for c in group["objectClass"] if c != "mailAccount"
c for c in group["objectClass"] if c != "mailGroup" and c != "mailAccount"
]
if new_attr_dict: