/trunk/debian/changelog |
---|
2,8 → 2,11 |
* Updated Danish and Dutch Debconf template translations (Closes: |
#608447, #634314). |
* Drop the defaults for SAspamcHost and SAspamcPort, deferring to spamc |
as to what the defaults will be if those options are not set in |
sa-exim.conf (Closes: #506571). |
-- Magnus Holmgren <holmgren@debian.org> Sat, 17 Sep 2011 14:45:09 +0200 |
-- Magnus Holmgren <holmgren@debian.org> Sat, 17 Sep 2011 16:23:40 +0200 |
sa-exim (4.2.1-13) unstable; urgency=low |
/trunk/sa-exim.c |
---|
549,8 → 549,8 |
static char *SAspamcpath=SPAMC_LOCATION; |
static char *SAsafemesgidchars=SAFEMESGIDCHARS |
static char *SAspamcSockPath=NULL; |
static char *SAspamcPort="783"; |
static char *SAspamcHost="127.0.0.1"; |
static char *SAspamcPort=NULL; |
static char *SAspamcHost=NULL; |
static char *SAspamcUser=NULL; |
static char *SAEximRunCond="0"; |
static char *SAEximRejCond="1"; |
961,11 → 961,15 |
} |
else |
{ |
if (SAspamcHost) { |
spamc_argv[i++] = "-d"; |
spamc_argv[i++] = SAspamcHost; |
} |
if (SAspamcPort) { |
spamc_argv[i++] = "-p"; |
spamc_argv[i++] = SAspamcPort; |
} |
} |
spamc_argv[i++] = NULL; |
ret=execv(SAspamcpath, spamc_argv); |
/trunk/sa-exim.conf |
---|
49,10 → 49,10 |
# you set it, it will override the two TCP connect options below |
#SAspamcSockPath: /var/run/spamd.sock |
# SAspamcHost / SAspamcPort: TCP socket where your spamd is listening |
# Shown below are the defaults: |
SAspamcHost: 127.0.0.1 |
SAspamcPort: 783 |
# SAspamcHost / SAspamcPort: TCP socket where your spamd is listening. |
# Default is to let spamc use any settings in spamc.conf. |
#SAspamcHost: 127.0.0.1 |
#SAspamcPort: 783 |
# SAspamcUser: The username passed to spamc. Some tricks are needed to |
# decide on one user when there are many recipients. This string is of |