#if defined(HAVE_UNISTD_H)
#include <unistd.h>
#endif
-#if defined(HAVE_ALLOCA_H)
-#include <alloca.h>
-#else
-#ifdef _AIX
- #pragma alloca
-#endif
-#endif
#include <string.h>
#include <signal.h>
#if defined(HAVE_SYSLOG)
#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef HAVE_SETRLIMIT
+#include <sys/resource.h>
+#endif /* HAVE_SETRLIMIT */
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
static int query_host(struct query *);
/* controls the detail level of status/progress messages written to stderr */
-int outlevel; /* see the O_.* constants above */
+int outlevel; /* see the O_.* constants above */
/* miscellaneous global controls */
-struct runctl run; /* global controls for this run */
-flag nodetach; /* if TRUE, don't detach daemon process */
-flag quitmode; /* if --quit was set */
-flag check_only; /* if --probe was set */
-flag versioninfo; /* emit only version info */
-char *user; /* the name of the invoking user */
-char *home; /* invoking user's home directory */
-char *fetchmailhost; /* the name of the host running fetchmail */
-char *program_name; /* the name to prefix error messages with */
-flag configdump; /* dump control blocks for configurator */
+struct runctl run; /* global controls for this run */
+flag nodetach; /* if TRUE, don't detach daemon process */
+flag quitmode; /* if --quit was set */
+flag check_only; /* if --probe was set */
+flag versioninfo; /* emit only version info */
+char *user; /* the name of the invoking user */
+char *home; /* invoking user's home directory */
+char *program_name; /* the name to prefix error messages with */
+flag configdump; /* dump control blocks for configurator */
+const char *fetchmailhost; /* either `localhost' or the host's FQDN */
#if NET_SECURITY
void *request = NULL;
static int lastsig; /* last signal received */
static struct runctl cmd_run; /* global options set from command line */
-static void termhook(); /* forward declaration of exit hook */
+static void termhook(int); /* forward declaration of exit hook */
+
+#if 0
+#define SLEEP_WITH_ALARM
+#endif
+#ifdef SLEEP_WITH_ALARM
/*
- * The function of this variable is to reduce the size of the window during
- * which two SIGALRMS in rapid succession can hose the code. This is a
- * bit of a kluge; the real right thing would use sigprocmask(), sigsuspend()
- * and close the window entirely. But since the interval isn't normally
- * going to be less than one second this is not a big issue.
+ * The function of this variable is to remove the window during which a
+ * SIGALRM can hose the code (ALARM is triggered *before* pause() is called).
+ * This is a bit of a kluge; the real right thing would use sigprocmask(),
+ * sigsuspend().
+ * This work around lets the interval timer trigger the first alarm after the
+ * required interval and will then generate alarms all 5 seconds, until it
+ * is certain, that the critical section (ie., the window) is left.
*/
#if defined(STDC_HEADERS)
static sig_atomic_t alarm_latch = FALSE;
static int alarm_latch = FALSE;
#endif
-RETSIGTYPE donothing(sig) int sig; {signal(sig, donothing); lastsig = sig;}
-RETSIGTYPE gotsigalrm(sig) int sig; {signal(sig, donothing); lastsig = sig; alarm_latch = TRUE;}
+RETSIGTYPE gotsigalrm(sig)
+int sig;
+{
+ signal(sig, gotsigalrm);
+ lastsig = sig;
+ alarm_latch = TRUE;
+}
+#endif /* SLEEP_WITH_ALARM */
+
+RETSIGTYPE donothing(int sig) {signal(sig, donothing); lastsig = sig;}
#ifdef HAVE_ON_EXIT
static void unlockit(int n, void *p)
/* Various EMX-specific definitions */
int itimerflag;
void itimerthread(void* dummy) {
- if (outlevel == O_VERBOSE)
+ if (outlevel >= O_VERBOSE)
fprintf(stderr, "fetchmail: thread sleeping for %d sec.\n", poll_interval);
while(1) {
_sleep2(poll_interval*1000);
#ifdef RPA_ENABLE
printf("+RPA");
#endif /* RPA_ENABLE */
+#ifdef SDPS_ENABLE
+ printf("+SDPS");
+#endif /* SDPS_ENABLE */
#ifndef ETRN_ENABLE
printf("-ETRN");
#endif /* ETRN_ENABLE */
/* set up to do lock protocol */
#define FETCHMAIL_PIDFILE "fetchmail.pid"
- tmpbuf = xmalloc(strlen(home) + strlen(FETCHMAIL_PIDFILE) + 3);
+ xalloca(tmpbuf, char *, strlen(home) + strlen(FETCHMAIL_PIDFILE) + 3);
if (!getuid())
sprintf(tmpbuf, "%s/%s", PID_DIR, FETCHMAIL_PIDFILE);
else {
printf("\n");
else
printf(" and %s\n", rcfile);
- if (outlevel == O_VERBOSE)
+ if (outlevel >= O_VERBOSE)
printf("Lockfile at %s\n", tmpbuf);
if (querylist == NULL)
}
/* parse the ~/.netrc file (if present) for future password lookups. */
- netrc_file = (char *) xmalloc (strlen (home) + 8);
+ xalloca(netrc_file, char *, strlen (home) + 8);
strcpy (netrc_file, home);
strcat (netrc_file, "/.netrc");
netrc_list = parse_netrc(netrc_file);
+#ifdef HAVE_SETRLIMIT
+ /*
+ * Before getting passwords, disable core dumps unless -v -d0 mode is on.
+ * Core dumps could otherwise contain passwords to be scavenged by a
+ * cracker.
+ */
+ if (outlevel < O_VERBOSE || run.poll_interval > 0)
+ {
+ struct rlimit corelimit;
+ corelimit.rlim_cur = 0;
+ corelimit.rlim_max = 0;
+ setrlimit(RLIMIT_CORE, &corelimit);
+ }
+#endif /* HAVE_SETRLIMIT */
+
/* pick up interactively any passwords we need but don't have */
for (ctl = querylist; ctl; ctl = ctl->next)
+ {
+ ctl->authfailcount = 0;
+
if (ctl->active && !(implicitmode && ctl->server.skip)&&!ctl->password)
{
if (ctl->server.preauthenticate == A_KERBEROS_V4 ||
#endif /* GSSAPI */
&& !ctl->password)
{
- free(tmpbuf);
#define PASSWORD_PROMPT "Enter password for %s@%s: "
- tmpbuf = xmalloc(strlen(PASSWORD_PROMPT) +
+ xalloca(tmpbuf, char *, strlen(PASSWORD_PROMPT) +
strlen(ctl->remotename) +
strlen(ctl->server.pollname) + 1);
(void) sprintf(tmpbuf, PASSWORD_PROMPT,
#undef PASSWORD_PROMPT
}
}
-
- /* we don't need tmpbuf anymore */
- free(tmpbuf);
- tmpbuf = NULL; /* firewall code */
+ }
/*
* Maybe time to go to demon mode...
}
else
#endif
- error_init(run.poll_interval == 0 && !run.logfile);
+ error_init((run.poll_interval == 0 || nodetach) && !run.logfile);
if (run.poll_interval)
{
batchcount = 0;
for (ctl = querylist; ctl; ctl = ctl->next)
{
+ if (ctl->authfailcount)
+ {
+ error(0, -1,
+ "poll of %s skipped until authentication is unwedged",
+ ctl->server.pollname);
+ continue;
+ }
if (ctl->active && !(implicitmode && ctl->server.skip))
{
/* check skip interval first so that it counts all polls */
{
if (ctl->server.poll_count++ % ctl->server.interval)
{
- if (outlevel == O_VERBOSE)
- fprintf(stderr,
- "fetchmail: interval not reached, not querying %s\n",
+ if (outlevel >= O_VERBOSE)
+ error(0, -1,
+ "interval not reached, not querying %s",
ctl->server.pollname);
continue;
}
/* Save UID list to prevent re-fetch in case fetchmail
recover from crash */
- if (!check_only && outlevel == O_VERBOSE)
+ if (!check_only)
{
write_saved_lists(querylist, run.idfile);
- if (outlevel == O_VERBOSE)
+ if (outlevel >= O_DEBUG)
error(0, 0, "saved UID List");
}
#endif /* POP3_ENABLE */
}
else if (!check_only &&
- ((querystatus!=PS_NOMAIL) || (outlevel==O_VERBOSE)))
+ ((querystatus!=PS_NOMAIL) || (outlevel==O_DEBUG)))
error(0, 0, "Query status=%d", querystatus);
#if defined(linux) && !INET6
*/
if (run.poll_interval)
{
- if (outlevel == O_VERBOSE)
- {
- time_t now;
+ /*
+ * Because passwords can expire, it may happen that *all*
+ * hosts are now out of the loop due to authfail
+ * conditions. If this happens daemon-mode fetchmail
+ * should softly and silently vanish away, rather than
+ * spinning uselessly.
+ */
+ int auth_ok = 0;
- time(&now);
- fprintf(stderr, "fetchmail: sleeping at %s", ctime(&now));
+ for (ctl = querylist; ctl; ctl = ctl->next)
+ if (!ctl->authfailcount)
+ auth_ok++;
+ if (!auth_ok)
+ {
+ error(0, -1, "All authentications have failed. Exiting.");
+ exit(PS_AUTHFAIL);
}
+ if (outlevel >= O_VERBOSE)
+ error(0, -1, "fetchmail: sleeping at %s", rfc822timestamp());
+
/*
* With this simple hack, we make it possible for a foreground
* fetchmail to wake up one in daemon mode. What we want is the
*/
struct itimerval ntimeout;
- ntimeout.it_interval.tv_sec = ntimeout.it_interval.tv_usec = 0;
- ntimeout.it_value.tv_sec = poll_interval;
+ ntimeout.it_interval.tv_sec = 5; /* repeat alarm every 5 secs */
+ ntimeout.it_interval.tv_usec = 0;
+ ntimeout.it_value.tv_sec = run.poll_interval;
ntimeout.it_value.tv_usec = 0;
siginterrupt(SIGALRM, 1);
signal(SIGALRM, gotsigalrm); /* first trap signals */
setitimer(ITIMER_REAL,&ntimeout,NULL); /* then start timer */
/* there is a very small window between the next two lines */
+ /* which could result in a deadlock. But this will now be */
+ /* caught by periodical alarms (see it_interval) */
if (!alarm_latch)
pause();
+ /* stop timer */
+ ntimeout.it_interval.tv_sec = ntimeout.it_interval.tv_usec = 0;
+ ntimeout.it_value.tv_sec = ntimeout.it_value.tv_usec = 0;
+ setitimer(ITIMER_REAL,&ntimeout,NULL); /* now stop timer */
signal(SIGALRM, SIG_IGN);
#else
/*
if (!getuid())
signal(SIGHUP, SIG_IGN);
- if (outlevel == O_VERBOSE)
- {
- time_t now;
-
- time(&now);
- fprintf(stderr, "fetchmail: awakened at %s", ctime(&now));
- }
+ if (outlevel >= O_VERBOSE)
+ error(0, -1, "awakened at %s", rfc822timestamp());
}
} while
(run.poll_interval);
- if (outlevel == O_VERBOSE)
- fprintf(stderr,"fetchmail: normal termination, status %d\n",
+ if (outlevel >= O_VERBOSE)
+ error(0, -1, "normal termination, status %d",
successes ? PS_SUCCESS : querystatus);
termhook(0);
FLAG_MERGE(server.interface_pair);
#endif /* linux */
+ FLAG_MERGE(server.plugin);
+ FLAG_MERGE(server.plugout);
FLAG_MERGE(wildcard);
FLAG_MERGE(remotename);
FLAG_MERGE(password);
FLAG_MERGE(mda);
+ FLAG_MERGE(bsmtp);
FLAG_MERGE(smtpaddress);
FLAG_MERGE(preconnect);
+ FLAG_MERGE(postconnect);
FLAG_MERGE(keep);
FLAG_MERGE(flush);
FLAG_MERGE(dropstatus);
FLAG_MERGE(mimedecode);
FLAG_MERGE(limit);
+ FLAG_MERGE(warnings);
FLAG_MERGE(fetchlimit);
FLAG_MERGE(batchlimit);
FLAG_MERGE(expunge);
+
+ FLAG_MERGE(properties);
#undef FLAG_MERGE
}
memset(&def_opts, '\0', sizeof(struct query));
def_opts.smtp_socket = -1;
def_opts.smtpaddress = (char *)0;
- save_str(&def_opts.antispam, (char *)NULL, 0)->val.status.num = 571;
- save_str(&def_opts.antispam, (char *)NULL, 0)->val.status.num = 550;
- save_str(&def_opts.antispam, (char *)NULL, 0)->val.status.num = 501;
+ save_str(&def_opts.antispam, STRING_DUMMY, 0)->val.status.num = 571;
+ save_str(&def_opts.antispam, STRING_DUMMY, 0)->val.status.num = 550;
+ save_str(&def_opts.antispam, STRING_DUMMY, 0)->val.status.num = 501;
def_opts.server.protocol = P_AUTO;
def_opts.server.timeout = CLIENT_TIMEOUT;
+ def_opts.warnings = WARNING_INTERVAL;
def_opts.remotename = user;
def_opts.expunge = 1;
if (!strcmp(ctl->server.pollname, argv[optind])
|| str_in_list(&ctl->server.akalist, argv[optind], TRUE))
{
+ /* Is this correct? */
+ if(predeclared)
+ fprintf(stderr,"Warning: multiple mentions of host %s in config file\n",argv[optind]);
ctl->active = TRUE;
predeclared = TRUE;
}
ctl->server.via =
ctl->server.pollname = xstrdup(argv[optind]);
ctl->active = TRUE;
+ ctl->server.lead_server = (struct hostdata *)NULL;
}
}
if (ctl != querylist && strcmp(ctl->server.pollname, "defaults") == 0)
exit(PS_SYNTAX);
+ /* use localhost if we never fetch the FQDN of this host */
+ fetchmailhost = "localhost";
+
/* merge in wired defaults, do sanity checks and prepare internal fields */
for (ctl = querylist; ctl; ctl = ctl->next)
{
/* force command-line options */
optmerge(ctl, &cmd_opts, TRUE);
- /* make sure we have a nonempty host list to forward to */
- if (!ctl->smtphunt)
- {
- save_str(&ctl->smtphunt, fetchmailhost, FALSE);
- /* for non ETRN try to deliver mails to localhost if
- * fetchmailhost fails
- */
- if (ctl->server.protocol != P_ETRN) {
- save_str(&ctl->smtphunt, "localhost", FALSE);
- }
- }
-
- /* keep lusers from shooting themselves in the foot :-) */
- if (run.poll_interval && ctl->limit)
- {
- fprintf(stderr,"fetchmail: you'd never see large messages!\n");
- exit(PS_SYNTAX);
- }
-
- /* if `user' doesn't name a real local user, try to run as root */
- if ((pw = getpwnam(user)) == (struct passwd *)NULL)
- ctl->uid = 0;
- else
- ctl->uid = pw->pw_uid; /* for local delivery via MDA */
- if (!ctl->localnames) /* for local delivery via SMTP */
- save_str_pair(&ctl->localnames, user, NULL);
-
/* this code enables flags to be turned off */
#define DEFAULT(flag, dflt) if (flag == FLAG_TRUE)\
flag = TRUE;\
DEFAULT(ctl->server.checkalias, FALSE);
#undef DEFAULT
+ /*
+ * DNS support is required for some protocols.
+ *
+ * If we're using ETRN, the smtp hunt list is the list of
+ * systems we're polling on behalf of; these have to be
+ * fully-qualified domain names. The default for this list
+ * should be the FQDN of localhost.
+ *
+ * If we're using Kerberos for authentication, we need
+ * the FQDN in order to generate capability keys.
+ */
+ if (ctl->server.protocol == P_ETRN
+ || ctl->server.preauthenticate == A_KERBEROS_V4
+ || ctl->server.preauthenticate == A_KERBEROS_V5)
+ if (strcmp(fetchmailhost, "localhost") == 0)
+ fetchmailhost = host_fqdn();
+
+ /*
+ * Make sure we have a nonempty host list to forward to.
+ */
+ if (!ctl->smtphunt)
+ save_str(&ctl->smtphunt, fetchmailhost, FALSE);
+
+ /* if `user' doesn't name a real local user, try to run as root */
+ if ((pw = getpwnam(user)) == (struct passwd *)NULL)
+ ctl->uid = 0;
+ else
+ ctl->uid = pw->pw_uid; /* for local delivery via MDA */
+ if (!ctl->localnames) /* for local delivery via SMTP */
+ save_str_pair(&ctl->localnames, user, NULL);
+
#if !defined(HAVE_GETHOSTBYNAME) || !defined(HAVE_RES_SEARCH)
/* can't handle multidrop mailboxes unless we can do DNS lookups */
if (ctl->localnames && ctl->localnames->next && ctl->server.dns)
{
int i, st;
- if (outlevel == O_VERBOSE)
+ if (outlevel >= O_VERBOSE)
{
time_t now;
time(&now);
- fprintf(stderr, "fetchmail: %s querying %s (protocol %s) at %s",
+ error(0, -1, "fetchmail: %s querying %s (protocol %s) at %s",
RELEASE_ID,
ctl->server.pollname, showproto(ctl->server.protocol), ctime(&now));
}
#ifdef POP2_ENABLE
return(doPOP2(ctl));
#else
- fprintf(stderr, "POP2 support is not configured.\n");
+ error(0, -1, "POP2 support is not configured.\n");
return(PS_PROTOCOL);
#endif /* POP2_ENABLE */
break;
#ifdef POP3_ENABLE
return(doPOP3(ctl));
#else
- fprintf(stderr, "POP3 support is not configured.\n");
+ error(0, -1, "POP3 support is not configured.\n");
return(PS_PROTOCOL);
#endif /* POP3_ENABLE */
break;
#ifdef IMAP_ENABLE
return(doIMAP(ctl));
#else
- fprintf(stderr, "IMAP support is not configured.\n");
+ error(0, -1, "IMAP support is not configured.\n");
return(PS_PROTOCOL);
#endif /* IMAP_ENABLE */
break;
case P_ETRN:
#ifndef ETRN_ENABLE
- fprintf(stderr, "ETRN support is not configured.\n");
+ error(0, -1, "ETRN support is not configured.\n");
return(PS_PROTOCOL);
#else
#ifdef HAVE_GETHOSTBYNAME
return(doETRN(ctl));
#else
- fprintf(stderr, "Cannot support ETRN without gethostbyname(2).\n");
+ error(0, -1, "Cannot support ETRN without gethostbyname(2).\n");
return(PS_PROTOCOL);
#endif /* HAVE_GETHOSTBYNAME */
#endif /* ETRN_ENABLE */
if (runp->invisible)
printf("Fetchmail will masquerade and will not generate Received\n");
if (runp->postmaster)
- printf("Fetchmail will forward misaddressed multidrop messages to %s.",
+ printf("Fetchmail will forward misaddressed multidrop messages to %s.\n",
runp->postmaster);
for (ctl = querylist; ctl; ctl = ctl->next)
ctl->server.interval);
if (ctl->server.truename)
printf(" True name of server is %s.\n", ctl->server.truename);
- if (ctl->server.skip || outlevel == O_VERBOSE)
+ if (ctl->server.skip || outlevel >= O_VERBOSE)
printf(" This host will%s be queried when no host is specified.\n",
ctl->server.skip ? " not" : "");
/*
#endif /* GSSAPI */
)
printf(" Password will be prompted for.\n");
- else if (outlevel == O_VERBOSE)
+ else if (outlevel >= O_VERBOSE)
if (ctl->server.protocol == P_APOP)
- printf(" APOP secret = '%s'.\n", visbuf(ctl->password));
+ printf(" APOP secret = \"%s\".\n", visbuf(ctl->password));
else if (ctl->server.protocol == P_RPOP)
- printf(" RPOP id = '%s'.\n", visbuf(ctl->password));
+ printf(" RPOP id = \"%s\".\n", visbuf(ctl->password));
else
- printf(" Password = '%s'.\n", visbuf(ctl->password));
+ printf(" Password = \"%s\".\n", visbuf(ctl->password));
if (ctl->server.protocol == P_POP3
#if INET6
&& !strcmp(ctl->server.service, KPOP_PORT)
#endif /* INET6 */
&& (ctl->server.preauthenticate == A_KERBEROS_V4 ||
ctl->server.preauthenticate == A_KERBEROS_V5))
- printf(" Protocol is KPOP");
+ printf(" Protocol is KPOP with Kerberos %s authentication",
+ ctl->server.preauthenticate == A_KERBEROS_V5 ? "V" : "IV");
else
printf(" Protocol is %s", showproto(ctl->server.protocol));
#if INET6
if (ctl->server.port)
printf(" (using port %d)", ctl->server.port);
#endif /* INET6 */
- else if (outlevel == O_VERBOSE)
+ else if (outlevel >= O_VERBOSE)
printf(" (using default port)");
if (ctl->server.uidl && (ctl->server.protocol != P_ETRN))
printf(" (forcing UIDL use)");
ctl->dropstatus ? "discarded" : "kept",
ctl->dropstatus ? "on" : "off");
if (NUM_NONZERO(ctl->limit))
- printf(" Message size limit is %d bytes (--limit %d).\n",
- ctl->limit, ctl->limit);
- else if (outlevel == O_VERBOSE)
- printf(" No message size limit (--limit 0).\n");
+ {
+ if (NUM_NONZERO(ctl->limit))
+ printf(" Message size limit is %d bytes (--limit %d).\n",
+ ctl->limit, ctl->limit);
+ else if (outlevel >= O_VERBOSE)
+ printf(" No message size limit (--limit 0).\n");
+ if (run.poll_interval > 0)
+ printf(" Message size warning interval is %d seconds (--warnings %d).\n",
+ ctl->warnings, ctl->warnings);
+ else if (outlevel >= O_VERBOSE)
+ printf(" Size warnings on every poll (--warnings 0).\n");
+ }
if (NUM_NONZERO(ctl->fetchlimit))
printf(" Received-message limit is %d (--fetchlimit %d).\n",
ctl->fetchlimit, ctl->fetchlimit);
- else if (outlevel == O_VERBOSE)
+ else if (outlevel >= O_VERBOSE)
printf(" No received-message limit (--fetchlimit 0).\n");
if (NUM_NONZERO(ctl->batchlimit))
printf(" SMTP message batch limit is %d.\n", ctl->batchlimit);
- else if (outlevel == O_VERBOSE)
+ else if (outlevel >= O_VERBOSE)
printf(" No SMTP message batch limit (--batchlimit 0).\n");
if (ctl->server.protocol == P_IMAP)
if (NUM_NONZERO(ctl->expunge))
printf(" Deletion interval between expunges is %d (--expunge %d).\n", ctl->expunge, ctl->expunge);
- else if (outlevel == O_VERBOSE)
+ else if (outlevel >= O_VERBOSE)
printf(" No expunges (--expunge 0).\n");
}
- if (ctl->mda && (ctl->server.protocol != P_ETRN))
- printf(" Messages will be delivered with '%s.'\n", visbuf(ctl->mda));
+ if (ctl->bsmtp)
+ printf(" Messages will be appended to %s as BSMTP\n", visbuf(ctl->bsmtp));
+ else if (ctl->mda && (ctl->server.protocol != P_ETRN))
+ printf(" Messages will be delivered with \"%s\".\n", visbuf(ctl->mda));
else
{
struct idlist *idp;
{
struct idlist *idp;
- printf(" Recognized listener spam block responses are:",
- ctl->antispam);
+ printf(" Recognized listener spam block responses are:");
for (idp = ctl->antispam; idp; idp = idp->next)
printf(" %d", idp->val.status.num);
printf("\n");
}
- else if (outlevel == O_VERBOSE)
+ else if (outlevel >= O_VERBOSE)
printf(" Spam-blocking disabled\n");
}
if (ctl->preconnect)
- printf(" Server connection will be brought up with '%s.'\n",
+ printf(" Server connection will be brought up with \"%s\".\n",
visbuf(ctl->preconnect));
- else if (outlevel == O_VERBOSE)
+ else if (outlevel >= O_VERBOSE)
printf(" No pre-connection command.\n");
if (ctl->postconnect)
- printf(" Server connection will be taken down with '%s.'\n",
+ printf(" Server connection will be taken down with \"%s\".\n",
visbuf(ctl->postconnect));
- else if (outlevel == O_VERBOSE)
+ else if (outlevel >= O_VERBOSE)
printf(" No post-connection command.\n");
if (ctl->server.protocol != P_ETRN) {
if (!ctl->localnames)
printf(" Single-drop mode: ");
printf("%d local name(s) recognized.\n", count);
- if (outlevel == O_VERBOSE)
+ if (outlevel >= O_VERBOSE)
{
for (idp = ctl->localnames; idp; idp = idp->next)
if (idp->val.id2)
{
printf(" Server aliases will be compared with multidrop addresses by ");
if (ctl->server.checkalias)
- printf("IP address.");
+ printf("IP address.\n");
else
- printf("name.");
+ printf("name.\n");
}
if (ctl->server.envelope == STRING_DISABLED)
printf(" Envelope-address routing is disabled\n");
#ifdef linux
if (ctl->server.interface)
printf(" Connection must be through interface %s.\n", ctl->server.interface);
- else if (outlevel == O_VERBOSE)
+ else if (outlevel >= O_VERBOSE)
printf(" No interface requirement specified.\n");
if (ctl->server.monitor)
printf(" Polling loop will monitor %s.\n", ctl->server.monitor);
- else if (outlevel == O_VERBOSE)
+ else if (outlevel >= O_VERBOSE)
printf(" No monitor interface specified.\n");
#endif
+ if (ctl->server.plugin)
+ printf(" Server connections will be mode via plugin %s (--plugin %s).\n", ctl->server.plugin, ctl->server.plugin);
+ else if (outlevel >= O_VERBOSE)
+ printf(" No plugin command specified.\n");
+ if (ctl->server.plugout)
+ printf(" Listener connections will be mode via plugout %s (--plugout %s).\n", ctl->server.plugout, ctl->server.plugout);
+ else if (outlevel >= O_VERBOSE)
+ printf(" No plugout command specified.\n");
+
if (ctl->server.protocol > P_POP2 && (ctl->server.protocol != P_ETRN))
if (!ctl->oldsaved)
printf(" No UIDs saved from this host.\n");
++count;
printf(" %d UIDs saved.\n", count);
- if (outlevel == O_VERBOSE)
+ if (outlevel >= O_VERBOSE)
for (idp = ctl->oldsaved; idp; idp = idp->next)
- fprintf(stderr, "\t%s\n", idp->id);
+ printf("\t%s\n", idp->id);
}
+
+ if (ctl->properties)
+ printf(" Pass-through properties \"%s\".\n",
+ visbuf(ctl->properties));
}
}