masqmail
diff src/deliver.c @ 205:4fd237550525
REMOVED MAILDIR SUPPORT
if you want to deliver to maildir, use an MDA like procmail
masqmail can pass mail to an MDA by setting `mda' in masqmail.conf
author | meillo@marmaro.de |
---|---|
date | Fri, 16 Jul 2010 16:38:50 +0200 |
parents | dc89737b27aa |
children | 8cddc65765bd |
line diff
1.1 --- a/src/deliver.c Fri Jul 16 15:38:53 2010 +0200 1.2 +++ b/src/deliver.c Fri Jul 16 16:38:50 2010 +0200 1.3 @@ -127,8 +127,6 @@ 1.4 mbox_type = "mbox"; 1.5 else if (g_list_find_custom (conf.mda_users, user, _g_list_strcasecmp) != NULL) 1.6 mbox_type = "mda"; 1.7 - else if (g_list_find_custom (conf.maildir_users, user, _g_list_strcasecmp) != NULL) 1.8 - mbox_type = "maildir"; 1.9 1.10 if (strcmp(mbox_type, "mbox") == 0) { 1.11 DEBUG(1) debugf("attempting to deliver %s with mbox\n", msg->uid); 1.12 @@ -179,23 +177,6 @@ 1.13 destroy_table(var_table); 1.14 } else 1.15 logwrite(LOG_ALERT, "mbox type is mda, but no mda command given in configuration\n"); 1.16 - 1.17 -#ifdef ENABLE_MAILDIR 1.18 - } else if (strcmp(mbox_type, "maildir") == 0) { 1.19 - DEBUG(1) debugf("attempting to deliver %s with maildir\n", msg->uid); 1.20 - if (maildir_out(msg, hdr_list, rcpt->local_part, 0)) { 1.21 - if (env_addr != rcpt) { 1.22 - logwrite(LOG_NOTICE, "%s => %s@%s <%s@%s> with local\n", msg->uid, 1.23 - rcpt->local_part, rcpt->domain, env_addr->local_part, env_addr->domain); 1.24 - } else { 1.25 - logwrite(LOG_NOTICE, "%s => <%s@%s> with maildir\n", msg->uid, 1.26 - rcpt->local_part, rcpt->domain); 1.27 - } 1.28 - addr_mark_delivered(rcpt); 1.29 - ok = TRUE; 1.30 - } else 1.31 - addr_mark_failed(rcpt); 1.32 -#endif 1.33 } else 1.34 logwrite(LOG_ALERT, "unknown mbox type '%s'\n", mbox_type); 1.35 }