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 6375 by michael, Fri Aug 21 10:34:16 2015 UTC vs.
Revision 6447 by michael, Sat Aug 29 18:49:58 2015 UTC

#	Line 213 | Line 213 | reset_block_state(void)
213		%token  IRCD_AUTH
214		%token  IRCD_FLAGS
215		%token  IRCD_SID
216	+	%token  JOIN
217		%token  KILL
218		%token  KILL_CHASE_TIME_LIMIT
219		%token  KLINE
#	Line 258 | Line 259 | reset_block_state(void)
259		%token  NUMBER_PER_CIDR
260		%token  NUMBER_PER_IP
261		%token  OPER_ONLY_UMODES
261	–	%token  OPER_PASS_RESV
262		%token  OPER_UMODES
263		%token  OPERATOR
264		%token  OPERS_BYPASS_CALLERID
#	Line 1438 | Line 1438 | oper_flags_item: KILL ':' REMOTE
1438		{
1439		if (conf_parser_ctx.pass == 2)
1440		block_state.port.value |= OPER_FLAG_OPME;
1441	+	} | NICK ':' RESV
1442	+	{
1443	+	if (conf_parser_ctx.pass == 2)
1444	+	block_state.port.value |= OPER_FLAG_NICK_RESV;
1445	+	} | JOIN ':' RESV
1446	+	{
1447	+	if (conf_parser_ctx.pass == 2)
1448	+	block_state.port.value |= OPER_FLAG_JOIN_RESV;
1449		};
1450
1451
#	Line 2546 | Line 2554 | general_item:       general_away_count |
2554		general_pace_wait_simple |
2555		general_short_motd |
2556		general_no_oper_flood |
2549	–	general_oper_pass_resv |
2557		general_oper_only_umodes |
2558		general_max_targets |
2559		general_oper_umodes |
#	Line 2748 | Line 2755 | general_no_oper_flood: NO_OPER_FLOOD '='
2755		ConfigGeneral.no_oper_flood = yylval.number;
2756		};
2757
2751	–	general_oper_pass_resv: OPER_PASS_RESV '=' TBOOL ';'
2752	–	{
2753	–	ConfigGeneral.oper_pass_resv = yylval.number;
2754	–	};
2755	–
2758		general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2759		{
2760		ConfigGeneral.dots_in_ident = $3;

Diff Legend

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