ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/conf_parser.y

Comparing ircd-hybrid/trunk/src/conf_parser.y (file contents):
Revision 4312 by michael, Fri Jul 18 20:46:48 2014 UTC vs.
Revision 4313 by michael, Thu Jul 31 18:50:11 2014 UTC

#	Line 155 | Line 155 | reset_block_state(void)
155		%token  ANTI_NICK_FLOOD
156		%token  ANTI_SPAM_EXIT_MESSAGE_TIME
157		%token  AUTOCONN
158	+	%token  AWAY_COUNT
159	+	%token  AWAY_TIME
160		%token  BYTES KBYTES MBYTES
161		%token  CALLER_ID_WAIT
162		%token  CAN_FLOOD
#	Line 2463 | Line 2465 | general_entry: GENERAL
2465		'{' general_items '}' ';';
2466
2467		general_items:      general_items general_item | general_item;
2468	<	general_item:       general_hide_spoof_ips |
2468	>	general_item:       general_away_count |
2469	>	general_away_time |
2470	>	general_hide_spoof_ips |
2471		general_ignore_bogus_ts |
2472		general_failed_oper_notice |
2473		general_anti_nick_flood |
#	Line 2514 | Line 2518 | general_item:       general_hide_spoof_i
2518		error;
2519
2520
2521	+	general_away_count: AWAY_COUNT '=' NUMBER ';'
2522	+	{
2523	+	ConfigFileEntry.away_count = $3;
2524	+	};
2525	+
2526	+	general_away_time: AWAY_TIME '=' timespec ';'
2527	+	{
2528	+	ConfigFileEntry.away_time = $3;
2529	+	};
2530	+
2531		general_max_watch: MAX_WATCH '=' NUMBER ';'
2532		{
2533		ConfigFileEntry.max_watch = $3;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)