mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-31 20:19:34 -05:00
mail500 changes from wesley.craig@umich.edu
This commit is contained in:
parent
418c49de0c
commit
9c3fa68fa5
1 changed files with 11 additions and 2 deletions
|
|
@ -33,6 +33,10 @@
|
|||
|
||||
#include "ldapconfig.h"
|
||||
|
||||
#ifndef MAIL500_BOUNCEFROM
|
||||
#define MAIL500_BOUNCEFROM "<>"
|
||||
#endif
|
||||
|
||||
#define USER 0x01
|
||||
#define GROUP_ERRORS 0x02
|
||||
#define GROUP_REQUEST 0x04
|
||||
|
|
@ -745,7 +749,8 @@ do_group( e, dn, to, nto, togroups, ngroups, err, nerr )
|
|||
/* else from the moderator - fall through and deliver it */
|
||||
}
|
||||
|
||||
if ( has_attributes( e, "rfc822ErrorsTo", "errorsTo" ) ) {
|
||||
if (strcmp(MAIL500_BOUNCEFROM, mailfrom) != 0 &&
|
||||
has_attributes( e, "rfc822ErrorsTo", "errorsTo" ) ) {
|
||||
add_group( dn, togroups, ngroups );
|
||||
|
||||
return( 0 );
|
||||
|
|
@ -1154,12 +1159,16 @@ send_errors( err, nerr )
|
|||
WAITSTATUSTYPE status;
|
||||
#endif
|
||||
|
||||
if ( strcmp( MAIL500_BOUNCEFROM, mailfrom ) == 0 ) {
|
||||
mailfrom = errorsfrom;
|
||||
}
|
||||
|
||||
argv[0] = MAIL500_SENDMAIL;
|
||||
argv[1] = "-oMrX.500";
|
||||
argv[2] = "-odi";
|
||||
argv[3] = "-oi";
|
||||
argv[4] = "-f";
|
||||
argv[5] = errorsfrom;
|
||||
argv[5] = MAIL500_BOUNCEFROM;
|
||||
argv[6] = mailfrom;
|
||||
argv[7] = NULL;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue