%token USERNAME PASSWORD FOLDER SMTPHOST FETCHDOMAINS MDA BSMTP LMTP
%token SMTPADDRESS SMTPNAME SPAMRESPONSE PRECONNECT POSTCONNECT LIMIT WARNINGS
%token INTERFACE MONITOR PLUGIN PLUGOUT
-%token IS HERE THERE TO MAP WILDCARD
+%token IS HERE THERE TO MAP
%token BATCHLIMIT FETCHLIMIT FETCHSIZELIMIT FASTUIDL EXPUNGE PROPERTIES
-%token SET LOGFILE DAEMON SYSLOG IDFILE INVISIBLE POSTMASTER BOUNCEMAIL
-%token SPAMBOUNCE SHOWDOTS
+%token SET LOGFILE DAEMON SYSLOG IDFILE PIDFILE INVISIBLE POSTMASTER BOUNCEMAIL
+%token SPAMBOUNCE SOFTBOUNCE SHOWDOTS
+%token BADHEADER ACCEPT REJECT_
%token <proto> PROTO AUTHTYPE
%token <sval> STRING
%token <number> NUMBER
-%token NO KEEP FLUSH FETCHALL REWRITE FORCECR STRIPCR PASS8BITS
+%token NO KEEP FLUSH LIMITFLUSH FETCHALL REWRITE FORCECR STRIPCR PASS8BITS
%token DROPSTATUS DROPDELIVERED
%token DNS SERVICE PORT UIDL INTERVAL MIMEDECODE IDLE CHECKALIAS
-%token SSL SSLKEY SSLCERT SSLPROTO SSLCERTCK SSLCERTPATH SSLFINGERPRINT
+%token SSL SSLKEY SSLCERT SSLPROTO SSLCERTCK SSLCERTFILE SSLCERTPATH SSLCOMMONNAME SSLFINGERPRINT
%token PRINCIPAL ESMTPNAME ESMTPPASSWORD
%token TRACEPOLLS
+%expect 2
+
+%destructor { free ($$); } STRING
+
%%
rcfile : /* empty */
optmap : MAP | /* EMPTY */;
/* future global options should also have the form SET <name> optmap <value> */
-statement : SET LOGFILE optmap STRING {run.logfile = prependdir ($4, rcfiledir);}
- | SET IDFILE optmap STRING {run.idfile = prependdir ($4, rcfiledir);}
+statement : SET LOGFILE optmap STRING {run.logfile = prependdir ($4, rcfiledir); free($4);}
+ | SET IDFILE optmap STRING {run.idfile = prependdir ($4, rcfiledir); free($4);}
+ | SET PIDFILE optmap STRING {run.pidfile = prependdir ($4, rcfiledir); free($4);}
| SET DAEMON optmap NUMBER {run.poll_interval = $4;}
- | SET POSTMASTER optmap STRING {run.postmaster = xstrdup($4);}
+ | SET POSTMASTER optmap STRING {run.postmaster = $4;}
| SET BOUNCEMAIL {run.bouncemail = TRUE;}
| SET NO BOUNCEMAIL {run.bouncemail = FALSE;}
| SET SPAMBOUNCE {run.spambounce = TRUE;}
| SET NO SPAMBOUNCE {run.spambounce = FALSE;}
- | SET PROPERTIES optmap STRING {run.properties =xstrdup($4);}
+ | SET SOFTBOUNCE {run.softbounce = TRUE;}
+ | SET NO SOFTBOUNCE {run.softbounce = FALSE;}
+ | SET PROPERTIES optmap STRING {run.properties = $4;}
| SET SYSLOG {run.use_syslog = TRUE;}
| SET NO SYSLOG {run.use_syslog = FALSE;}
| SET INVISIBLE {run.invisible = TRUE;}
{yyerror(GT_("server option after user options"));}
;
-define_server : POLL STRING {reset_server($2, FALSE);}
- | SKIP STRING {reset_server($2, TRUE);}
+define_server : POLL STRING {reset_server($2, FALSE); free($2);}
+ | SKIP STRING {reset_server($2, TRUE); free($2);}
| DEFAULTS {reset_server("defaults", FALSE);}
;
| serverspecs serv_option
;
-alias_list : STRING {save_str(¤t.server.akalist,$1,0);}
- | alias_list STRING {save_str(¤t.server.akalist,$2,0);}
+alias_list : STRING {save_str(¤t.server.akalist,$1,0); free($1);}
+ | alias_list STRING {save_str(¤t.server.akalist,$2,0); free($2);}
;
-domain_list : STRING {save_str(¤t.server.localdomains,$1,0);}
- | domain_list STRING {save_str(¤t.server.localdomains,$2,0);}
+domain_list : STRING {save_str(¤t.server.localdomains,$1,0); free($1);}
+ | domain_list STRING {save_str(¤t.server.localdomains,$2,0); free($2);}
;
serv_option : AKA alias_list
- | VIA STRING {current.server.via = xstrdup($2);}
+ | VIA STRING {current.server.via = $2;}
| LOCALDOMAINS domain_list
| PROTOCOL PROTO {current.server.protocol = $2;}
| PROTOCOL KPOP {
#endif /* KERBEROS_V5 */
current.server.service = KPOP_PORT;
}
- | PRINCIPAL STRING {current.server.principal = xstrdup($2);}
- | ESMTPNAME STRING {current.server.esmtp_name = xstrdup($2);}
- | ESMTPPASSWORD STRING {current.server.esmtp_password = xstrdup($2);}
+ | PRINCIPAL STRING {current.server.principal = $2;}
+ | ESMTPNAME STRING {current.server.esmtp_name = $2;}
+ | ESMTPPASSWORD STRING {current.server.esmtp_password = $2;}
| PROTOCOL SDPS {
#ifdef SDPS_ENABLE
current.server.protocol = P_POP3;
| SERVICE STRING {
current.server.service = $2;
}
+ | SERVICE NUMBER {
+ int port = $2;
+ char buf[10];
+ snprintf(buf, sizeof buf, "%d", port);
+ current.server.service = xstrdup(buf);
+ }
| PORT NUMBER {
int port = $2;
char buf[10];
{current.server.authenticate = $2;}
| TIMEOUT NUMBER
{current.server.timeout = $2;}
- | ENVELOPE NUMBER STRING
+ | ENVELOPE NUMBER STRING
{
- current.server.envelope =
- xstrdup($3);
+ current.server.envelope = $3;
current.server.envskip = $2;
}
| ENVELOPE STRING
{
- current.server.envelope =
- xstrdup($2);
+ current.server.envelope = $2;
current.server.envskip = 0;
}
- | QVIRTUAL STRING {current.server.qvirtual=xstrdup($2);}
+ | QVIRTUAL STRING {current.server.qvirtual = $2;}
| INTERFACE STRING {
-#if (defined(linux) && !defined(INET6_ENABLE)) || defined(__FreeBSD__)
+#ifdef CAN_MONITOR
interface_parse($2, ¤t.server);
-#else /* (defined(linux) && !defined(INET6_ENABLE)) || defined(__FreeBSD__) */
+#else
fprintf(stderr, GT_("fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n"));
-#endif /* (defined(linux) && !defined(INET6_ENABLE)) || defined(__FreeBSD__) */
+#endif
+ free($2);
}
| MONITOR STRING {
-#if (defined(linux) && !defined(INET6_ENABLE)) || defined(__FreeBSD__)
- current.server.monitor = xstrdup($2);
-#else /* (defined(linux) && !defined(INET6_ENABLE)) || defined(__FreeBSD__) */
+#ifdef CAN_MONITOR
+ current.server.monitor = $2;
+#else
fprintf(stderr, GT_("fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"));
-#endif /* (defined(linux) && !defined(INET6_ENABLE) || defined(__FreeBSD__)) */
+ free($2);
+#endif
}
- | PLUGIN STRING { current.server.plugin = xstrdup($2); }
- | PLUGOUT STRING { current.server.plugout = xstrdup($2); }
+ | PLUGIN STRING { current.server.plugin = $2; }
+ | PLUGOUT STRING { current.server.plugout = $2; }
| DNS {current.server.dns = FLAG_TRUE;}
| NO DNS {current.server.dns = FLAG_FALSE;}
| NO ENVELOPE {current.server.envelope = STRING_DISABLED;}
| TRACEPOLLS {current.server.tracepolls = FLAG_TRUE;}
| NO TRACEPOLLS {current.server.tracepolls = FLAG_FALSE;}
+ | BADHEADER ACCEPT {current.server.badheader = BHACCEPT;}
+ | BADHEADER REJECT_ {current.server.badheader = BHREJECT;}
;
userspecs : user1opts {record_current(); user_reset();}
explicitdef : userdef user0opts
;
-userdef : USERNAME STRING {current.remotename = xstrdup($2);}
+userdef : USERNAME STRING {current.remotename = $2;}
| USERNAME mapping_list HERE
- | USERNAME STRING THERE {current.remotename = xstrdup($2);}
+ | USERNAME STRING THERE {current.remotename = $2;}
;
user0opts : /* EMPTY */
| user1opts user_option
;
-localnames : WILDCARD {current.wildcard = TRUE;}
- | mapping_list {current.wildcard = FALSE;}
- | mapping_list WILDCARD {current.wildcard = TRUE;}
- ;
-
mapping_list : mapping
| mapping_list mapping
;
-mapping : STRING
- {save_str_pair(¤t.localnames, $1, NULL);}
- | STRING MAP STRING
- {save_str_pair(¤t.localnames, $1, $3);}
+mapping : STRING {if (0 == strcmp($1, "*")) {
+ current.wildcard = TRUE;
+ } else {
+ save_str_pair(¤t.localnames, $1, NULL);
+ }
+ free($1);}
+ | STRING MAP STRING {save_str_pair(¤t.localnames, $1, $3); free($1); free($3);}
;
-folder_list : STRING {save_str(¤t.mailboxes,$1,0);}
- | folder_list STRING {save_str(¤t.mailboxes,$2,0);}
+folder_list : STRING {save_str(¤t.mailboxes,$1,0); free($1);}
+ | folder_list STRING {save_str(¤t.mailboxes,$2,0); free($2);}
;
-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, $1,TRUE); free($1);}
+ | smtp_list STRING {save_str(¤t.smtphunt, $2,TRUE); free($2);}
;
-fetch_list : STRING {save_str(¤t.domainlist, $1,TRUE);}
- | fetch_list STRING {save_str(¤t.domainlist, $2,TRUE);}
+fetch_list : STRING {save_str(¤t.domainlist, $1,TRUE); free($1);}
+ | fetch_list STRING {save_str(¤t.domainlist, $2,TRUE); free($2);}
;
num_list : NUMBER
{
struct idlist *id;
- id=save_str(¤t.antispam,STRING_DUMMY,0);
+ id = save_str(¤t.antispam,STRING_DUMMY,0);
id->val.status.num = $1;
}
| num_list NUMBER
{
struct idlist *id;
- id=save_str(¤t.antispam,STRING_DUMMY,0);
+ id = save_str(¤t.antispam,STRING_DUMMY,0);
id->val.status.num = $2;
}
;
-user_option : TO localnames HERE
- | TO localnames
- | IS localnames HERE
- | IS localnames
+user_option : TO mapping_list HERE
+ | TO mapping_list
+ | IS mapping_list HERE
+ | IS mapping_list
- | IS STRING THERE {current.remotename = xstrdup($2);}
- | PASSWORD STRING {current.password = xstrdup($2);}
+ | IS STRING THERE {current.remotename = $2;}
+ | PASSWORD STRING {current.password = $2;}
| FOLDER folder_list
| SMTPHOST smtp_list
| FETCHDOMAINS fetch_list
- | SMTPADDRESS STRING {current.smtpaddress = xstrdup($2);}
- | SMTPNAME STRING {current.smtpname = xstrdup($2);}
+ | SMTPADDRESS STRING {current.smtpaddress = $2;}
+ | SMTPNAME STRING {current.smtpname = $2;}
| SPAMRESPONSE num_list
- | MDA STRING {current.mda = xstrdup($2);}
- | BSMTP STRING {current.bsmtp = prependdir ($2, rcfiledir);}
+ | MDA STRING {current.mda = $2;}
+ | BSMTP STRING {current.bsmtp = prependdir ($2, rcfiledir); free($2);}
| LMTP {current.listener = LMTP_MODE;}
- | PRECONNECT STRING {current.preconnect = xstrdup($2);}
- | POSTCONNECT STRING {current.postconnect = xstrdup($2);}
+ | PRECONNECT STRING {current.preconnect = $2;}
+ | POSTCONNECT STRING {current.postconnect = $2;}
| KEEP {current.keep = FLAG_TRUE;}
| FLUSH {current.flush = FLAG_TRUE;}
+ | LIMITFLUSH {current.limitflush = FLAG_TRUE;}
| FETCHALL {current.fetchall = FLAG_TRUE;}
| REWRITE {current.rewrite = FLAG_TRUE;}
| FORCECR {current.forcecr = FLAG_TRUE;}
yyerror(GT_("SSL is not enabled"));
#endif
}
- | SSLKEY STRING {current.sslkey = prependdir ($2, rcfiledir);}
- | SSLCERT STRING {current.sslcert = prependdir ($2, rcfiledir);}
- | SSLPROTO STRING {current.sslproto = xstrdup($2);}
+ | SSLKEY STRING {current.sslkey = prependdir ($2, rcfiledir); free($2);}
+ | SSLCERT STRING {current.sslcert = prependdir ($2, rcfiledir); free($2);}
+ | SSLPROTO STRING {current.sslproto = $2;}
| SSLCERTCK {current.sslcertck = FLAG_TRUE;}
- | SSLCERTPATH STRING {current.sslcertpath = prependdir($2, rcfiledir);}
- | SSLFINGERPRINT STRING {current.sslfingerprint = xstrdup($2);}
+ | SSLCERTFILE STRING {current.sslcertfile = prependdir($2, rcfiledir); free($2);}
+ | SSLCERTPATH STRING {current.sslcertpath = prependdir($2, rcfiledir); free($2);}
+ | SSLCOMMONNAME STRING {current.sslcommonname = $2;}
+ | SSLFINGERPRINT STRING {current.sslfingerprint = $2;}
| NO KEEP {current.keep = FLAG_FALSE;}
| NO FLUSH {current.flush = FLAG_FALSE;}
+ | NO LIMITFLUSH {current.limitflush = FLAG_FALSE;}
| NO FETCHALL {current.fetchall = FLAG_FALSE;}
| NO REWRITE {current.rewrite = FLAG_FALSE;}
| NO FORCECR {current.forcecr = FLAG_FALSE;}
| BATCHLIMIT NUMBER {current.batchlimit = NUM_VALUE_IN($2);}
| EXPUNGE NUMBER {current.expunge = NUM_VALUE_IN($2);}
- | PROPERTIES STRING {current.properties = xstrdup($2);}
+ | PROPERTIES STRING {current.properties = $2;}
;
%%
prc_errflag++;
}
-int prc_filecheck(const char *pathname, const flag securecheck)
-/* check that a configuration file is secure */
+/** check that a configuration file is secure, returns PS_* status codes */
+int prc_filecheck(const char *pathname,
+ const flag securecheck /** shortcuts permission, filetype and uid tests if false */)
{
#ifndef __EMX__
struct stat statbuf;
process, it must have permissions no greater than 600, and it must not
be a symbolic link. We check these conditions here. */
- if (lstat(pathname, &statbuf) < 0) {
+ if (stat(pathname, &statbuf) < 0) {
if (errno == ENOENT)
return(PS_SUCCESS);
else {
#endif /* __CYGWIN__ */
if (statbuf.st_mode & (S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH | S_IXOTH))
{
- fprintf(stderr, GT_("File %s must have no more than -rwx--x--- (0710) permissions.\n"),
+ fprintf(stderr, GT_("File %s must have no more than -rwx------ (0700) permissions.\n"),
pathname);
return(PS_IOERR);
}
yyparse(); /* parse entire file */
- fclose(yyin); /* not checking this should be safe, file mode was r */
+ if (yyin != stdin)
+ fclose(yyin); /* not checking this should be safe, file mode was r */
if (prc_errflag)
return(PS_SYNTAX);
current.server = save;
}
-struct query *hostalloc(init)
-/* append a host record to the host list */
-struct query *init; /* pointer to block containing initial values */
+/** append a host record to the host list */
+struct query *hostalloc(struct query *init /** pointer to block containing
+ initial values */)
{
struct query *node;
strcmp(file, "-") == 0 || /* stdin/stdout */
!dir[0]) /* we don't HAVE_GETCWD */
return xstrdup (file);
- newfile = xmalloc (strlen (dir) + 1 + strlen (file) + 1);
+ newfile = (char *)xmalloc (strlen (dir) + 1 + strlen (file) + 1);
if (dir[strlen(dir) - 1] != '/')
sprintf (newfile, "%s/%s", dir, file);
else
return newfile;
}
-/* 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