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 1650 by michael, Sat Nov 10 20:57:51 2012 UTC

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

Diff Legend

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