ViewVC Help

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

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

Comparing ircd-hybrid-8/src/conf_parser.y (file contents):
Revision 1460 by michael, Fri Jul 6 14:32:53 2012 UTC vs.
Revision 1474 by michael, Sun Jul 22 14:44:07 2012 UTC

#	Line 140 | Line 140 | free_collect_item(struct CollectItem *it
140		%token  DISABLE_AUTH
141		%token  DISABLE_FAKE_CHANNELS
142		%token  DISABLE_HIDDEN
143	–	%token  DISABLE_LOCAL_CHANNELS
143		%token  DISABLE_REMOTE_COMMANDS
144		%token  DOTS_IN_IDENT
145		%token  DURATION
#	Line 2990 | Line 2989 | channel_entry: CHANNEL
2989		'{' channel_items '}' ';';
2990
2991		channel_items:      channel_items channel_item | channel_item;
2992	<	channel_item:       channel_disable_local_channels | channel_use_except |
2992	>	channel_item:       channel_use_except |
2993		channel_use_invex | channel_use_knock | channel_max_bans |
2994		channel_knock_delay | channel_knock_delay_channel |
2995		channel_max_chans_per_user | channel_max_chans_per_oper |
#	Line 3011 | Line 3010 | channel_restrict_channels: RESTRICT_CHAN
3010		ConfigChannel.restrict_channels = yylval.number;
3011		};
3012
3014	–	channel_disable_local_channels: DISABLE_LOCAL_CHANNELS '=' TBOOL ';'
3015	–	{
3016	–	ConfigChannel.disable_local_channels = yylval.number;
3017	–	};
3018	–
3013		channel_use_except: USE_EXCEPT '=' TBOOL ';'
3014		{
3015		ConfigChannel.use_except = yylval.number;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines