1.1 --- a/man/masqmail.conf.5	Fri Oct 22 11:56:47 2010 -0300
     1.2 +++ b/man/masqmail.conf.5	Mon Oct 25 14:02:18 2010 -0300
     1.3 @@ -125,17 +125,11 @@
     1.4  (if you have set \fBhost_name\fR to \fIfoo.example.org\fR)
     1.5  
     1.6  .TP
     1.7 -\fBlocal_nets = \fIlist\fR
     1.8 -
     1.9 -A semicolon `;' separated list of hostnames which are on the `local' net.
    1.10 -Delivery to these hosts is attempted immediately.
    1.11 -You can use patterns with `*', e.g. "*.bar.com".
    1.12 -
    1.13 -.TP
    1.14  \fBlocal_addresses = \fIlist\fR
    1.15  
    1.16  A semicolon `;' separated list of fully qualified email-addresses which are
    1.17  considered local although their domain name part is not in the list of \fBlocal_hosts\fR. 
    1.18 +This list can be seen as an addition to \fBlocal_hosts\fP.
    1.19  
    1.20  For example: There are two people working at your LAN: person1@yourdomain and person2@yourdomain.
    1.21  But there are other persons @yourdomain which are NOT local.
    1.22 @@ -151,6 +145,7 @@
    1.23  
    1.24  A semicolon `;' separated list of fully qualified email-addresses which are
    1.25  considered not local although their domain name part is in the list of \fBlocal_hosts\fR. 
    1.26 +This list can be seen as a substraction to \fBlocal_hosts\fP.
    1.27  
    1.28  This is the opposite of the previous case.
    1.29  The majority of addresses of a specific domain are local.
    1.30 @@ -164,6 +159,13 @@
    1.31  not_local_addresses = "eric@mydomain.net"
    1.32  
    1.33  .TP
    1.34 +\fBlocal_nets = \fIlist\fR
    1.35 +
    1.36 +A semicolon `;' separated list of hostnames which are on the `local' net.
    1.37 +Delivery to these hosts is attempted immediately.
    1.38 +You can use patterns with `*', e.g. "*.bar.com".
    1.39 +
    1.40 +.TP
    1.41  \fBlisten_addresses = \fIlist\fR
    1.42  
    1.43  A semicolon `;' separated list of interfaces on which connections will be accepted.
    1.44 @@ -242,13 +244,17 @@
    1.45  \fBalias_file = \fIfile\fR
    1.46  
    1.47  Set this to the location of your alias file.
    1.48 -If unset, no aliasing will be done.
    1.49 +If not set, no aliasing will be done.
    1.50 +
    1.51 +Default: <not set> (i.e. no aliasing is done)
    1.52  
    1.53  .TP
    1.54  \fBalias_local_caseless = \fIboolean\fR
    1.55  
    1.56  If this is set, local parts in the alias file will be matched disregarding upper/lower case.
    1.57  
    1.58 +Default: false
    1.59 +
    1.60  .TP
    1.61  \fBpipe_fromline = \fIboolean\fR
    1.62  
    1.63 @@ -269,9 +275,10 @@
    1.64  
    1.65  The default local delivery method.
    1.66  Can be mbox or mda.
    1.67 -Default is mbox.
    1.68  You can override this for each user by using the \fBmbox_users\fR or \fBmda_users\fR (see below).
    1.69  
    1.70 +Default: mbox.
    1.71 +
    1.72  .TP
    1.73  \fBmbox_users = \fIlist\fR
    1.74  

     2.1 --- a/src/tables.c	Fri Oct 22 11:56:47 2010 -0300
     2.2 +++ b/src/tables.c	Mon Oct 25 14:02:18 2010 -0300
     2.3 @@ -126,11 +126,12 @@
     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 +		if (!list)
    2.10 +			logwrite(LOG_NOTICE, "table file %s contained no entries\n", fname);
    2.11  		return list;
    2.12  	}
    2.13 -	logwrite(LOG_ALERT, "could not open table file %s: %s. Thus no aliasing is done\n", fname, strerror(errno));
    2.14 +	logwrite(LOG_ALERT, "could not open table file %s: %s."
    2.15 +	                    " Thus no aliasing will be done\n", fname, strerror(errno));
    2.16  
    2.17  	return NULL;
    2.18  }