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 1647 by michael, Fri Nov 9 20:11:58 2012 UTC vs.
Revision 1648 by michael, Sat Nov 10 17:34:09 2012 UTC

#	Line 1365 | Line 1365 | listen_flags_item: T_SSL
1365		listen_items:   listen_items listen_item | listen_item;
1366		listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1367
1368	<	listen_port: PORT '=' port_items { block_state.flags.value |= 0; } ';';
1368	>	listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1369
1370		port_items: port_items ',' port_item | port_item;
1371
#	Line 1497 | Line 1497 | auth_encrypted: ENCRYPTED '=' TBOOL ';'
1497		auth_flags: IRCD_FLAGS
1498		{
1499		if (conf_parser_ctx.pass == 2)
1500	<	block_state.flags.value = 0;
1500	>	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
1501		} '='  auth_flags_items ';';
1502
1503		auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
#	Line 1834 | Line 1834 | connect_entry: CONNECT
1834		if (conf_parser_ctx.pass != 2)
1835		break;
1836
1837	<	if (!(block_state.name.buf[0] ||
1838	<	block_state.host.buf[0]))
1837	>	if (!block_state.name.buf[0] ||
1838	>	!block_state.host.buf[0])
1839		break;
1840
1841		if (!(block_state.rpass.buf[0] ||
#	Line 1956 | Line 1956 | connect_aftype: AFTYPE '=' T_IPV4 ';'
1956
1957		connect_flags: IRCD_FLAGS
1958		{
1959	<	/* XXX */
1959	>	block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
1960		} '='  connect_flags_items ';';
1961
1962		connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;

Diff Legend

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