View | Details | Raw Unified | Return to bug 41055
Collapse All | Expand All

(-)branches/ucs-4.1/ucs-4.1-1/mail/univention-mail-postfix/share/listfilter.py (-1 / +4 lines)
 Lines 98-104    Link Here 
98
98
99
					# get dn and groups of sender
99
					# get dn and groups of sender
100
					if check_sasl_username:
100
					if check_sasl_username:
101
						ldap_filter = '(&(uid=%s)(objectclass=posixAccount))' % sender
101
						if "@" in sender:
102
							ldap_filter = '(&(mailPrimaryAddress=%s)(objectclass=posixAccount))' % sender
103
						else:
104
							ldap_filter = '(&(uid=%s)(objectclass=posixAccount))' % sender
102
					else:
105
					else:
103
						ldap_filter = '(&(|(mailPrimaryAddress=%s)(mailAlternativeAddress=%s)(mail=%s))(objectclass=posixAccount))' % (sender, sender, sender)
106
						ldap_filter = '(&(|(mailPrimaryAddress=%s)(mailAlternativeAddress=%s)(mail=%s))(objectclass=posixAccount))' % (sender, sender, sender)
104
					user_result = ldap.search(base=options.ldap_base, filter=ldap_filter, attr=["dn"])
107
					user_result = ldap.search(base=options.ldap_base, filter=ldap_filter, attr=["dn"])

Return to bug 41055