1 --- spamass-milter.cpp.orig 2004-09-30 13:47:49.000000000 -0700
2 +++ spamass-milter.cpp 2004-09-30 13:50:15.000000000 -0700
4 SpamAssassin::local_user()
6 // assuming we have a recipient in the form: <username@somehost.somedomain>
7 - // we return 'username'
8 - return _rcpt.substr(1,_rcpt.find('@')-1);
9 + // (angle brackets optional) we return 'username'
10 + if (_rcpt[0] == '<')
11 + return _rcpt.substr(1,_rcpt.find_first_of("@+")-1);
13 + return _rcpt.substr(0,_rcpt.find_first_of("@+"));