#include <stdio.h>
#include <pwd.h>
#include <string.h>
+#include <errno.h>
#if defined(STDC_HEADERS)
#include <stdlib.h>
+#include <limits.h>
#endif
#include "getopt.h"
#define LA_AUTHENTICATE 17
#define LA_TIMEOUT 18
#define LA_ENVELOPE 19
-#define LA_USERNAME 20
-#define LA_ALL 21
-#define LA_NOKEEP 22
-#define LA_KEEP 23
-#define LA_FLUSH 24
-#define LA_NOREWRITE 25
-#define LA_LIMIT 26
-#define LA_FOLDER 27
-#define LA_SMTPHOST 28
-#define LA_SMTPADDR 29
-#define LA_BATCHLIMIT 30
-#define LA_FETCHLIMIT 31
-#define LA_EXPUNGE 32
-#define LA_MDA 33
-#define LA_INTERFACE 34
-#define LA_MONITOR 35
-#define LA_YYDEBUG 36
-#define LA_QVIRTUAL 37
-
-/* options still left: CgGhHjJoORTUwWxXYzZ */
+#define LA_QVIRTUAL 20
+#define LA_USERNAME 21
+#define LA_ALL 22
+#define LA_NOKEEP 23
+#define LA_KEEP 24
+#define LA_FLUSH 25
+#define LA_NOREWRITE 26
+#define LA_LIMIT 27
+#define LA_FOLDER 28
+#define LA_SMTPHOST 29
+#define LA_SMTPADDR 30
+#define LA_ANTISPAM 31
+#define LA_BATCHLIMIT 32
+#define LA_FETCHLIMIT 33
+#define LA_EXPUNGE 34
+#define LA_MDA 35
+#define LA_NETSEC 36
+#define LA_INTERFACE 37
+#define LA_MONITOR 38
+#define LA_CONFIGDUMP 39
+#define LA_YYDEBUG 40
+
+/* options still left: CgGhHjJoORUwWxXYz */
static const char *shortoptions =
- "?Vcsvd:NqL:f:i:p:UP:A:t:E:Q:u:akKFnl:r:S:b:B:e:m:I:M:y";
+ "?Vcsvd:NqL:f:i:p:UP:A:t:E:Q:u:akKFnl:r:S:Z:b:B:e:m:T:I:M:y";
static const struct option longoptions[] = {
/* this can be const because all flag fields are 0 and will never get set */
{"username", required_argument, (int *) 0, LA_USERNAME },
{"all", no_argument, (int *) 0, LA_ALL },
- {"nokeep", no_argument, (int *) 0, LA_NOKEEP },
+ {"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 },
{"folder", required_argument, (int *) 0, LA_FOLDER },
{"smtphost", required_argument, (int *) 0, LA_SMTPHOST },
- {"smtpaddress", required_argument, (int *) 0, LA_SMTPADDR },
+ {"smtpaddress", required_argument, (int *) 0, LA_SMTPADDR },
+ {"antispam", required_argument, (int *) 0, LA_ANTISPAM },
{"batchlimit",required_argument, (int *) 0, LA_BATCHLIMIT },
{"fetchlimit",required_argument, (int *) 0, LA_FETCHLIMIT },
{"expunge", required_argument, (int *) 0, LA_EXPUNGE },
{"mda", required_argument, (int *) 0, LA_MDA },
-#ifdef linux
+#ifdef INET6
+ {"netsec", required_argument, (int *) 0, LA_NETSEC },
+#endif /* INET6 */
+
+#if defined(linux) && !INET6
{"interface", required_argument, (int *) 0, LA_INTERFACE },
{"monitor", required_argument, (int *) 0, LA_MONITOR },
-#endif
+#endif /* defined(linux) && !INET6 */
+
+ {"configdump",no_argument, (int *) 0, LA_CONFIGDUMP },
{"yydebug", no_argument, (int *) 0, LA_YYDEBUG },
{(char *) 0, no_argument, (int *) 0, 0 }
};
-int parsecmdline (argc, argv, ctl)
+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
+ */
+
+ char *endptr;
+ long value;
+
+ errno = 0;
+
+ value = strtol(s, &endptr, 0);
+
+ /* any invalid chars in string? */
+ if ( (endptr == s) || (*endptr != '\0') ) {
+ (void) fprintf(stderr, "String '%s' is not a valid number string.\n", s);
+ (*errflagptr)++;
+ return 0;
+ }
+
+ /* is the range valid? */
+ if ( (((value == LONG_MAX) || (value == LONG_MIN)) && (errno == ERANGE)) ||
+ (value > INT_MAX) || (value < INT_MIN)) {
+
+ (void) fprintf(stderr, "Value of string '%s' is %s than %d.\n", s,
+ (value < 0) ? "smaller": "larger",
+ (value < 0) ? INT_MIN : INT_MAX);
+ (*errflagptr)++;
+ return 0;
+ }
+
+ return (int) value; /* shut up, I know what I'm doing */
+#else
+ return atoi(s);
+#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 */
{
/*
int ocount = 0; /* count of destinations specified */
int errflag = 0; /* TRUE when a syntax error is detected */
int option_index;
- char buf[BUFSIZ], *cp;
+ char *buf, *cp;
- cmd_daemon = -1;
+ rctl->poll_interval = -1;
memset(ctl, '\0', sizeof(struct query)); /* start clean */
ctl->smtp_socket = -1;
break;
case 'd':
case LA_DAEMON:
- cmd_daemon = atoi(optarg);
+ rctl->poll_interval = xatoi(optarg, &errflag);
break;
case 'N':
case LA_NODETACH:
break;
case 'L':
case LA_LOGFILE:
- cmd_logfile = optarg;
+ rctl->logfile = optarg;
break;
case LA_INVISIBLE:
- use_invisible = TRUE;
+ rctl->invisible = TRUE;
break;
case 'f':
case LA_RCFILE:
break;
case 'i':
case LA_IDFILE:
- idfile = (char *) xmalloc(strlen(optarg)+1);
- strcpy(idfile,optarg);
+ rctl->idfile = (char *) xmalloc(strlen(optarg)+1);
+ strcpy(rctl->idfile,optarg);
break;
case 'p':
case LA_PROTOCOL:
else if (strcasecmp(optarg,"kpop") == 0)
{
ctl->server.protocol = P_POP3;
+#if INET6
+ ctl->server.service = KPOP_PORT;
+#else /* INET6 */
ctl->server.port = KPOP_PORT;
+#endif /* INET6 */
+#ifdef KERBEROS_V5
+ ctl->server.preauthenticate = A_KERBEROS_V5;
+#else
ctl->server.preauthenticate = A_KERBEROS_V4;
+#endif /* KERBEROS_V5 */
}
else if (strcasecmp(optarg,"imap") == 0)
ctl->server.protocol = P_IMAP;
break;
case 'P':
case LA_PORT:
- ctl->server.port = atoi(optarg);
+#if INET6
+ ctl->server.service = optarg;
+#else /* INET6 */
+ ctl->server.port = xatoi(optarg, &errflag);
+#endif /* INET6 */
break;
case 'A':
case LA_AUTHENTICATE:
if (strcmp(optarg, "password") == 0)
ctl->server.preauthenticate = A_PASSWORD;
else if (strcmp(optarg, "kerberos") == 0)
+#ifdef KERBEROS_V5
+ ctl->server.preauthenticate = A_KERBEROS_V5;
+ else if (strcmp(optarg, "kerberos_v5") == 0)
+ ctl->server.preauthenticate = A_KERBEROS_V5;
+#else
ctl->server.preauthenticate = A_KERBEROS_V4;
else if (strcmp(optarg, "kerberos_v4") == 0)
ctl->server.preauthenticate = A_KERBEROS_V4;
+#endif /* KERBEROS_V5 */
else {
fprintf(stderr,"Invalid preauthentication `%s' specified.\n", optarg);
errflag++;
break;
case 't':
case LA_TIMEOUT:
- ctl->server.timeout = atoi(optarg);
+ ctl->server.timeout = xatoi(optarg, &errflag);
if (ctl->server.timeout == 0)
ctl->server.timeout = -1;
break;
break;
case 'l':
case LA_LIMIT:
- c = atoi(optarg);
+ c = xatoi(optarg, &errflag);
ctl->limit = NUM_VALUE(c);
break;
case 'r':
case LA_FOLDER:
+ buf = xmalloc(strlen(optarg));
strcpy(buf, optarg);
cp = strtok(buf, ",");
do {
- save_str(&ctl->mailboxes, -1, cp);
+ save_str(&ctl->mailboxes, cp, 0);
} while
((cp = strtok((char *)NULL, ",")));
+ free(buf);
break;
case 'S':
case LA_SMTPHOST:
+ buf = xmalloc(strlen(optarg));
strcpy(buf, optarg);
cp = strtok(buf, ",");
do {
- save_str(&ctl->smtphunt, TRUE, cp);
+ save_str(&ctl->smtphunt, cp, TRUE);
} while
((cp = strtok((char *)NULL, ",")));
ocount++;
+ free(buf);
break;
- case 'D':
+ case 'D':
case LA_SMTPADDR:
- ctl->smtpaddress = xstrdup(optarg);
- break;
+ ctl->smtpaddress = xstrdup(optarg);
+ break;
+ case 'Z':
+ case LA_ANTISPAM:
+ c = xatoi(optarg, &errflag);
+ ctl->antispam = NUM_VALUE(c);
case 'b':
case LA_BATCHLIMIT:
- c = atoi(optarg);
+ c = xatoi(optarg, &errflag);
ctl->batchlimit = NUM_VALUE(c);
break;
case 'B':
case LA_FETCHLIMIT:
- c = atoi(optarg);
+ c = xatoi(optarg, &errflag);
ctl->fetchlimit = NUM_VALUE(c);
break;
case 'e':
case LA_EXPUNGE:
- c = atoi(optarg);
+ c = xatoi(optarg, &errflag);
ctl->expunge = NUM_VALUE(c);
break;
case 'm':
ocount++;
break;
-#ifdef linux
+ case 'T':
+ case LA_NETSEC:
+#if NET_SECURITY
+ ctl->server.netsec = (void *)optarg;
+#else
+ fprintf(stderr, "fetchmail: network security support is disabled\n");
+ errflag++;
+#endif /* NET_SECURITY */
+ break;
+
+#if defined(linux) && !INET6
case 'I':
case LA_INTERFACE:
interface_parse(optarg, &ctl->server);
case LA_MONITOR:
ctl->server.monitor = xstrdup(optarg);
break;
-#endif
+#endif /* defined(linux) && !INET6 */
case 'y':
case LA_YYDEBUG:
yydebug = TRUE;
break;
+ case LA_CONFIGDUMP:
+ configdump = TRUE;
+ break;
+
case LA_SYSLOG:
- errors_to_syslog = TRUE;
+ rctl->use_syslog = TRUE;
break;
case '?':
fputs(" --invisible suppress Received line & enable host spoofing\n", stderr);
fputs(" -f, --fetchmailrc specify alternate run control file\n", stderr);
fputs(" -i, --idfile specify alternate UIDs file\n", stderr);
-#ifdef linux
+#if defined(linux) && !INET6
fputs(" -I, --interface interface required specification\n",stderr);
fputs(" -M, --monitor monitor interface for activity\n",stderr);
#endif
fputs(" -n, --norewrite don't rewrite header addresses\n", stderr);
fputs(" -l, --limit don't fetch messages over given size\n", stderr);
+#if NET_SECURITY
+ fputs(" -T, --netsec set IP security request\n", stderr);
+#endif /* NET_SECURITY */
fputs(" -S, --smtphost set SMTP forwarding host\n", stderr);
fputs(" -D, --smtpaddress set SMTP delivery domain to use\n", stderr);
+ fputs(" -Z, --antispam, set antispam response value\n", stderr);
fputs(" -b, --batchlimit set batch limit for SMTP connections\n", stderr);
fputs(" -B, --fetchlimit set fetch limit for server connections\n", stderr);
fputs(" -e, --expunge set max deletions between expunges\n", stderr);
projects / ~andy / fetchmail / blobdiff