masqmail

changeset 17:6c59dedd06be

find changesets by author, revision, files, or words in the commit message
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
parents 163aa299bedb
children 99c09ed776c1
files src/deliver.c src/tables.c
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line diff
     1.1 --- a/src/deliver.c	Thu Nov 06 09:33:32 2008 +0100
     1.2 +++ b/src/deliver.c	Thu Nov 06 09:41:35 2008 +0100
     1.3 @@ -681,8 +681,7 @@
     1.4  	gboolean ok = TRUE;
     1.5  
     1.6  	if (conf.alias_file) {
     1.7 -		if (!(alias_table = table_read(conf.alias_file, ':')))
     1.8 -			return FALSE;
     1.9 +		alias_table = table_read(conf.alias_file, ':');
    1.10  	}
    1.11  
    1.12  	/* sort messages for different deliveries */

     2.1 --- a/src/tables.c	Thu Nov 06 09:33:32 2008 +0100
     2.2 +++ b/src/tables.c	Thu Nov 06 09:41:35 2008 +0100
     2.3 @@ -125,9 +125,11 @@
     2.4  			}
     2.5  		}
     2.6  		fclose(fptr);
     2.7 +		if (list == NULL)
     2.8 +			logwrite(LOG_NOTICE, "empty table file %s\n", fname);
     2.9  		return list;
    2.10  	}
    2.11 -	logwrite(LOG_ALERT, "could not open table file %s: %s\n", fname, strerror(errno));
    2.12 +	logwrite(LOG_ALERT, "could not open table file %s: %s. Thus no aliasing is done\n", fname, strerror(errno));
    2.13  
    2.14  	return NULL;
    2.15  }