X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=options.c;h=5f1739c4f6e4cdbb50c2f1975f6367ca5ff0913b;hb=87bcf29364c4640edb87cc2186b965d1a564d70c;hp=f52fd6fff3972b85f7d8dfaabe1ff44389c015d7;hpb=0d8a8b913f6a15088523bc69cbcf6240de945cda;p=~andy%2Ffetchmail diff --git a/options.c b/options.c index f52fd6ff..5f1739c4 100644 --- a/options.c +++ b/options.c @@ -11,180 +11,160 @@ #include #include #include -#if defined(STDC_HEADERS) #include #include -#else -#include -#endif #include "getopt.h" #include "fetchmail.h" -#include "i18n.h" - -#define LA_HELP 1 -#define LA_VERSION 2 -#define LA_CHECK 3 -#define LA_SILENT 4 -#define LA_VERBOSE 5 -#define LA_DAEMON 6 -#define LA_NODETACH 7 -#define LA_QUIT 8 -#define LA_LOGFILE 9 -#define LA_INVISIBLE 10 -#define LA_SYSLOG 11 -#define LA_NOSYSLOG 12 -#define LA_RCFILE 13 -#define LA_IDFILE 14 -#define LA_POSTMASTER 15 -#define LA_NOBOUNCE 16 -#define LA_PROTOCOL 17 -#define LA_UIDL 18 -#define LA_PORT 19 -#define LA_AUTH 20 -#define LA_TIMEOUT 21 -#define LA_ENVELOPE 22 -#define LA_QVIRTUAL 23 -#define LA_USERNAME 24 -#define LA_ALL 25 -#define LA_NOKEEP 26 -#define LA_KEEP 27 -#define LA_FLUSH 28 -#define LA_NOREWRITE 29 -#define LA_LIMIT 30 -#define LA_WARNINGS 31 -#define LA_FOLDER 32 -#define LA_SMTPHOST 33 -#define LA_FETCHDOMAINS 34 -#define LA_SMTPADDR 35 -#define LA_ANTISPAM 36 -#define LA_BATCHLIMIT 37 -#define LA_FETCHLIMIT 38 -#define LA_EXPUNGE 39 -#define LA_MDA 40 -#define LA_BSMTP 41 -#define LA_LMTP 42 -#define LA_PLUGIN 43 -#define LA_PLUGOUT 44 -#define LA_NETSEC 45 -#define LA_INTERFACE 46 -#define LA_MONITOR 47 -#define LA_CONFIGDUMP 48 -#define LA_YYDEBUG 49 -#define LA_SMTPNAME 50 -#define LA_SHOWDOTS 51 -#define LA_PRINCIPAL 52 -#define LA_TRACEPOLLS 53 +#include "gettext.h" + +enum { + LA_INVISIBLE = 256, + LA_PIDFILE, + LA_SYSLOG, + LA_NOSYSLOG, + LA_POSTMASTER, + LA_NOBOUNCE, + LA_AUTH, + LA_FETCHDOMAINS, + LA_BSMTP, + LA_LMTP, + LA_PLUGIN, + LA_PLUGOUT, + LA_CONFIGDUMP, + LA_SMTPNAME, + LA_SHOWDOTS, + LA_PRINCIPAL, + LA_TRACEPOLLS, + LA_SSL, + LA_SSLKEY, + LA_SSLCERT, + LA_SSLPROTO, + LA_SSLCERTCK, + LA_SSLCERTFILE, + LA_SSLCERTPATH, + LA_SSLCOMMONNAME, + LA_SSLFINGERPRINT, + LA_FETCHSIZELIMIT, + LA_FASTUIDL, + LA_LIMITFLUSH, + LA_IDLE, + LA_NOSOFTBOUNCE, + LA_SOFTBOUNCE, + LA_BADHEADER, + LA_RETRIEVEERROR +}; -#ifdef SSL_ENABLE -#define LA_SSL 54 -#define LA_SSLKEY 55 -#define LA_SSLCERT 56 -#define LA_SSLPROTO 57 -#define LA_SSLCERTCK 58 -#define LA_SSLCERTPATH 59 -#define LA_SSLFINGERPRINT 60 +static const char *shortoptions = +/* options still left: ghHjJoRTWxXYz */ +#ifdef HAVE_LIBPWMD + "O:C:G:" #endif - -#define LA_FETCHSIZELIMIT 61 -#define LA_FASTUIDL 62 - -/* options still left: CDgGhHjJoORwWxXYz */ -static const char *shortoptions = - "?Vcsvd:NqL:f:i:p:UP:A:t:E:Q:u:akKFnl:r:S:Z:b:B:e:m:T:I:M:yw:D:"; + "?Vcsvd:NqL:f:i:p:UP:A:t:E:Q:u:akKFnl:r:S:Z:b:B:e:m:I:M:yw:D:"; static const struct option longoptions[] = { /* this can be const because all flag fields are 0 and will never get set */ - {"help", no_argument, (int *) 0, LA_HELP }, - {"version", no_argument, (int *) 0, LA_VERSION }, - {"check", no_argument, (int *) 0, LA_CHECK }, - {"silent", no_argument, (int *) 0, LA_SILENT }, - {"verbose", no_argument, (int *) 0, LA_VERBOSE }, - {"daemon", required_argument, (int *) 0, LA_DAEMON }, - {"nodetach", no_argument, (int *) 0, LA_NODETACH }, - {"quit", no_argument, (int *) 0, LA_QUIT }, - {"logfile", required_argument, (int *) 0, LA_LOGFILE }, - {"invisible", no_argument, (int *) 0, LA_INVISIBLE }, - {"showdots", no_argument, (int *) 0, LA_SHOWDOTS }, - {"syslog", no_argument, (int *) 0, LA_SYSLOG }, - {"nosyslog", no_argument, (int *) 0, LA_NOSYSLOG }, - {"fetchmailrc",required_argument,(int *) 0, LA_RCFILE }, - {"idfile", required_argument, (int *) 0, LA_IDFILE }, - {"postmaster",required_argument, (int *) 0, LA_POSTMASTER }, - {"nobounce", no_argument, (int *) 0, LA_NOBOUNCE }, - - {"protocol", required_argument, (int *) 0, LA_PROTOCOL }, - {"proto", required_argument, (int *) 0, LA_PROTOCOL }, - {"uidl", no_argument, (int *) 0, LA_UIDL }, - {"port", required_argument, (int *) 0, LA_PORT }, +#ifdef HAVE_LIBPWMD + {"pwmd-socket", required_argument, (int *) 0, 'C' }, + {"pwmd-file", required_argument, (int *) 0, 'G' }, + {"pinentry-timeout", required_argument, (int *) 0, 'O' }, +#endif + {"help", no_argument, (int *) 0, '?' }, + {"version", no_argument, (int *) 0, 'V' }, + {"check", no_argument, (int *) 0, 'c' }, + {"silent", no_argument, (int *) 0, 's' }, + {"verbose", no_argument, (int *) 0, 'v' }, + {"daemon", required_argument, (int *) 0, 'd' }, + {"nodetach", no_argument, (int *) 0, 'N' }, + {"quit", no_argument, (int *) 0, 'q' }, + {"logfile", required_argument, (int *) 0, 'L' }, + {"invisible", no_argument, (int *) 0, LA_INVISIBLE }, + {"showdots", no_argument, (int *) 0, LA_SHOWDOTS }, + {"syslog", no_argument, (int *) 0, LA_SYSLOG }, + {"nosyslog", no_argument, (int *) 0, LA_NOSYSLOG }, + {"fetchmailrc",required_argument,(int *) 0, 'f' }, + {"idfile", required_argument, (int *) 0, 'i' }, + {"pidfile", required_argument, (int *) 0, LA_PIDFILE }, + {"postmaster",required_argument, (int *) 0, LA_POSTMASTER }, + {"nobounce", no_argument, (int *) 0, LA_NOBOUNCE }, + {"nosoftbounce", no_argument, (int *) 0, LA_NOSOFTBOUNCE }, + {"softbounce", no_argument, (int *) 0, LA_SOFTBOUNCE }, + + {"protocol", required_argument, (int *) 0, 'p' }, + {"proto", required_argument, (int *) 0, 'p' }, + {"uidl", no_argument, (int *) 0, 'U' }, + {"idle", no_argument, (int *) 0, LA_IDLE}, + {"port", required_argument, (int *) 0, 'P' }, + {"service", required_argument, (int *) 0, 'P' }, {"auth", required_argument, (int *) 0, LA_AUTH}, - {"timeout", required_argument, (int *) 0, LA_TIMEOUT }, - {"envelope", required_argument, (int *) 0, LA_ENVELOPE }, - {"qvirtual", required_argument, (int *) 0, LA_QVIRTUAL }, - - {"user", required_argument, (int *) 0, LA_USERNAME }, - {"username", required_argument, (int *) 0, LA_USERNAME }, - - {"all", no_argument, (int *) 0, LA_ALL }, - {"nokeep", no_argument, (int *) 0, LA_NOKEEP }, - {"keep", no_argument, (int *) 0, LA_KEEP }, - {"flush", no_argument, (int *) 0, LA_FLUSH }, - {"norewrite", no_argument, (int *) 0, LA_NOREWRITE }, - {"limit", required_argument, (int *) 0, LA_LIMIT }, - {"warnings", required_argument, (int *) 0, LA_WARNINGS }, - - {"folder", required_argument, (int *) 0, LA_FOLDER }, - {"smtphost", required_argument, (int *) 0, LA_SMTPHOST }, - {"fetchdomains", required_argument, (int *) 0, LA_FETCHDOMAINS }, - {"smtpaddress", required_argument, (int *) 0, LA_SMTPADDR }, - {"smtpname", required_argument, (int *) 0, LA_SMTPNAME }, - {"antispam", required_argument, (int *) 0, LA_ANTISPAM }, - - {"batchlimit",required_argument, (int *) 0, LA_BATCHLIMIT }, - {"fetchlimit",required_argument, (int *) 0, LA_FETCHLIMIT }, - {"fetchsizelimit",required_argument, (int *) 0, LA_FETCHSIZELIMIT }, - {"fastuidl", required_argument, (int *) 0, LA_FASTUIDL }, - {"expunge", required_argument, (int *) 0, LA_EXPUNGE }, - {"mda", required_argument, (int *) 0, LA_MDA }, - {"bsmtp", required_argument, (int *) 0, LA_BSMTP }, - {"lmtp", no_argument, (int *) 0, LA_LMTP }, - -#ifdef INET6_ENABLE - {"netsec", required_argument, (int *) 0, LA_NETSEC }, -#endif /* INET6_ENABLE */ + {"timeout", required_argument, (int *) 0, 't' }, + {"envelope", required_argument, (int *) 0, 'E' }, + {"qvirtual", required_argument, (int *) 0, 'Q' }, + {"bad-header",required_argument, (int *) 0, LA_BADHEADER}, + + {"user", required_argument, (int *) 0, 'u' }, + {"username", required_argument, (int *) 0, 'u' }, + + {"all", no_argument, (int *) 0, 'a' }, + {"fetchall", no_argument, (int *) 0, 'a' }, + {"nokeep", no_argument, (int *) 0, 'K' }, + {"keep", no_argument, (int *) 0, 'k' }, + {"flush", no_argument, (int *) 0, 'F' }, + {"limitflush", no_argument, (int *) 0, LA_LIMITFLUSH }, + {"norewrite", no_argument, (int *) 0, 'n' }, + {"limit", required_argument, (int *) 0, 'l' }, + {"warnings", required_argument, (int *) 0, 'w' }, + {"retrieve-error", required_argument, (int *) 0, LA_RETRIEVEERROR }, + + {"folder", required_argument, (int *) 0, 'r' }, + {"smtphost", required_argument, (int *) 0, 'S' }, + {"fetchdomains", required_argument, (int *) 0, LA_FETCHDOMAINS }, + {"smtpaddress", required_argument, (int *) 0, 'D' }, + {"smtpname", required_argument, (int *) 0, LA_SMTPNAME }, + {"antispam", required_argument, (int *) 0, 'Z' }, + + {"batchlimit",required_argument, (int *) 0, 'b' }, + {"fetchlimit",required_argument, (int *) 0, 'B' }, + {"fetchsizelimit",required_argument, (int *) 0, LA_FETCHSIZELIMIT }, + {"fastuidl", required_argument, (int *) 0, LA_FASTUIDL }, + {"expunge", required_argument, (int *) 0, 'e' }, + {"mda", required_argument, (int *) 0, 'm' }, + {"bsmtp", required_argument, (int *) 0, LA_BSMTP }, + {"lmtp", no_argument, (int *) 0, LA_LMTP }, #ifdef SSL_ENABLE - {"ssl", no_argument, (int *) 0, LA_SSL }, - {"sslkey", required_argument, (int *) 0, LA_SSLKEY }, - {"sslcert", required_argument, (int *) 0, LA_SSLCERT }, - {"sslproto", required_argument, (int *) 0, LA_SSLPROTO }, - {"sslcertck", no_argument, (int *) 0, LA_SSLCERTCK }, + {"ssl", no_argument, (int *) 0, LA_SSL }, + {"sslkey", required_argument, (int *) 0, LA_SSLKEY }, + {"sslcert", required_argument, (int *) 0, LA_SSLCERT }, + {"sslproto", required_argument, (int *) 0, LA_SSLPROTO }, + {"sslcertck", no_argument, (int *) 0, LA_SSLCERTCK }, + {"sslcertfile", required_argument, (int *) 0, LA_SSLCERTFILE }, {"sslcertpath", required_argument, (int *) 0, LA_SSLCERTPATH }, + {"sslcommonname", required_argument, (int *) 0, LA_SSLCOMMONNAME }, {"sslfingerprint", required_argument, (int *) 0, LA_SSLFINGERPRINT }, #endif {"principal", required_argument, (int *) 0, LA_PRINCIPAL }, -#if (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) - {"interface", required_argument, (int *) 0, LA_INTERFACE }, - {"monitor", required_argument, (int *) 0, LA_MONITOR }, -#endif /* (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) */ - {"plugin", required_argument, (int *) 0, LA_PLUGIN }, - {"plugout", required_argument, (int *) 0, LA_PLUGOUT }, +#ifdef CAN_MONITOR + {"interface", required_argument, (int *) 0, 'I' }, + {"monitor", required_argument, (int *) 0, 'M' }, +#endif /* CAN_MONITOR */ + {"plugin", required_argument, (int *) 0, LA_PLUGIN }, + {"plugout", required_argument, (int *) 0, LA_PLUGOUT }, - {"configdump",no_argument, (int *) 0, LA_CONFIGDUMP }, + {"configdump",no_argument, (int *) 0, LA_CONFIGDUMP }, - {"yydebug", no_argument, (int *) 0, LA_YYDEBUG }, + {"yydebug", no_argument, (int *) 0, 'y' }, - {"tracepolls",no_argument, (int *) 0, LA_TRACEPOLLS }, + {"tracepolls",no_argument, (int *) 0, LA_TRACEPOLLS }, - {(char *) 0, no_argument, (int *) 0, 0 } + {(char *) 0, no_argument, (int *) 0, 0 } }; static int xatoi(char *s, int *errflagptr) /* do safe conversion from string to number */ { -#if defined (STDC_HEADERS) && defined (LONG_MAX) && defined (INT_MAX) /* parse and convert numbers, but also check for invalid characters in * numbers */ @@ -215,49 +195,16 @@ static int xatoi(char *s, int *errflagptr) } return (int) value; /* shut up, I know what I'm doing */ -#else - int i; - char *dp; -# if defined (STDC_HEADERS) - size_t len; -# else - int len; -# endif - - /* We do only base 10 conversions here (atoi)! */ - - len = strlen(s); - /* check for leading white spaces */ - for (i = 0; (i < len) && isspace(s[i]); i++) - ; - - dp = &s[i]; - - /* check for +/- */ - if (i < len && (s[i] == '+' || s[i] == '-')) i++; - - /* skip over digits */ - for ( /* no init */ ; (i < len) && isdigit(s[i]); i++) - ; - - /* check for trailing garbage */ - if (i != len) { - (void) fprintf(stderr, GT_("String '%s' is not a valid number string.\n"), s); - (*errflagptr)++; - return 0; - } - - /* atoi should be safe by now, except for number range over/underflow */ - return atoi(dp); -#endif } -int parsecmdline (argc, argv, rctl, ctl) -/* parse and validate the command line options */ -int argc; /* argument count */ -char **argv; /* argument strings */ -struct runctl *rctl; /* global run controls to modify */ -struct query *ctl; /* option record to be initialized */ +/** parse and validate the command line options */ +int parsecmdline (int argc /** argument count */, + char **argv /** argument strings */, + struct runctl *rctl /** global run controls to modify */, + struct query *ctl /** option record to initialize */, + flag *safewithbg /** set to whether options are + compatible with another copy + running in the background */) { /* * return value: if positive, argv index of last parsed option + 1 @@ -272,9 +219,12 @@ struct query *ctl; /* option record to be initialized */ int errflag = 0; /* TRUE when a syntax error is detected */ int helpflag = 0; /* TRUE when option help was explicitly requested */ int option_index; + int option_safe; /* to track if option currently parsed is safe + with a background copy */ char *buf, *cp; rctl->poll_interval = -1; + *safewithbg = TRUE; memset(ctl, '\0', sizeof(struct query)); /* start clean */ ctl->smtp_socket = -1; @@ -283,94 +233,109 @@ struct query *ctl; /* option record to be initialized */ (c = getopt_long(argc,argv,shortoptions, longoptions, &option_index)) != -1) { + option_safe = FALSE; + switch (c) { +#ifdef HAVE_LIBPWMD + case 'C': + ctl->pwmd_socket = prependdir(optarg, currentwd); + break; + case 'G': + ctl->pwmd_file = xstrdup(optarg); + break; + case 'O': + rctl->pinentry_timeout = atoi(optarg); + break; +#endif case 'V': - case LA_VERSION: versioninfo = TRUE; + option_safe = TRUE; break; case 'c': - case LA_CHECK: check_only = TRUE; break; case 's': - case LA_SILENT: outlevel = O_SILENT; + option_safe = 1; break; case 'v': - case LA_VERBOSE: - if (outlevel == O_VERBOSE) + if (outlevel >= O_VERBOSE) outlevel = O_DEBUG; else outlevel = O_VERBOSE; + option_safe = TRUE; break; case 'd': - case LA_DAEMON: rctl->poll_interval = xatoi(optarg, &errflag); break; case 'N': - case LA_NODETACH: nodetach = TRUE; break; case 'q': - case LA_QUIT: quitmode = TRUE; + quitind = optind; break; case 'L': - case LA_LOGFILE: rctl->logfile = prependdir (optarg, currentwd); break; case LA_INVISIBLE: - rctl->invisible = TRUE; + rctl->invisible = FLAG_TRUE; break; case LA_SHOWDOTS: rctl->showdots = FLAG_TRUE; break; case 'f': - case LA_RCFILE: + xfree(rcfile); rcfile = prependdir (optarg, currentwd); break; case 'i': - case LA_IDFILE: rctl->idfile = prependdir (optarg, currentwd); break; + case LA_PIDFILE: + rctl->pidfile = prependdir (optarg, currentwd); + break; case LA_POSTMASTER: rctl->postmaster = (char *) xstrdup(optarg); break; case LA_NOBOUNCE: - run.bouncemail = FALSE; + rctl->bouncemail = FLAG_FALSE; + break; + case LA_NOSOFTBOUNCE: + rctl->softbounce = FLAG_FALSE; + break; + case LA_SOFTBOUNCE: + rctl->softbounce = FLAG_TRUE; break; + case LA_BADHEADER: + if (strcasecmp(optarg,"accept") == 0) { + ctl->server.badheader = BHACCEPT; + } else if (strcasecmp(optarg,"reject") == 0) { + ctl->server.badheader = BHREJECT; + } else { + fprintf(stderr,GT_("Invalid bad-header policy `%s' specified.\n"), optarg); + errflag++; + } + break; + case 'p': - case LA_PROTOCOL: /* XXX -- should probably use a table lookup here */ if (strcasecmp(optarg,"auto") == 0) ctl->server.protocol = P_AUTO; - else if (strcasecmp(optarg,"pop2") == 0) - ctl->server.protocol = P_POP2; #ifdef SDPS_ENABLE else if (strcasecmp(optarg,"sdps") == 0) { - ctl->server.protocol = P_POP3; - ctl->server.sdps = TRUE; + ctl->server.protocol = P_POP3; + ctl->server.sdps = TRUE; } #endif /* SDPS_ENABLE */ else if (strcasecmp(optarg,"pop3") == 0) ctl->server.protocol = P_POP3; - else if (strcasecmp(optarg,"apop") == 0) - ctl->server.protocol = P_APOP; - else if (strcasecmp(optarg,"rpop") == 0) - ctl->server.protocol = P_RPOP; else if (strcasecmp(optarg,"kpop") == 0) { ctl->server.protocol = P_POP3; -#if INET6_ENABLE - ctl->server.service = KPOP_PORT; -#else /* INET6_ENABLE */ - ctl->server.port = KPOP_PORT; -#endif /* INET6_ENABLE */ + ctl->server.service = xstrdup(KPOP_PORT); #ifdef KERBEROS_V5 ctl->server.authenticate = A_KERBEROS_V5; -#else - ctl->server.authenticate = A_KERBEROS_V4; #endif /* KERBEROS_V5 */ } else if (strcasecmp(optarg,"imap") == 0) @@ -385,32 +350,27 @@ struct query *ctl; /* option record to be initialized */ } break; case 'U': - case LA_UIDL: - ctl->server.uidl = FLAG_TRUE; + /* EMPTY - removed in 7.0.0 */ + break; + case LA_IDLE: + ctl->idle = FLAG_TRUE; break; case 'P': - case LA_PORT: -#if INET6_ENABLE ctl->server.service = optarg; -#else /* INET6_ENABLE */ - ctl->server.port = xatoi(optarg, &errflag); -#endif /* INET6_ENABLE */ break; case LA_AUTH: if (strcmp(optarg, "password") == 0) ctl->server.authenticate = A_PASSWORD; - else if (strcmp(optarg, "kerberos") == 0) #ifdef KERBEROS_V5 + else if (strcmp(optarg, "kerberos") == 0) ctl->server.authenticate = A_KERBEROS_V5; -#else - ctl->server.authenticate = A_KERBEROS_V4; -#endif /* KERBEROS_V5 */ else if (strcmp(optarg, "kerberos_v5") == 0) ctl->server.authenticate = A_KERBEROS_V5; - else if (strcmp(optarg, "kerberos_v4") == 0) - ctl->server.authenticate = A_KERBEROS_V4; +#endif /* KERBEROS_V5 */ else if (strcmp(optarg, "ssh") == 0) ctl->server.authenticate = A_SSH; + else if (strcasecmp(optarg, "external") == 0) + ctl->server.authenticate = A_EXTERNAL; else if (strcmp(optarg, "otp") == 0) ctl->server.authenticate = A_OTP; else if (strcmp(optarg, "opie") == 0) @@ -425,111 +385,102 @@ struct query *ctl; /* option record to be initialized */ ctl->server.authenticate = A_GSSAPI; else if (strcmp(optarg, "any") == 0) ctl->server.authenticate = A_ANY; + else if (strcmp(optarg, "msn") == 0) + ctl->server.authenticate = A_MSN; + else if (strcmp(optarg, "apop") == 0) + ctl->server.authenticate = A_APOP; else { fprintf(stderr,GT_("Invalid authentication `%s' specified.\n"), optarg); errflag++; } break; case 't': - case LA_TIMEOUT: ctl->server.timeout = xatoi(optarg, &errflag); if (ctl->server.timeout == 0) ctl->server.timeout = -1; break; case 'E': - case LA_ENVELOPE: ctl->server.envelope = xstrdup(optarg); break; case 'Q': - case LA_QVIRTUAL: ctl->server.qvirtual = xstrdup(optarg); break; case 'u': - case LA_USERNAME: ctl->remotename = xstrdup(optarg); break; case 'a': - case LA_ALL: ctl->fetchall = FLAG_TRUE; break; case 'K': - case LA_NOKEEP: ctl->keep = FLAG_FALSE; break; case 'k': - case LA_KEEP: ctl->keep = FLAG_TRUE; break; case 'F': - case LA_FLUSH: ctl->flush = FLAG_TRUE; break; + case LA_LIMITFLUSH: + ctl->limitflush = FLAG_TRUE; + break; case 'n': - case LA_NOREWRITE: ctl->rewrite = FLAG_FALSE; break; case 'l': - case LA_LIMIT: c = xatoi(optarg, &errflag); ctl->limit = NUM_VALUE_IN(c); break; case 'r': - case LA_FOLDER: - xalloca(buf, char *, strlen(optarg) + 1); - strcpy(buf, optarg); + buf = xstrdup(optarg); cp = strtok(buf, ","); do { save_str(&ctl->mailboxes, cp, 0); } while ((cp = strtok((char *)NULL, ","))); + free(buf); break; case 'S': - case LA_SMTPHOST: - xalloca(buf, char *, strlen(optarg) + 1); - strcpy(buf, optarg); + buf = xstrdup(optarg); cp = strtok(buf, ","); do { save_str(&ctl->smtphunt, cp, TRUE); } while ((cp = strtok((char *)NULL, ","))); + free(buf); ocount++; break; case LA_FETCHDOMAINS: - xalloca(buf, char *, strlen(optarg) + 1); - strcpy(buf, optarg); + buf = xstrdup(optarg); cp = strtok(buf, ","); do { save_str(&ctl->domainlist, cp, TRUE); } while ((cp = strtok((char *)NULL, ","))); + free(buf); break; case 'D': - case LA_SMTPADDR: ctl->smtpaddress = xstrdup(optarg); break; case LA_SMTPNAME: ctl->smtpname = xstrdup(optarg); break; case 'Z': - case LA_ANTISPAM: - xalloca(buf, char *, strlen(optarg) + 1); - strcpy(buf, optarg); + buf = xstrdup(optarg); cp = strtok(buf, ","); do { - struct idlist *idp = save_str(&ctl->antispam, NULL, 0);; + struct idlist *idp = save_str(&ctl->antispam, STRING_DUMMY, 0); idp->val.status.num = xatoi(cp, &errflag); } while ((cp = strtok((char *)NULL, ","))); + free(buf); break; case 'b': - case LA_BATCHLIMIT: c = xatoi(optarg, &errflag); ctl->batchlimit = NUM_VALUE_IN(c); break; case 'B': - case LA_FETCHLIMIT: c = xatoi(optarg, &errflag); ctl->fetchlimit = NUM_VALUE_IN(c); break; @@ -542,12 +493,10 @@ struct query *ctl; /* option record to be initialized */ ctl->fastuidl = NUM_VALUE_IN(c); break; case 'e': - case LA_EXPUNGE: c = xatoi(optarg, &errflag); ctl->expunge = NUM_VALUE_IN(c); break; case 'm': - case LA_MDA: ctl->mda = xstrdup(optarg); ocount++; break; @@ -559,26 +508,14 @@ struct query *ctl; /* option record to be initialized */ ctl->listener = LMTP_MODE; break; - case 'T': - case LA_NETSEC: -#if NET_SECURITY - ctl->server.netsec = (void *)optarg; -#else - fprintf(stderr, GT_("fetchmail: network security support is disabled\n")); - errflag++; -#endif /* NET_SECURITY */ - break; - -#if (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) +#ifdef CAN_MONITOR case 'I': - case LA_INTERFACE: interface_parse(optarg, &ctl->server); break; case 'M': - case LA_MONITOR: ctl->server.monitor = xstrdup(optarg); break; -#endif /* (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) */ +#endif /* CAN_MONITOR */ case LA_PLUGIN: ctl->server.plugin = xstrdup(optarg); break; @@ -607,10 +544,18 @@ struct query *ctl; /* option record to be initialized */ ctl->sslcertck = FLAG_TRUE; break; + case LA_SSLCERTFILE: + ctl->sslcertfile = prependdir(optarg, currentwd); + break; + case LA_SSLCERTPATH: ctl->sslcertpath = prependdir(optarg, currentwd); break; + case LA_SSLCOMMONNAME: + ctl->sslcommonname = xstrdup(optarg); + break; + case LA_SSLFINGERPRINT: ctl->sslfingerprint = xstrdup(optarg); break; @@ -621,18 +566,17 @@ struct query *ctl; /* option record to be initialized */ break; case 'y': - case LA_YYDEBUG: yydebug = TRUE; break; case 'w': - case LA_WARNINGS: c = xatoi(optarg, &errflag); ctl->warnings = NUM_VALUE_IN(c); break; case LA_CONFIGDUMP: configdump = TRUE; + option_safe = TRUE; break; case LA_SYSLOG: @@ -643,20 +587,34 @@ struct query *ctl; /* option record to be initialized */ rctl->use_syslog = FLAG_FALSE; break; - case LA_TRACEPOLLS: - ctl->tracepolls = FLAG_TRUE; - break; + case LA_TRACEPOLLS: + ctl->server.tracepolls = FLAG_TRUE; + break; + + case LA_RETRIEVEERROR: + if (strcasecmp(optarg,"abort") == 0) { + ctl->server.retrieveerror = RE_ABORT; + } else if (strcasecmp(optarg,"continue") == 0) { + ctl->server.retrieveerror = RE_CONTINUE; + } else if (strcasecmp(optarg,"markseen") == 0) { + ctl->server.retrieveerror = RE_MARKSEEN; + } else { + fprintf(stderr,GT_("Invalid retrieve-error policy `%s' specified.\n"), optarg); + errflag++; + } + break; case '?': - case LA_HELP: + helpflag = 1; default: - helpflag++; + break; } + *safewithbg &= option_safe; } if (errflag || ocount > 1 || helpflag) { /* squawk if syntax errors were detected */ -#define P(s) fputs(s, helpflag ? stdout : stderr) +#define P(s) fputs(s, helpflag ? stdout : stderr) P(GT_("usage: fetchmail [options] [server ...]\n")); P(GT_(" Options are as follows:\n")); P(GT_(" -?, --help display this option help\n")); @@ -673,9 +631,12 @@ struct query *ctl; /* option record to be initialized */ P(GT_(" --invisible don't write Received & enable host spoofing\n")); P(GT_(" -f, --fetchmailrc specify alternate run control file\n")); P(GT_(" -i, --idfile specify alternate UIDs file\n")); + P(GT_(" --pidfile specify alternate PID (lock) file\n")); P(GT_(" --postmaster specify recipient of last resort\n")); P(GT_(" --nobounce redirect bounces from user to postmaster.\n")); -#if (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) + P(GT_(" --nosoftbounce fetchmail deletes permanently undeliverable messages.\n")); + P(GT_(" --softbounce keep permanently undeliverable messages on server (default).\n")); +#ifdef CAN_MONITOR P(GT_(" -I, --interface interface required specification\n")); P(GT_(" -M, --monitor monitor interface for activity\n")); #endif @@ -683,33 +644,46 @@ struct query *ctl; /* option record to be initialized */ P(GT_(" --ssl enable ssl encrypted session\n")); P(GT_(" --sslkey ssl private key file\n")); P(GT_(" --sslcert ssl client certificate\n")); - P(GT_(" --sslproto force ssl protocol (ssl2/ssl3/tls1)\n")); + P(GT_(" --sslcertck do strict server certificate check (recommended)\n")); + P(GT_(" --sslcertfile path to trusted-CA ssl certificate file\n")); + P(GT_(" --sslcertpath path to trusted-CA ssl certificate directory\n")); + P(GT_(" --sslcommonname expect this CommonName from server (discouraged)\n")); + P(GT_(" --sslfingerprint fingerprint that must match that of the server's cert.\n")); + P(GT_(" --sslproto force ssl protocol (SSL23/SSL3/TLS1)\n")); #endif P(GT_(" --plugin specify external command to open connection\n")); P(GT_(" --plugout specify external command to open smtp connection\n")); + P(GT_(" --bad-header {reject|accept}\n" + " specify policy for handling messages with bad headers\n")); + P(GT_(" --retrieve-error {abort|continue|markseen}\n" + " specify policy for processing messages with retrieve errors\n")); P(GT_(" -p, --protocol specify retrieval protocol (see man page)\n")); - P(GT_(" -U, --uidl force the use of UIDLs (pop3 only)\n")); - P(GT_(" -P, --port TCP/IP service port to connect to\n")); +#ifdef HAVE_LIBPWMD + P(GT_(" -C, --pwmd-socket pwmd socket path (~/.pwmd/socket)\n")); + P(GT_(" -G, --pwmd-file filename to use on the pwmd server\n")); + P(GT_(" -O, --pinentry-timeout seconds until pinentry is canceled\n")); +#endif + + P(GT_(" --port TCP port to connect to (obsolete, use --service)\n")); + P(GT_(" -P, --service TCP service to connect to (can be numeric TCP port)\n")); P(GT_(" --auth authentication type (password/kerberos/ssh/otp)\n")); P(GT_(" -t, --timeout server nonresponse timeout\n")); P(GT_(" -E, --envelope envelope address header\n")); P(GT_(" -Q, --qvirtual prefix to remove from local user id\n")); P(GT_(" --principal mail service principal\n")); - P(GT_(" --tracepolls add poll-tracing information to Received header\n")); + P(GT_(" --tracepolls add poll-tracing information to Received header\n")); P(GT_(" -u, --username specify users's login on server\n")); - P(GT_(" -a, --all retrieve old and new messages\n")); + P(GT_(" -a, --[fetch]all retrieve old and new messages\n")); P(GT_(" -K, --nokeep delete new messages after retrieval\n")); P(GT_(" -k, --keep save new messages after retrieval\n")); P(GT_(" -F, --flush delete old messages from server\n")); + P(GT_(" --limitflush delete oversized messages\n")); P(GT_(" -n, --norewrite don't rewrite header addresses\n")); P(GT_(" -l, --limit don't fetch messages over given size\n")); P(GT_(" -w, --warnings interval between warning mail notification\n")); -#if NET_SECURITY - P(GT_(" -T, --netsec set IP security request\n")); -#endif /* NET_SECURITY */ P(GT_(" -S, --smtphost set SMTP forwarding host\n")); P(GT_(" --fetchdomains fetch mail for specified domains\n")); P(GT_(" -D, --smtpaddress set SMTP delivery domain to use\n")); @@ -720,12 +694,16 @@ struct query *ctl; /* option record to be initialized */ P(GT_(" --fetchsizelimit set fetch message size limit\n")); P(GT_(" --fastuidl do a binary search for UIDLs\n")); P(GT_(" -e, --expunge set max deletions between expunges\n")); - P(GT_(" -m, --mda set MDA to use for forwarding\n")); - P(GT_(" --bsmtp set output BSMTP file\n")); - P(GT_(" --lmtp use LMTP (RFC2033) for delivery\n")); + P(GT_(" -m, --mda set MDA to use for forwarding\n")); + P(GT_(" --bsmtp set output BSMTP file\n")); + P(GT_(" --lmtp use LMTP (RFC2033) for delivery\n")); P(GT_(" -r, --folder specify remote folder name\n")); P(GT_(" --showdots show progress dots even in logfiles\n")); #undef P + /* undocumented: + * --configdump (internal use by fetchmailconf, dumps + * configuration as Python source code) + * --yydebug (developer use, enables parser debugging) */ if (helpflag) exit(PS_SUCCESS);