diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | fetchmail.c | 8 | ||||
| -rw-r--r-- | options.c | 8 |
3 files changed, 10 insertions, 8 deletions
@@ -64,6 +64,8 @@ fetchmail 6.3.15 (not yet released): * Fix verbose mode progress formatting regression from 6.3.10; SMTP trace lines were no longer on a line of their own. Reported by Melchior Franz. * Check seteuid() return value and abort running MDA if switch fails. +* Set global flags in a consistent manner. Make --nosoftbounce work. Reported by + N.J. Mann. # CHANGES * The repository has been converted and moved from the Subversion (SVN) format diff --git a/fetchmail.c b/fetchmail.c index b74c8897..e0ec1758 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -1124,17 +1124,17 @@ static int load_params(int argc, char **argv, int optind) if (cmd_run.poll_interval >= 0) run.poll_interval = cmd_run.poll_interval; if (cmd_run.invisible) - run.invisible = cmd_run.invisible; + run.invisible = (cmd_run.invisible == FLAG_TRUE); if (cmd_run.showdots) - run.showdots = cmd_run.showdots; + run.showdots = (cmd_run.showdots == FLAG_TRUE); if (cmd_run.use_syslog) run.use_syslog = (cmd_run.use_syslog == FLAG_TRUE); if (cmd_run.postmaster) run.postmaster = cmd_run.postmaster; if (cmd_run.bouncemail) - run.bouncemail = cmd_run.bouncemail; + run.bouncemail = (cmd_run.bouncemail == FLAG_TRUE); if (cmd_run.softbounce) - run.softbounce = cmd_run.softbounce; + run.softbounce = (cmd_run.softbounce == FLAG_TRUE); /* check and daemon options are not compatible */ if (check_only && run.poll_interval) @@ -285,7 +285,7 @@ int parsecmdline (int argc /** argument count */, rctl->logfile = prependdir (optarg, currentwd); break; case LA_INVISIBLE: - rctl->invisible = TRUE; + rctl->invisible = FLAG_TRUE; break; case LA_SHOWDOTS: rctl->showdots = FLAG_TRUE; @@ -304,13 +304,13 @@ int parsecmdline (int argc /** argument count */, rctl->postmaster = (char *) xstrdup(optarg); break; case LA_NOBOUNCE: - run.bouncemail = FALSE; + rctl->bouncemail = FLAG_FALSE; break; case LA_NOSOFTBOUNCE: - run.softbounce = FALSE; + rctl->softbounce = FLAG_FALSE; break; case LA_SOFTBOUNCE: - run.softbounce = TRUE; + rctl->softbounce = FLAG_TRUE; break; case LA_BADHEADER: if (strcasecmp(optarg,"accept") == 0) { |