Mercurial > masqmail
changeset 17:6c59dedd06be
fixed delivery with empty or non-existent alias file
Thanks to Marcos Dione for the hint where to look.
(Closes Debian bug #417842)
| author | meillo@marmaro.de |
|---|---|
| date | Thu, 06 Nov 2008 09:41:35 +0100 (2008-11-06) |
| parents | 163aa299bedb |
| children | 99c09ed776c1 |
| files | src/deliver.c src/tables.c |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/deliver.c Thu Nov 06 09:33:32 2008 +0100 +++ b/src/deliver.c Thu Nov 06 09:41:35 2008 +0100 @@ -681,8 +681,7 @@ gboolean ok = TRUE; if (conf.alias_file) { - if (!(alias_table = table_read(conf.alias_file, ':'))) - return FALSE; + alias_table = table_read(conf.alias_file, ':'); } /* sort messages for different deliveries */
--- a/src/tables.c Thu Nov 06 09:33:32 2008 +0100 +++ b/src/tables.c Thu Nov 06 09:41:35 2008 +0100 @@ -125,9 +125,11 @@ } } fclose(fptr); + if (list == NULL) + logwrite(LOG_NOTICE, "empty table file %s\n", fname); return list; } - logwrite(LOG_ALERT, "could not open table file %s: %s\n", fname, strerror(errno)); + logwrite(LOG_ALERT, "could not open table file %s: %s. Thus no aliasing is done\n", fname, strerror(errno)); return NULL; }