#include <stdio.h>
#include <sys/types.h>
#include <sys/file.h>
+#if defined(HAVE_SYS_WAIT_H)
#include <sys/wait.h>
+#endif
#include <sys/stat.h>
#include <errno.h>
#if defined(STDC_HEADERS)
#endif
#include <string.h>
+#if NET_SECURITY
+#include <net/security.h>
+#endif /* NET_SECURITY */
+
#include "fetchmail.h"
/* parser reads these */
struct query cmd_opts; /* where to put command-line info */
/* parser sets these */
-int poll_interval; /* poll interval in seconds */
-char *logfile; /* log file for daemon mode */
-flag use_syslog; /* if syslog was set */
-flag use_invisible; /* if invisible was set */
struct query *querylist; /* head of server list (globally visible) */
int yydebug; /* in case we didn't generate with -- debug */
}
%token DEFAULTS POLL SKIP VIA AKA LOCALDOMAINS PROTOCOL
-%token AUTHENTICATE TIMEOUT KPOP KERBEROS4
-%token ENVELOPE QVIRTUAL USERNAME PASSWORD FOLDER SMTPHOST MDA
-%token PRECONNECT POSTCONNECT LIMIT
+%token AUTHENTICATE TIMEOUT KPOP KERBEROS4 KERBEROS5 KERBEROS
+%token ENVELOPE QVIRTUAL USERNAME PASSWORD FOLDER SMTPHOST MDA SMTPADDRESS
+%token SPAMRESPONSE PRECONNECT POSTCONNECT LIMIT
+%token NETSEC INTERFACE MONITOR
%token IS HERE THERE TO MAP WILDCARD
%token BATCHLIMIT FETCHLIMIT EXPUNGE
-%token SET LOGFILE DAEMON SYSLOG INVISIBLE INTERFACE MONITOR
+%token SET LOGFILE DAEMON SYSLOG IDFILE INVISIBLE POSTMASTER
%token <proto> PROTO
%token <sval> STRING
%token <number> NUMBER
%token NO KEEP FLUSH FETCHALL REWRITE FORCECR STRIPCR PASS8BITS DROPSTATUS
-%token DNS PORT UIDL INTERVAL
+%token DNS SERVICE PORT UIDL INTERVAL MIMEDECODE CHECKALIAS
%%
optmap : MAP | /* EMPTY */;
/* future global options should also have the form SET <name> optmap <value> */
-statement : SET LOGFILE optmap STRING {logfile = xstrdup($4);}
- | SET DAEMON optmap NUMBER {poll_interval = $4;}
- | SET SYSLOG {use_syslog = TRUE;}
- | SET INVISIBLE {use_invisible = TRUE;}
+statement : SET LOGFILE optmap STRING {run.logfile = xstrdup($4);}
+ | SET IDFILE optmap STRING {run.idfile = xstrdup($4);}
+ | SET DAEMON optmap NUMBER {run.poll_interval = $4;}
+ | SET POSTMASTER optmap STRING {run.postmaster = xstrdup($4);}
+ | SET SYSLOG {run.use_syslog = TRUE;}
+ | SET INVISIBLE {run.invisible = TRUE;}
/*
* The way the next two productions are written depends on the fact that
| serverspecs serv_option
;
-alias_list : STRING {save_str(¤t.server.akalist,-1,$1);}
- | alias_list STRING {save_str(¤t.server.akalist,-1,$2);}
+alias_list : STRING {save_str(¤t.server.akalist,$1,0);}
+ | alias_list STRING {save_str(¤t.server.akalist,$2,0);}
;
-domain_list : STRING {save_str(¤t.server.localdomains,-1,$1);}
- | domain_list STRING {save_str(¤t.server.localdomains,-1,$2);}
+domain_list : STRING {save_str(¤t.server.localdomains,$1,0);}
+ | domain_list STRING {save_str(¤t.server.localdomains,$2,0);}
;
serv_option : AKA alias_list
| PROTOCOL PROTO {current.server.protocol = $2;}
| PROTOCOL KPOP {
current.server.protocol = P_POP3;
+#ifdef KERBEROS_V5
+ current.server.preauthenticate = A_KERBEROS_V5;
+#else
current.server.preauthenticate = A_KERBEROS_V4;
+#endif /* KERBEROS_V5 */
+#if INET6
+ current.server.service = KPOP_PORT;
+#else /* INET6 */
current.server.port = KPOP_PORT;
+#endif /* INET6 */
}
| UIDL {current.server.uidl = FLAG_TRUE;}
| NO UIDL {current.server.uidl = FLAG_FALSE;}
- | PORT NUMBER {current.server.port = $2;}
+ | CHECKALIAS {current.server.checkalias = FLAG_TRUE;}
+ | NO CHECKALIAS {current.server.checkalias = FLAG_FALSE;}
+ | SERVICE STRING {
+#if INET6
+ current.server.service = $2;
+#endif /* INET6 */
+ }
+ | PORT NUMBER {
+#if !INET6
+ current.server.port = $2;
+#endif /* !INET6 */
+ }
| INTERVAL NUMBER {current.server.interval = $2;}
| AUTHENTICATE PASSWORD {current.server.preauthenticate = A_PASSWORD;}
| AUTHENTICATE KERBEROS4 {current.server.preauthenticate = A_KERBEROS_V4;}
+ | AUTHENTICATE KERBEROS5 {current.server.preauthenticate = A_KERBEROS_V5;}
+ | AUTHENTICATE KERBEROS {
+#ifdef KERBEROS_V5
+ current.server.preauthenticate = A_KERBEROS_V5;
+#else
+ current.server.preauthenticate = A_KERBEROS_V4;
+#endif /* KERBEROS_V5 */
+ }
| TIMEOUT NUMBER {current.server.timeout = $2;}
- | ENVELOPE STRING {current.server.envelope = xstrdup($2);}
- | QVIRTUAL STRING {current.server.qvirtual = xstrdup($2);}
+
+ | ENVELOPE NUMBER STRING
+ {
+ current.server.envelope =
+ xstrdup($3);
+ current.server.envskip = $2;
+ }
+ | ENVELOPE STRING
+ {
+ current.server.envelope =
+ xstrdup($2);
+ current.server.envskip = 0;
+ }
+
+ | QVIRTUAL STRING {current.server.qvirtual=xstrdup($2);}
+ | NETSEC STRING {
+#ifdef NET_SECURITY
+ void *request;
+ int requestlen;
+
+ if (net_security_strtorequest($2, &request, &requestlen))
+ yyerror("invalid security request");
+ else {
+ current.server.netsec = xstrdup($2);
+ free(request);
+ }
+#else
+ yyerror("network-security support disabled");
+#endif /* NET_SECURITY */
+ }
| INTERFACE STRING {
-#ifdef linux
+#if defined(linux) && !defined(INET6)
interface_parse($2, ¤t.server);
-#else
+#else /* defined(linux) && !defined(INET6) */
fprintf(stderr, "fetchmail: interface option is only supported under Linux\n");
-#endif /* linux */
+#endif /* defined(linux) && !defined(INET6) */
}
| MONITOR STRING {
-#ifdef linux
+#if defined(linux) && !defined(INET6)
current.server.monitor = xstrdup($2);
-#else
+#else /* defined(linux) && !defined(INET6) */
fprintf(stderr, "fetchmail: monitor option is only supported under Linux\n");
-#endif /* linux */
+#endif /* defined(linux) && !defined(INET6) */
}
| DNS {current.server.dns = FLAG_TRUE;}
| NO DNS {current.server.dns = FLAG_FALSE;}
{save_str_pair(¤t.localnames, $1, $3);}
;
-folder_list : STRING {save_str(¤t.mailboxes,-1,$1);}
- | folder_list STRING {save_str(¤t.mailboxes,-1,$2);}
+folder_list : STRING {save_str(¤t.mailboxes,$1,0);}
+ | folder_list STRING {save_str(¤t.mailboxes,$2,0);}
+ ;
+
+smtp_list : STRING {save_str(¤t.smtphunt, $1,TRUE);}
+ | smtp_list STRING {save_str(¤t.smtphunt, $2,TRUE);}
;
-smtp_list : STRING {save_str(¤t.smtphunt, TRUE,$1);}
- | smtp_list STRING {save_str(¤t.smtphunt, TRUE,$2);}
+num_list : NUMBER {
+ struct idlist *id;
+ id=save_str(¤t.antispam,0,0);
+ id->val.status.num = $1;
+ }
+ | num_list NUMBER {
+ struct idlist *id;
+ id=save_str(¤t.antispam,0,0);
+ id->val.status.num = $2;
+ }
;
user_option : TO localnames HERE
| PASSWORD STRING {current.password = xstrdup($2);}
| FOLDER folder_list
| SMTPHOST smtp_list
+ | SMTPADDRESS STRING {current.smtpaddress = xstrdup($2);}
+ | SPAMRESPONSE num_list
| MDA STRING {current.mda = xstrdup($2);}
| PRECONNECT STRING {current.preconnect = xstrdup($2);}
| POSTCONNECT STRING {current.postconnect = xstrdup($2);}
| STRIPCR {current.stripcr = FLAG_TRUE;}
| PASS8BITS {current.pass8bits = FLAG_TRUE;}
| DROPSTATUS {current.dropstatus = FLAG_TRUE;}
+ | MIMEDECODE {current.mimedecode = FLAG_TRUE;}
| NO KEEP {current.keep = FLAG_FALSE;}
| NO FLUSH {current.flush = FLAG_FALSE;}
| NO STRIPCR {current.stripcr = FLAG_FALSE;}
| NO PASS8BITS {current.pass8bits = FLAG_FALSE;}
| NO DROPSTATUS {current.dropstatus = FLAG_FALSE;}
+ | NO MIMEDECODE {current.mimedecode = FLAG_FALSE;}
- | LIMIT NUMBER {current.limit = $2;}
- | FETCHLIMIT NUMBER {current.fetchlimit = $2;}
- | BATCHLIMIT NUMBER {current.batchlimit = $2;}
- | EXPUNGE NUMBER {current.expunge = $2;}
+ | LIMIT NUMBER {current.limit = NUM_VALUE($2);}
+ | FETCHLIMIT NUMBER {current.fetchlimit = NUM_VALUE($2);}
+ | BATCHLIMIT NUMBER {current.batchlimit = NUM_VALUE($2);}
+ | EXPUNGE NUMBER {current.expunge = NUM_VALUE($2);}
;
%%
prc_errflag++;
}
-int prc_filecheck(pathname)
+int prc_filecheck(pathname, securecheck)
/* check that a configuration file is secure */
const char *pathname; /* pathname for the configuration file */
+const flag securecheck;
{
+#ifndef __EMX__
struct stat statbuf;
errno = 0;
/* special cases useful for debugging purposes */
if (strcmp("/dev/null", pathname) == 0)
- return(0);
+ return(PS_SUCCESS);
/* the run control file must have the same uid as the REAL uid of this
process, it must have permissions no greater than 600, and it must not
if (lstat(pathname, &statbuf) < 0) {
if (errno == ENOENT)
- return(0);
+ return(PS_SUCCESS);
else {
error(0, errno, "lstat: %s", pathname);
return(PS_IOERR);
}
}
- if ((statbuf.st_mode & S_IFLNK) == S_IFLNK) {
+ if (!securecheck) return 0;
+
+ if ((statbuf.st_mode & S_IFLNK) == S_IFLNK)
+ {
fprintf(stderr, "File %s must not be a symbolic link.\n", pathname);
return(PS_AUTHFAIL);
}
- if (statbuf.st_mode & ~(S_IFREG | S_IREAD | S_IWRITE)) {
- fprintf(stderr, "File %s must have no more than -rw------ (0600) permissions.\n",
+ if (statbuf.st_mode & ~(S_IFREG | S_IREAD | S_IWRITE | S_IEXEC | S_IXGRP))
+ {
+ fprintf(stderr, "File %s must have no more than -rwx--x--- (0710) permissions.\n",
pathname);
return(PS_AUTHFAIL);
}
- if (statbuf.st_uid != getuid()) {
+ if (statbuf.st_uid != getuid())
+ {
fprintf(stderr, "File %s must be owned by you.\n", pathname);
return(PS_AUTHFAIL);
}
-
- return(0);
+#endif
+ return(PS_SUCCESS);
}
int prc_parse_file (const char *pathname, const flag securecheck)
errno = 0;
/* Check that the file is secure */
- if (securecheck && (prc_errflag = prc_filecheck(pathname)) != 0)
+ if ( (prc_errflag = prc_filecheck(pathname, securecheck)) != 0 )
return(prc_errflag);
if (errno == ENOENT)
- return(0);
+ return(PS_SUCCESS);
/* Open the configuration and feed it to the lexer. */
if ((yyin = fopen(pathname,"r")) == (FILE *)NULL) {
if (prc_errflag)
return(PS_SYNTAX);
else
- return(0);
+ return(PS_SUCCESS);
}
static void reset_server(char *name, int skip)
node = (struct query *) xmalloc(sizeof(struct query));
/* initialize it */
- memcpy(node, init, sizeof(struct query));
+ if (init)
+ memcpy(node, init, sizeof(struct query));
+ else
+ {
+ memset(node, '\0', sizeof(struct query));
+ node->smtp_socket = -1;
+ }
/* append to end of list */
if (hosttail != (struct query *) 0)
static void record_current(void)
/* register current parameters and append to the host list */
{
-#define FLAG_FORCE(fld) if (cmd_opts.fld) current.fld = cmd_opts.fld
- FLAG_FORCE(server.via);
- FLAG_FORCE(server.protocol);
- FLAG_FORCE(server.port);
- FLAG_FORCE(server.interval);
- FLAG_FORCE(server.preauthenticate);
- FLAG_FORCE(server.timeout);
- FLAG_FORCE(server.envelope);
- FLAG_FORCE(server.qvirtual);
- FLAG_FORCE(server.skip);
- FLAG_FORCE(server.dns);
- FLAG_FORCE(server.uidl);
-
-#ifdef linux
- FLAG_FORCE(server.interface);
- FLAG_FORCE(server.monitor);
- FLAG_FORCE(server.interface_pair);
-#endif /* linux */
-
- FLAG_FORCE(remotename);
- FLAG_FORCE(password);
- if (cmd_opts.mailboxes)
- save_str(¤t.mailboxes, -1, cmd_opts.mailboxes->id);
- if (cmd_opts.smtphunt)
- save_str(¤t.smtphunt, -1, cmd_opts.smtphunt->id);
- FLAG_FORCE(mda);
- FLAG_FORCE(preconnect);
- FLAG_FORCE(postconnect);
-
- FLAG_FORCE(keep);
- FLAG_FORCE(flush);
- FLAG_FORCE(fetchall);
- FLAG_FORCE(rewrite);
- FLAG_FORCE(forcecr);
- FLAG_FORCE(stripcr);
- FLAG_FORCE(pass8bits);
- FLAG_FORCE(dropstatus);
- FLAG_FORCE(limit);
- FLAG_FORCE(fetchlimit);
- FLAG_FORCE(batchlimit);
- FLAG_FORCE(expunge);
-
-#undef FLAG_FORCE
-
(void) hostalloc(¤t);
-
trailer = TRUE;
}
-void optmerge(struct query *h2, struct query *h1)
-/* merge two options records; empty fields in h2 are filled in from h1 */
-{
- append_str_list(&h2->server.localdomains, &h1->server.localdomains);
- append_str_list(&h2->localnames, &h1->localnames);
- append_str_list(&h2->mailboxes, &h1->mailboxes);
- append_str_list(&h2->smtphunt, &h1->smtphunt);
-
-#define FLAG_MERGE(fld) if (!h2->fld) h2->fld = h1->fld
- FLAG_MERGE(server.via);
- FLAG_MERGE(server.protocol);
- FLAG_MERGE(server.port);
- FLAG_MERGE(server.interval);
- FLAG_MERGE(server.preauthenticate);
- FLAG_MERGE(server.timeout);
- FLAG_MERGE(server.envelope);
- FLAG_MERGE(server.qvirtual);
- FLAG_MERGE(server.skip);
- FLAG_MERGE(server.dns);
- FLAG_MERGE(server.uidl);
-
-#ifdef linux
- FLAG_MERGE(server.interface);
- FLAG_MERGE(server.monitor);
- FLAG_MERGE(server.interface_pair);
-#endif /* linux */
-
- FLAG_MERGE(remotename);
- FLAG_MERGE(password);
- FLAG_MERGE(mda);
- FLAG_MERGE(preconnect);
-
- FLAG_MERGE(keep);
- FLAG_MERGE(flush);
- FLAG_MERGE(fetchall);
- FLAG_MERGE(rewrite);
- FLAG_MERGE(forcecr);
- FLAG_MERGE(stripcr);
- FLAG_MERGE(pass8bits);
- FLAG_MERGE(dropstatus);
- FLAG_MERGE(limit);
- FLAG_MERGE(fetchlimit);
- FLAG_MERGE(batchlimit);
- FLAG_MERGE(expunge);
-#undef FLAG_MERGE
-}
-
/* easier to do this than cope with variations in where the library lives */
int yywrap(void) {return 1;}
/* rcfile_y.y ends here */
+
+
projects / ~andy / fetchmail / blobdiff