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/trunk/src/conf_parser.y (file contents):
Revision 9610 by michael, Sun Sep 6 07:28:30 2020 UTC vs.
Revision 9692 by michael, Sat Oct 31 19:05:15 2020 UTC

# Line 237 | Line 237 | reset_block_state(void)
237   %token  NAME
238   %token  NEED_IDENT
239   %token  NEED_PASSWORD
240 < %token  NETWORK_DESC
240 > %token  NETWORK_DESCRIPTION
241   %token  NETWORK_NAME
242   %token  NICK
243   %token  NO_OPER_FLOOD
# Line 285 | Line 285 | reset_block_state(void)
285   %token  STATS_U_OPER_ONLY
286   %token  T_ALL
287   %token  T_BIND
288 – %token  T_BOTS
288   %token  T_CALLERID
289   %token  T_CCONN
290   %token  T_COMMAND
# Line 296 | Line 295 | reset_block_state(void)
295   %token  T_EXTERNAL
296   %token  T_FARCONNECT
297   %token  T_FILE
298 < %token  T_FULL
298 > %token  T_FLOOD
299   %token  T_GLOBOPS
300   %token  T_INVISIBLE
301   %token  T_IPV4
# Line 323 | Line 322 | reset_block_state(void)
322   %token  T_TARGET
323   %token  T_TLS
324   %token  T_UMODES
326 – %token  T_UNAUTH
325   %token  T_UNDLINE
326   %token  T_UNLIMITED
327   %token  T_UNRESV
# Line 447 | Line 445 | serverinfo_item:        serverinfo_name
445                          serverinfo_hub |
446                          serverinfo_description |
447                          serverinfo_network_name |
448 <                        serverinfo_network_desc |
448 >                        serverinfo_network_description |
449                          serverinfo_default_max_clients |
450                          serverinfo_max_nick_length |
451                          serverinfo_max_topic_length |
# Line 579 | Line 577 | serverinfo_network_name: NETWORK_NAME '=
577    }
578   };
579  
580 < serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
580 > serverinfo_network_description: NETWORK_DESCRIPTION '=' QSTRING ';'
581   {
582    if (conf_parser_ctx.pass != 2)
583      break;
584  
585 <  xfree(ConfigServerInfo.network_desc);
586 <  ConfigServerInfo.network_desc = xstrdup(yylval.string);
585 >  xfree(ConfigServerInfo.network_description);
586 >  ConfigServerInfo.network_description = xstrdup(yylval.string);
587   };
588  
589   serverinfo_default_max_clients: DEFAULT_MAX_CLIENTS '=' NUMBER ';'
# Line 1039 | Line 1037 | oper_umodes: T_UMODES
1037   } '=' oper_umodes_items ';' ;
1038  
1039   oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1040 < oper_umodes_item:  T_BOTS
1043 < {
1044 <  if (conf_parser_ctx.pass == 2)
1045 <    block_state.modes.value |= UMODE_BOTS;
1046 < } | T_CCONN
1040 > oper_umodes_item:  T_CCONN
1041   {
1042    if (conf_parser_ctx.pass == 2)
1043      block_state.modes.value |= UMODE_CCONN;
# Line 1055 | Line 1049 | oper_umodes_item:  T_BOTS
1049   {
1050    if (conf_parser_ctx.pass == 2)
1051      block_state.modes.value |= UMODE_DEBUG;
1052 < } | T_FULL
1052 > } | T_FLOOD
1053   {
1054    if (conf_parser_ctx.pass == 2)
1055 <    block_state.modes.value |= UMODE_FULL;
1055 >    block_state.modes.value |= UMODE_FLOOD;
1056   } | HIDDEN
1057   {
1058    if (conf_parser_ctx.pass == 2)
# Line 1083 | Line 1077 | oper_umodes_item:  T_BOTS
1077   {
1078    if (conf_parser_ctx.pass == 2)
1079      block_state.modes.value |= UMODE_REJ;
1086 – } | T_UNAUTH
1087 – {
1088 –  if (conf_parser_ctx.pass == 2)
1089 –    block_state.modes.value |= UMODE_UNAUTH;
1080   } | T_SPY
1081   {
1082    if (conf_parser_ctx.pass == 2)
# Line 2592 | Line 2582 | general_oper_umodes: OPER_UMODES
2582   } '=' umode_oitems ';' ;
2583  
2584   umode_oitems:    umode_oitems ',' umode_oitem | umode_oitem;
2585 < umode_oitem:     T_BOTS
2596 < {
2597 <  ConfigGeneral.oper_umodes |= UMODE_BOTS;
2598 < } | T_CCONN
2585 > umode_oitem: T_CCONN
2586   {
2587    ConfigGeneral.oper_umodes |= UMODE_CCONN;
2588   } | T_DEAF
# Line 2604 | Line 2591 | umode_oitem:     T_BOTS
2591   } | T_DEBUG
2592   {
2593    ConfigGeneral.oper_umodes |= UMODE_DEBUG;
2594 < } | T_FULL
2594 > } | T_FLOOD
2595   {
2596 <  ConfigGeneral.oper_umodes |= UMODE_FULL;
2596 >  ConfigGeneral.oper_umodes |= UMODE_FLOOD;
2597   } | HIDDEN
2598   {
2599    ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
# Line 2625 | Line 2612 | umode_oitem:     T_BOTS
2612   } | T_REJ
2613   {
2614    ConfigGeneral.oper_umodes |= UMODE_REJ;
2628 – } | T_UNAUTH
2629 – {
2630 –  ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
2615   } | T_SPY
2616   {
2617    ConfigGeneral.oper_umodes |= UMODE_SPY;
# Line 2669 | Line 2653 | general_oper_only_umodes: OPER_ONLY_UMOD
2653   } '=' umode_items ';' ;
2654  
2655   umode_items:  umode_items ',' umode_item | umode_item;
2656 < umode_item:   T_BOTS
2673 < {
2674 <  ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
2675 < } | T_CCONN
2656 > umode_item: T_CCONN
2657   {
2658    ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
2659   } | T_DEAF
# Line 2681 | Line 2662 | umode_item:   T_BOTS
2662   } | T_DEBUG
2663   {
2664    ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
2665 < } | T_FULL
2665 > } | T_FLOOD
2666   {
2667 <  ConfigGeneral.oper_only_umodes |= UMODE_FULL;
2667 >  ConfigGeneral.oper_only_umodes |= UMODE_FLOOD;
2668   } | T_SKILL
2669   {
2670    ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
# Line 2696 | Line 2677 | umode_item:   T_BOTS
2677   } | T_REJ
2678   {
2679    ConfigGeneral.oper_only_umodes |= UMODE_REJ;
2699 – } | T_UNAUTH
2700 – {
2701 –  ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
2680   } | T_SPY
2681   {
2682    ConfigGeneral.oper_only_umodes |= UMODE_SPY;

Diff Legend

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