From: Vsevolod Stakhov <vsevolod@rambler-co.ru>
Date: Fri, 30 Oct 2009 15:49:36 +0000 (+0300)
Subject: * Parse days and hours in time limits
X-Git-Tag: 0.3.0~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd0ade804fff8e999b9fadd88452d1d5b5ba1ccb;p=thirdparty%2Frspamd.git

* Parse days and hours in time limits
---

diff --git a/src/cfg_file.l b/src/cfg_file.l
index f3baff15d2..822cab3fae 100644
--- a/src/cfg_file.l
+++ b/src/cfg_file.l
@@ -114,7 +114,7 @@ yes|YES|no|NO|[yY]|[nN]			yylval.flag=parse_flag(yytext); return FLAG;
 [0-9]+							yylval.number=strtol(yytext, NULL, 10); return NUMBER;
 -?[0-9]+\.?[0-9]*				yylval.fract=strtod(yytext, NULL); return FRACT;
 [0-9]+[kKmMgG]?					yylval.limit=parse_limit(yytext); return SIZELIMIT;
-[0-9]+[sS]|[0-9]+[mM][sS]		yylval.seconds=parse_seconds(yytext); return SECONDS;
+[0-9]+[mMsShHdD]?				yylval.seconds=parse_seconds(yytext); return SECONDS;
 [0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}	yylval.string=strdup(yytext); return IPADDR;
 [0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\/[0-9]{1,2}	yylval.string=strdup(yytext); return IPNETWORK;
 [*a-zA-Z0-9.-]+:[0-9]{1,5}		yylval.string=strdup(yytext); return HOSTPORT;