From 1780c5617263c2da28c958ff75329793941eac8a Mon Sep 17 00:00:00 2001 From: root Date: Wed, 5 Jul 2023 18:01:09 +0000 Subject: [PATCH] Fixed mail for user@domain emails --- lib/mail.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/mail.sh b/lib/mail.sh index 26555be..2d783b4 100644 --- a/lib/mail.sh +++ b/lib/mail.sh @@ -86,8 +86,8 @@ LDAP_QUERY_FILTER_GROUP=(&(mailGroupMember=%s)(mailEnabled=TRUE)) LDAP_QUERY_FILTER_ALIAS=(|(&(mailAlias=%s)(objectClass=PostfixBookMailForward))(&(mailAlias=%s)(objectClass=inetOrgPerson)(mailEnabled=TRUE))) LDAP_QUERY_FILTER_DOMAIN=(|(&(mail=*@%s)(objectClass=PostfixBookMailAccount)(mailEnabled=TRUE))(&(mailGroupMember=*@%s)(objectClass=PostfixBookMailAccount)(mailEnabled=TRUE))(&(mailalias=*@%s)(objectClass=PostfixBookMailForward))) # DOVECOT -DOVECOT_PASS_FILTER=(&(objectClass=inetOrgPerson)(uid=%n)) -DOVECOT_USER_FILTER=(&(objectClass=inetOrgPerson)(uid=%n)) +DOVECOT_PASS_FILTER=(&(objectClass=inetOrgPerson)(mail=%u)) +DOVECOT_USER_FILTER=(&(objectClass=inetOrgPerson)(mail=%u)) DOVECOT_USER_ATTRS=homeDirectory=home,=uid=5000,=gid=5000 # SASLAUTHD ENABLE_SASLAUTHD=1 @@ -96,7 +96,7 @@ SASLAUTHD_LDAP_SERVER=ldap.$DOMAIN SASLAUTHD_LDAP_BIND_DN=cn=admin,dc=federatedcomputer,dc=cloud SASLAUTHD_LDAP_PASSWORD=$LDAP_SECRET SASLAUTHD_LDAP_SEARCH_BASE=ou=people,dc=federatedcomputer,dc=cloud -SASLAUTHD_LDAP_FILTER=(&(objectClass=inetOrgPerson)(uid=%U)) +SASLAUTHD_LDAP_FILTER=(&(objectClass=inetOrgPerson)(mail=%U@%r)) POSTMASTER_ADDRESS=postmaster@localhost.localdomain POSTFIX_MESSAGE_SIZE_LIMIT=100000000 EOF