Email notification uses username instead email setting

[cbarber@…]

We're currently using apache with mod_auth_kerb - ​http://modauthkerb.sourceforge.net/. Unlike mod_auth_sspi, you can not disable including the domain name in the REMOTE_USER variable. So we authenticate against subversion and trac as login@….

A small quirk occurs when enabling email notification. Although, users configure their email address in Settings, their username still takes priority. Our internal domain name does match our domain used for our email, so nothing is sent out.

I found the small change in Notify.py that does what seems intuitive; setting email overrides the username as an email address. Here's the diff (just swapping the conditions):

--- Notify_1.py	Wed Jul 12 21:03:17 2006
+++ Notify_2.py	Wed Jul 12 12:26:59 2006
@@ -300,10 +300,10 @@
         # now convert recipients into email addresses where necessary
         emails = []
         for recipient in recipients:
-            if recipient.find('@') >= 0:
-                emails.append(recipient)
-            elif self.email_map.has_key(recipient):
+            if self.email_map.has_key(recipient):
                 emails.append(self.email_map[recipient])
+            elif recipient.find('@') >= 0:
+                emails.append(recipient)
 
         # Remove duplicates
         result = []

Regards, Craig Barber

[Emmanuel Blot]

Actually, this is a duplicate of #2766, which already provides a similar patch.

[cbarber@…]

Sorry I didn't find it when I google'd. Thanks!

[Matthew Good]

If you've been using the user@DOMAIN for a while now you may not want to switch, but when I switched from mod_auth_ldap to mod_auth_kerb I hacked it so it doesn't append the domain since all my Trac and SVN permissions already used the username without the DOMAIN.

There's a patch on their SF tracker which provides an option to do that: ​http://sourceforge.net/tracker/index.php?func=detail&aid=1373783&group_id=51775&atid=464526