ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/conf_parser.y
(Generate patch)

Comparing ircd-hybrid-8/src/ircd_parser.y (file contents):
Revision 1157 by michael, Tue Aug 9 22:03:59 2011 UTC vs.
Revision 1176 by michael, Sun Aug 14 11:24:24 2011 UTC

# Line 147 | Line 147 | unhook_hub_leaf_confs(void)
147   %token  BYTES KBYTES MBYTES GBYTES TBYTES
148   %token  CALLER_ID_WAIT
149   %token  CAN_FLOOD
150 %token  CAN_IDLE
150   %token  CHANNEL
151   %token  CIDR_BITLEN_IPV4
152   %token  CIDR_BITLEN_IPV6
# Line 212 | Line 211 | unhook_hub_leaf_confs(void)
211   %token  HOST
212   %token  HUB
213   %token  HUB_MASK
215 %token  IDLETIME
214   %token  IGNORE_BOGUS_TS
215   %token  INVISIBLE_ON_CONNECT
216   %token  IP
# Line 364 | Line 362 | unhook_hub_leaf_confs(void)
362   %token  T_UNXLINE
363   %token  T_WALLOP
364   %token  T_SERVICE
365 < %token  T_SERVICE_NAME
365 > %token  T_SERVICES_NAME
366   %token  THROTTLE_TIME
367   %token  TOPICBURST
368   %token  TRUE_NO_OPER_FLOOD
# Line 1817 | Line 1815 | auth_flags_item_atom: SPOOF_NOTICE
1815      if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
1816      else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1817    }
1820 } | CAN_IDLE
1821 {
1822  if (conf_parser_ctx.pass == 2)
1823  {
1824    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_IDLE_LINED;
1825    else yy_aconf->flags |= CONF_FLAGS_IDLE_LINED;
1826  }
1818   } | NO_TILDE
1819   {
1820    if (conf_parser_ctx.pass == 2)
# Line 2864 | Line 2855 | general_item:       general_hide_spoof_i
2855                      general_pace_wait_simple | general_stats_P_oper_only |
2856                      general_short_motd | general_no_oper_flood |
2857                      general_true_no_oper_flood | general_oper_pass_resv |
2858 <                    general_idletime | general_message_locale |
2858 >                    general_message_locale |
2859                      general_oper_only_umodes | general_max_targets |
2860                      general_use_egd | general_egdpool_path |
2861                      general_oper_umodes | general_caller_id_wait |
# Line 2879 | Line 2870 | general_item:       general_hide_spoof_i
2870                      general_tkline_expire_notices | general_gline_min_cidr |
2871                      general_gline_min_cidr6 | general_use_whois_actually |
2872                      general_reject_hold_time | general_stats_e_disabled |
2873 <                    general_max_watch | general_service_name |
2873 >                    general_max_watch | general_services_name |
2874                      error;
2875  
2876  
# Line 3096 | Line 3087 | general_message_locale: MESSAGE_LOCALE '
3087    }
3088   };
3089  
3099 general_idletime: IDLETIME '=' timespec ';'
3100 {
3101  ConfigFileEntry.idletime = $3;
3102 };
3103
3090   general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
3091   {
3092    ConfigFileEntry.dots_in_ident = $3;
# Line 3184 | Line 3170 | general_egdpool_path: EGDPOOL_PATH '=' Q
3170    }
3171   };
3172  
3173 < general_service_name: T_SERVICE_NAME '=' QSTRING ';'
3173 > general_services_name: T_SERVICES_NAME '=' QSTRING ';'
3174   {
3175 <  if (conf_parser_ctx.pass == 2)
3175 >  if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
3176    {
3177      MyFree(ConfigFileEntry.service_name);
3178      DupString(ConfigFileEntry.service_name, yylval.string);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines