From bdc2afc6f2c96eb0eb7975e29297a515c0ac144e Mon Sep 17 00:00:00 2001
From: michael <michael@82007160-df01-0410-b94d-b575c5fd34c7>
Date: Thu, 1 May 2014 13:55:13 +0000
Subject: - conf_parser.y: fixed bug where the parser wouldn't take time units 
  into consideration for the join_flood_time and throttle_time config  
 options.

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@3433 82007160-df01-0410-b94d-b575c5fd34c7
---
 src/conf_parser.c | 4 ++--
 src/conf_parser.y | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/conf_parser.c b/src/conf_parser.c
index c1ccf9c..530e6c3 100644
--- a/src/conf_parser.c
+++ b/src/conf_parser.c
@@ -5948,7 +5948,7 @@ yyreduce:
   case 556:
 #line 2704 "conf_parser.y" /* yacc.c:1646  */
     {
-  ConfigFileEntry.throttle_time = yylval.number;
+  ConfigFileEntry.throttle_time = (yyvsp[-1].number);
 }
 #line 5954 "conf_parser.c" /* yacc.c:1646  */
     break;
@@ -6420,7 +6420,7 @@ yyreduce:
   case 637:
 #line 2939 "conf_parser.y" /* yacc.c:1646  */
     {
-  GlobalSetOptions.joinfloodtime = yylval.number;
+  GlobalSetOptions.joinfloodtime = (yyvsp[-1].number);
 }
 #line 6426 "conf_parser.c" /* yacc.c:1646  */
     break;
diff --git a/src/conf_parser.y b/src/conf_parser.y
index c11e3b4..3534931 100644
--- a/src/conf_parser.y
+++ b/src/conf_parser.y
@@ -2702,7 +2702,7 @@ general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
 
 general_throttle_time: THROTTLE_TIME '=' timespec ';'
 {
-  ConfigFileEntry.throttle_time = yylval.number;
+  ConfigFileEntry.throttle_time = $3;
 };
 
 general_oper_umodes: OPER_UMODES
@@ -2937,7 +2937,7 @@ channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
 
 channel_jflood_time: JOIN_FLOOD_TIME '=' timespec ';'
 {
-  GlobalSetOptions.joinfloodtime = yylval.number;
+  GlobalSetOptions.joinfloodtime = $3;
 };
 
 /***************************************************************************
-- 
cgit