X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=options.c;h=d53044fc72c4215ee3e975092acde6fb7819a142;hb=da989f7b8294e342572ec5f27f1a6f3f2b1fe56f;hp=8a7c5a358dd80b81d38e412a1af5066368341904;hpb=8b8c687674b999cc08d92aebac2ca675fb739453;p=~andy%2Ffetchmail diff --git a/options.c b/options.c index 8a7c5a35..d53044fc 100644 --- a/options.c +++ b/options.c @@ -24,6 +24,7 @@ enum { LA_INVISIBLE = 256, + LA_PIDFILE, LA_SYSLOG, LA_NOSYSLOG, LA_POSTMASTER, @@ -44,12 +45,17 @@ enum { 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 }; /* options still left: CgGhHjJoORTWxXYz */ @@ -73,8 +79,11 @@ static const struct option longoptions[] = { {"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' }, @@ -86,6 +95,7 @@ static const struct option longoptions[] = { {"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' }, @@ -122,7 +132,9 @@ static const struct option longoptions[] = { {"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 @@ -215,12 +227,11 @@ static int xatoi(char *s, int *errflagptr) #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 */) { /* * return value: if positive, argv index of last parsed option + 1 @@ -276,7 +287,7 @@ struct query *ctl; /* option record to be initialized */ rctl->logfile = prependdir (optarg, currentwd); break; case LA_INVISIBLE: - rctl->invisible = TRUE; + rctl->invisible = FLAG_TRUE; break; case LA_SHOWDOTS: rctl->showdots = FLAG_TRUE; @@ -288,12 +299,32 @@ struct query *ctl; /* option record to be initialized */ case 'i': 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': /* XXX -- should probably use a table lookup here */ if (strcasecmp(optarg,"auto") == 0) @@ -316,7 +347,7 @@ struct query *ctl; /* option record to be initialized */ else if (strcasecmp(optarg,"kpop") == 0) { ctl->server.protocol = P_POP3; - ctl->server.service = KPOP_PORT; + ctl->server.service = xstrdup(KPOP_PORT); #ifdef KERBEROS_V5 ctl->server.authenticate = A_KERBEROS_V5; #else @@ -358,6 +389,8 @@ struct query *ctl; /* option record to be initialized */ ctl->server.authenticate = A_KERBEROS_V4; 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) @@ -454,7 +487,7 @@ struct query *ctl; /* option record to be initialized */ 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 @@ -529,10 +562,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; @@ -592,8 +633,11 @@ 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")); + 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")); @@ -603,12 +647,16 @@ struct query *ctl; /* option record to be initialized */ P(GT_(" --sslkey ssl private key file\n")); P(GT_(" --sslcert ssl client certificate\n")); P(GT_(" --sslcertck do strict server certificate check (recommended)\n")); - P(GT_(" --sslcertpath path to ssl certificates\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 (ssl2/ssl3/tls1)\n")); + P(GT_(" --sslproto force ssl protocol (SSL2/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_(" -p, --protocol specify retrieval protocol (see man page)\n")); P(GT_(" -U, --uidl force the use of UIDLs (pop3 only)\n")); @@ -622,7 +670,7 @@ struct query *ctl; /* option record to be initialized */ 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"));