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

Comparing ircd-hybrid/trunk/src/conf_parser.c (file contents):
Revision 4313 by michael, Thu Jul 31 18:50:11 2014 UTC vs.
Revision 4340 by michael, Sat Aug 2 16:53:22 2014 UTC

# Line 2970 | Line 2970 | yyreduce:
2970   #line 476 "conf_parser.y" /* yacc.c:1646  */
2971      {
2972   #ifdef HAVE_LIBCRYPTO
2973 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
2973 >  if (conf_parser_ctx.pass == 2 && ConfigServerInfo.server_ctx)
2974    {
2975 <    if (!ServerInfo.rsa_private_key_file)
2975 >    if (!ConfigServerInfo.rsa_private_key_file)
2976      {
2977        conf_error_report("No rsa_private_key_file specified, SSL disabled");
2978        break;
2979      }
2980  
2981 <    if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
2981 >    if (SSL_CTX_use_certificate_file(ConfigServerInfo.server_ctx, yylval.string,
2982                                       SSL_FILETYPE_PEM) <= 0 ||
2983 <        SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
2983 >        SSL_CTX_use_certificate_file(ConfigServerInfo.client_ctx, yylval.string,
2984                                       SSL_FILETYPE_PEM) <= 0)
2985      {
2986        report_crypto_errors();
# Line 2988 | Line 2988 | yyreduce:
2988        break;
2989      }
2990  
2991 <    if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
2991 >    if (SSL_CTX_use_PrivateKey_file(ConfigServerInfo.server_ctx, ConfigServerInfo.rsa_private_key_file,
2992                                      SSL_FILETYPE_PEM) <= 0 ||
2993 <        SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
2993 >        SSL_CTX_use_PrivateKey_file(ConfigServerInfo.client_ctx, ConfigServerInfo.rsa_private_key_file,
2994                                      SSL_FILETYPE_PEM) <= 0)
2995      {
2996        report_crypto_errors();
# Line 2998 | Line 2998 | yyreduce:
2998        break;
2999      }
3000  
3001 <    if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
3002 <        !SSL_CTX_check_private_key(ServerInfo.client_ctx))
3001 >    if (!SSL_CTX_check_private_key(ConfigServerInfo.server_ctx) ||
3002 >        !SSL_CTX_check_private_key(ConfigServerInfo.client_ctx))
3003      {
3004        report_crypto_errors();
3005        conf_error_report("Could not read RSA private key");
# Line 3020 | Line 3020 | yyreduce:
3020    if (conf_parser_ctx.pass != 1)
3021      break;
3022  
3023 <  if (ServerInfo.rsa_private_key)
3023 >  if (ConfigServerInfo.rsa_private_key)
3024    {
3025 <    RSA_free(ServerInfo.rsa_private_key);
3026 <    ServerInfo.rsa_private_key = NULL;
3025 >    RSA_free(ConfigServerInfo.rsa_private_key);
3026 >    ConfigServerInfo.rsa_private_key = NULL;
3027    }
3028  
3029 <  if (ServerInfo.rsa_private_key_file)
3029 >  if (ConfigServerInfo.rsa_private_key_file)
3030    {
3031 <    MyFree(ServerInfo.rsa_private_key_file);
3032 <    ServerInfo.rsa_private_key_file = NULL;
3031 >    MyFree(ConfigServerInfo.rsa_private_key_file);
3032 >    ConfigServerInfo.rsa_private_key_file = NULL;
3033    }
3034  
3035 <  ServerInfo.rsa_private_key_file = xstrdup(yylval.string);
3035 >  ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
3036  
3037    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3038    {
# Line 3040 | Line 3040 | yyreduce:
3040      break;
3041    }
3042  
3043 <  ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
3043 >  ConfigServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
3044  
3045    BIO_set_close(file, BIO_CLOSE);
3046    BIO_free(file);
3047  
3048 <  if (ServerInfo.rsa_private_key == NULL)
3048 >  if (ConfigServerInfo.rsa_private_key == NULL)
3049    {
3050      conf_error_report("Couldn't extract key, ignoring");
3051      break;
3052    }
3053  
3054 <  if (!RSA_check_key(ServerInfo.rsa_private_key))
3054 >  if (!RSA_check_key(ConfigServerInfo.rsa_private_key))
3055    {
3056 <    RSA_free(ServerInfo.rsa_private_key);
3057 <    ServerInfo.rsa_private_key = NULL;
3056 >    RSA_free(ConfigServerInfo.rsa_private_key);
3057 >    ConfigServerInfo.rsa_private_key = NULL;
3058  
3059      conf_error_report("Invalid key, ignoring");
3060      break;
3061    }
3062  
3063 <  if (RSA_size(ServerInfo.rsa_private_key) < 128)
3063 >  if (RSA_size(ConfigServerInfo.rsa_private_key) < 128)
3064    {
3065 <    RSA_free(ServerInfo.rsa_private_key);
3066 <    ServerInfo.rsa_private_key = NULL;
3065 >    RSA_free(ConfigServerInfo.rsa_private_key);
3066 >    ConfigServerInfo.rsa_private_key = NULL;
3067  
3068      conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
3069    }
# Line 3076 | Line 3076 | yyreduce:
3076   #line 576 "conf_parser.y" /* yacc.c:1646  */
3077      {
3078   #ifdef HAVE_LIBCRYPTO
3079 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3079 >  if (conf_parser_ctx.pass == 2 && ConfigServerInfo.server_ctx)
3080    {
3081      BIO *file = BIO_new_file(yylval.string, "r");
3082  
# Line 3091 | Line 3091 | yyreduce:
3091          if (DH_size(dh) < 128)
3092            conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
3093          else
3094 <          SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
3094 >          SSL_CTX_set_tmp_dh(ConfigServerInfo.server_ctx, dh);
3095  
3096          DH_free(dh);
3097        }
# Line 3108 | Line 3108 | yyreduce:
3108   #line 605 "conf_parser.y" /* yacc.c:1646  */
3109      {
3110   #ifdef HAVE_LIBCRYPTO
3111 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3112 <    SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
3111 >  if (conf_parser_ctx.pass == 2 && ConfigServerInfo.server_ctx)
3112 >    SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, yylval.string);
3113   #endif
3114   }
3115   #line 3116 "conf_parser.c" /* yacc.c:1646  */
# Line 3119 | Line 3119 | yyreduce:
3119   #line 613 "conf_parser.y" /* yacc.c:1646  */
3120      {
3121   #ifdef HAVE_LIBCRYPTO
3122 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3122 >  if (conf_parser_ctx.pass == 2 && ConfigServerInfo.server_ctx)
3123    {
3124 <    if ((ServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
3124 >    if ((ConfigServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
3125      {
3126 <      ServerInfo.message_digest_algorithm = EVP_sha256();
3126 >      ConfigServerInfo.message_digest_algorithm = EVP_sha256();
3127        conf_error_report("Ignoring serverinfo::ssl_message_digest_algorithm -- unknown message digest algorithm");
3128      }
3129    }
# Line 3140 | Line 3140 | yyreduce:
3140    int nid = 0;
3141    EC_KEY *key = NULL;
3142  
3143 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3143 >  if (conf_parser_ctx.pass == 2 && ConfigServerInfo.server_ctx)
3144    {
3145      if ((nid = OBJ_sn2nid(yylval.string)) == 0)
3146      {
# Line 3154 | Line 3154 | yyreduce:
3154        break;
3155      }
3156  
3157 <    SSL_CTX_set_tmp_ecdh(ServerInfo.server_ctx, key);
3157 >    SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
3158      EC_KEY_free(key);
3159   }
3160   #endif
# Line 3167 | Line 3167 | yyreduce:
3167   #line 655 "conf_parser.y" /* yacc.c:1646  */
3168      {
3169    /* this isn't rehashable */
3170 <  if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
3170 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
3171    {
3172      if (valid_servname(yylval.string))
3173 <      ServerInfo.name = xstrdup(yylval.string);
3173 >      ConfigServerInfo.name = xstrdup(yylval.string);
3174      else
3175      {
3176        conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
# Line 3185 | Line 3185 | yyreduce:
3185   #line 670 "conf_parser.y" /* yacc.c:1646  */
3186      {
3187    /* this isn't rehashable */
3188 <  if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
3188 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.sid)
3189    {
3190      if (valid_sid(yylval.string))
3191 <      ServerInfo.sid = xstrdup(yylval.string);
3191 >      ConfigServerInfo.sid = xstrdup(yylval.string);
3192      else
3193      {
3194        conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
# Line 3204 | Line 3204 | yyreduce:
3204      {
3205    if (conf_parser_ctx.pass == 2)
3206    {
3207 <    MyFree(ServerInfo.description);
3208 <    ServerInfo.description = xstrdup(yylval.string);
3207 >    MyFree(ConfigServerInfo.description);
3208 >    ConfigServerInfo.description = xstrdup(yylval.string);
3209    }
3210   }
3211   #line 3212 "conf_parser.c" /* yacc.c:1646  */
# Line 3221 | Line 3221 | yyreduce:
3221      if ((p = strchr(yylval.string, ' ')))
3222        *p = '\0';
3223  
3224 <    MyFree(ServerInfo.network_name);
3225 <    ServerInfo.network_name = xstrdup(yylval.string);
3224 >    MyFree(ConfigServerInfo.network_name);
3225 >    ConfigServerInfo.network_name = xstrdup(yylval.string);
3226    }
3227   }
3228   #line 3229 "conf_parser.c" /* yacc.c:1646  */
# Line 3234 | Line 3234 | yyreduce:
3234    if (conf_parser_ctx.pass != 2)
3235      break;
3236  
3237 <  MyFree(ServerInfo.network_desc);
3238 <  ServerInfo.network_desc = xstrdup(yylval.string);
3237 >  MyFree(ConfigServerInfo.network_desc);
3238 >  ConfigServerInfo.network_desc = xstrdup(yylval.string);
3239   }
3240   #line 3241 "conf_parser.c" /* yacc.c:1646  */
3241      break;
# Line 3259 | Line 3259 | yyreduce:
3259      {
3260        assert(res);
3261  
3262 <      memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
3263 <      ServerInfo.ip.ss.ss_family = res->ai_family;
3264 <      ServerInfo.ip.ss_len = res->ai_addrlen;
3262 >      memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
3263 >      ConfigServerInfo.ip.ss.ss_family = res->ai_family;
3264 >      ConfigServerInfo.ip.ss_len = res->ai_addrlen;
3265        freeaddrinfo(res);
3266  
3267 <      ServerInfo.specific_ipv4_vhost = 1;
3267 >      ConfigServerInfo.specific_ipv4_vhost = 1;
3268      }
3269    }
3270   }
# Line 3291 | Line 3291 | yyreduce:
3291      {
3292        assert(res);
3293  
3294 <      memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3295 <      ServerInfo.ip6.ss.ss_family = res->ai_family;
3296 <      ServerInfo.ip6.ss_len = res->ai_addrlen;
3294 >      memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3295 >      ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
3296 >      ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
3297        freeaddrinfo(res);
3298  
3299 <      ServerInfo.specific_ipv6_vhost = 1;
3299 >      ConfigServerInfo.specific_ipv6_vhost = 1;
3300      }
3301    }
3302   #endif
# Line 3316 | Line 3316 | yyreduce:
3316  
3317      snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3318      conf_error_report(buf);
3319 <    ServerInfo.max_clients = MAXCLIENTS_MIN;
3319 >    ConfigServerInfo.max_clients = MAXCLIENTS_MIN;
3320    }
3321    else if ((yyvsp[-1].number) > MAXCLIENTS_MAX)
3322    {
# Line 3324 | Line 3324 | yyreduce:
3324  
3325      snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3326      conf_error_report(buf);
3327 <    ServerInfo.max_clients = MAXCLIENTS_MAX;
3327 >    ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
3328    }
3329    else
3330 <    ServerInfo.max_clients = (yyvsp[-1].number);
3330 >    ConfigServerInfo.max_clients = (yyvsp[-1].number);
3331   }
3332   #line 3333 "conf_parser.c" /* yacc.c:1646  */
3333      break;
# Line 3341 | Line 3341 | yyreduce:
3341    if ((yyvsp[-1].number) < 9)
3342    {
3343      conf_error_report("max_nick_length too low, setting to 9");
3344 <    ServerInfo.max_nick_length = 9;
3344 >    ConfigServerInfo.max_nick_length = 9;
3345    }
3346    else if ((yyvsp[-1].number) > NICKLEN)
3347    {
# Line 3349 | Line 3349 | yyreduce:
3349  
3350      snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
3351      conf_error_report(buf);
3352 <    ServerInfo.max_nick_length = NICKLEN;
3352 >    ConfigServerInfo.max_nick_length = NICKLEN;
3353    }
3354    else
3355 <    ServerInfo.max_nick_length = (yyvsp[-1].number);
3355 >    ConfigServerInfo.max_nick_length = (yyvsp[-1].number);
3356   }
3357   #line 3358 "conf_parser.c" /* yacc.c:1646  */
3358      break;
# Line 3366 | Line 3366 | yyreduce:
3366    if ((yyvsp[-1].number) < 80)
3367    {
3368      conf_error_report("max_topic_length too low, setting to 80");
3369 <    ServerInfo.max_topic_length = 80;
3369 >    ConfigServerInfo.max_topic_length = 80;
3370    }
3371    else if ((yyvsp[-1].number) > TOPICLEN)
3372    {
# Line 3374 | Line 3374 | yyreduce:
3374  
3375      snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
3376      conf_error_report(buf);
3377 <    ServerInfo.max_topic_length = TOPICLEN;
3377 >    ConfigServerInfo.max_topic_length = TOPICLEN;
3378    }
3379    else
3380 <    ServerInfo.max_topic_length = (yyvsp[-1].number);
3380 >    ConfigServerInfo.max_topic_length = (yyvsp[-1].number);
3381   }
3382   #line 3383 "conf_parser.c" /* yacc.c:1646  */
3383      break;
# Line 3386 | Line 3386 | yyreduce:
3386   #line 844 "conf_parser.y" /* yacc.c:1646  */
3387      {
3388    if (conf_parser_ctx.pass == 2)
3389 <    ServerInfo.hub = yylval.number;
3389 >    ConfigServerInfo.hub = yylval.number;
3390   }
3391   #line 3392 "conf_parser.c" /* yacc.c:1646  */
3392      break;
# Line 3397 | Line 3397 | yyreduce:
3397    if (conf_parser_ctx.pass != 2)
3398      break;
3399  
3400 <  MyFree(AdminInfo.name);
3401 <  AdminInfo.name = xstrdup(yylval.string);
3400 >  MyFree(ConfigAdminInfo.name);
3401 >  ConfigAdminInfo.name = xstrdup(yylval.string);
3402   }
3403   #line 3404 "conf_parser.c" /* yacc.c:1646  */
3404      break;
# Line 3409 | Line 3409 | yyreduce:
3409    if (conf_parser_ctx.pass != 2)
3410      break;
3411  
3412 <  MyFree(AdminInfo.email);
3413 <  AdminInfo.email = xstrdup(yylval.string);
3412 >  MyFree(ConfigAdminInfo.email);
3413 >  ConfigAdminInfo.email = xstrdup(yylval.string);
3414   }
3415   #line 3416 "conf_parser.c" /* yacc.c:1646  */
3416      break;
# Line 3421 | Line 3421 | yyreduce:
3421    if (conf_parser_ctx.pass != 2)
3422      break;
3423  
3424 <  MyFree(AdminInfo.description);
3425 <  AdminInfo.description = xstrdup(yylval.string);
3424 >  MyFree(ConfigAdminInfo.description);
3425 >  ConfigAdminInfo.description = xstrdup(yylval.string);
3426   }
3427   #line 3428 "conf_parser.c" /* yacc.c:1646  */
3428      break;
# Line 3475 | Line 3475 | yyreduce:
3475   #line 933 "conf_parser.y" /* yacc.c:1646  */
3476      {
3477    if (conf_parser_ctx.pass == 2)
3478 <    ConfigLoggingEntry.use_logging = yylval.number;
3478 >    ConfigLog.use_logging = yylval.number;
3479   }
3480   #line 3481 "conf_parser.c" /* yacc.c:1646  */
3481      break;
# Line 4523 | Line 4523 | yyreduce:
4523    {
4524      if (block_state.flags.value & LISTENER_SSL)
4525   #ifdef HAVE_LIBCRYPTO
4526 <      if (!ServerInfo.server_ctx)
4526 >      if (!ConfigServerInfo.server_ctx)
4527   #endif
4528        {
4529          conf_error_report("SSL not available - port closed");
# Line 4542 | Line 4542 | yyreduce:
4542    {
4543      if (block_state.flags.value & LISTENER_SSL)
4544   #ifdef HAVE_LIBCRYPTO
4545 <      if (!ServerInfo.server_ctx)
4545 >      if (!ConfigServerInfo.server_ctx)
4546   #endif
4547        {
4548          conf_error_report("SSL not available - port closed");
# Line 5616 | Line 5616 | yyreduce:
5616    case 506:
5617   #line 2522 "conf_parser.y" /* yacc.c:1646  */
5618      {
5619 <  ConfigFileEntry.away_count = (yyvsp[-1].number);
5619 >  ConfigGeneral.away_count = (yyvsp[-1].number);
5620   }
5621   #line 5622 "conf_parser.c" /* yacc.c:1646  */
5622      break;
# Line 5624 | Line 5624 | yyreduce:
5624    case 507:
5625   #line 2527 "conf_parser.y" /* yacc.c:1646  */
5626      {
5627 <  ConfigFileEntry.away_time = (yyvsp[-1].number);
5627 >  ConfigGeneral.away_time = (yyvsp[-1].number);
5628   }
5629   #line 5630 "conf_parser.c" /* yacc.c:1646  */
5630      break;
# Line 5632 | Line 5632 | yyreduce:
5632    case 508:
5633   #line 2532 "conf_parser.y" /* yacc.c:1646  */
5634      {
5635 <  ConfigFileEntry.max_watch = (yyvsp[-1].number);
5635 >  ConfigGeneral.max_watch = (yyvsp[-1].number);
5636   }
5637   #line 5638 "conf_parser.c" /* yacc.c:1646  */
5638      break;
# Line 5641 | Line 5641 | yyreduce:
5641   #line 2537 "conf_parser.y" /* yacc.c:1646  */
5642      {
5643    if (conf_parser_ctx.pass == 2)
5644 <    ConfigFileEntry.cycle_on_host_change = yylval.number;
5644 >    ConfigGeneral.cycle_on_host_change = yylval.number;
5645   }
5646   #line 5647 "conf_parser.c" /* yacc.c:1646  */
5647      break;
# Line 5650 | Line 5650 | yyreduce:
5650   #line 2543 "conf_parser.y" /* yacc.c:1646  */
5651      {
5652    if (conf_parser_ctx.pass == 2)
5653 <    ConfigFileEntry.glines = yylval.number;
5653 >    ConfigGeneral.glines = yylval.number;
5654   }
5655   #line 5656 "conf_parser.c" /* yacc.c:1646  */
5656      break;
# Line 5659 | Line 5659 | yyreduce:
5659   #line 2549 "conf_parser.y" /* yacc.c:1646  */
5660      {
5661    if (conf_parser_ctx.pass == 2)
5662 <    ConfigFileEntry.gline_time = (yyvsp[-1].number);
5662 >    ConfigGeneral.gline_time = (yyvsp[-1].number);
5663   }
5664   #line 5665 "conf_parser.c" /* yacc.c:1646  */
5665      break;
# Line 5668 | Line 5668 | yyreduce:
5668   #line 2555 "conf_parser.y" /* yacc.c:1646  */
5669      {
5670    if (conf_parser_ctx.pass == 2)
5671 <    ConfigFileEntry.gline_request_time = (yyvsp[-1].number);
5671 >    ConfigGeneral.gline_request_time = (yyvsp[-1].number);
5672   }
5673   #line 5674 "conf_parser.c" /* yacc.c:1646  */
5674      break;
# Line 5676 | Line 5676 | yyreduce:
5676    case 513:
5677   #line 2561 "conf_parser.y" /* yacc.c:1646  */
5678      {
5679 <  ConfigFileEntry.gline_min_cidr = (yyvsp[-1].number);
5679 >  ConfigGeneral.gline_min_cidr = (yyvsp[-1].number);
5680   }
5681   #line 5682 "conf_parser.c" /* yacc.c:1646  */
5682      break;
# Line 5684 | Line 5684 | yyreduce:
5684    case 514:
5685   #line 2566 "conf_parser.y" /* yacc.c:1646  */
5686      {
5687 <  ConfigFileEntry.gline_min_cidr6 = (yyvsp[-1].number);
5687 >  ConfigGeneral.gline_min_cidr6 = (yyvsp[-1].number);
5688   }
5689   #line 5690 "conf_parser.c" /* yacc.c:1646  */
5690      break;
# Line 5692 | Line 5692 | yyreduce:
5692    case 515:
5693   #line 2571 "conf_parser.y" /* yacc.c:1646  */
5694      {
5695 <  ConfigFileEntry.tkline_expire_notices = yylval.number;
5695 >  ConfigGeneral.tkline_expire_notices = yylval.number;
5696   }
5697   #line 5698 "conf_parser.c" /* yacc.c:1646  */
5698      break;
# Line 5700 | Line 5700 | yyreduce:
5700    case 516:
5701   #line 2576 "conf_parser.y" /* yacc.c:1646  */
5702      {
5703 <  ConfigFileEntry.kill_chase_time_limit = (yyvsp[-1].number);
5703 >  ConfigGeneral.kill_chase_time_limit = (yyvsp[-1].number);
5704   }
5705   #line 5706 "conf_parser.c" /* yacc.c:1646  */
5706      break;
# Line 5708 | Line 5708 | yyreduce:
5708    case 517:
5709   #line 2581 "conf_parser.y" /* yacc.c:1646  */
5710      {
5711 <  ConfigFileEntry.hide_spoof_ips = yylval.number;
5711 >  ConfigGeneral.hide_spoof_ips = yylval.number;
5712   }
5713   #line 5714 "conf_parser.c" /* yacc.c:1646  */
5714      break;
# Line 5716 | Line 5716 | yyreduce:
5716    case 518:
5717   #line 2586 "conf_parser.y" /* yacc.c:1646  */
5718      {
5719 <  ConfigFileEntry.ignore_bogus_ts = yylval.number;
5719 >  ConfigGeneral.ignore_bogus_ts = yylval.number;
5720   }
5721   #line 5722 "conf_parser.c" /* yacc.c:1646  */
5722      break;
# Line 5724 | Line 5724 | yyreduce:
5724    case 519:
5725   #line 2591 "conf_parser.y" /* yacc.c:1646  */
5726      {
5727 <  ConfigFileEntry.failed_oper_notice = yylval.number;
5727 >  ConfigGeneral.failed_oper_notice = yylval.number;
5728   }
5729   #line 5730 "conf_parser.c" /* yacc.c:1646  */
5730      break;
# Line 5732 | Line 5732 | yyreduce:
5732    case 520:
5733   #line 2596 "conf_parser.y" /* yacc.c:1646  */
5734      {
5735 <  ConfigFileEntry.anti_nick_flood = yylval.number;
5735 >  ConfigGeneral.anti_nick_flood = yylval.number;
5736   }
5737   #line 5738 "conf_parser.c" /* yacc.c:1646  */
5738      break;
# Line 5740 | Line 5740 | yyreduce:
5740    case 521:
5741   #line 2601 "conf_parser.y" /* yacc.c:1646  */
5742      {
5743 <  ConfigFileEntry.max_nick_time = (yyvsp[-1].number);
5743 >  ConfigGeneral.max_nick_time = (yyvsp[-1].number);
5744   }
5745   #line 5746 "conf_parser.c" /* yacc.c:1646  */
5746      break;
# Line 5748 | Line 5748 | yyreduce:
5748    case 522:
5749   #line 2606 "conf_parser.y" /* yacc.c:1646  */
5750      {
5751 <  ConfigFileEntry.max_nick_changes = (yyvsp[-1].number);
5751 >  ConfigGeneral.max_nick_changes = (yyvsp[-1].number);
5752   }
5753   #line 5754 "conf_parser.c" /* yacc.c:1646  */
5754      break;
# Line 5756 | Line 5756 | yyreduce:
5756    case 523:
5757   #line 2611 "conf_parser.y" /* yacc.c:1646  */
5758      {
5759 <  ConfigFileEntry.max_accept = (yyvsp[-1].number);
5759 >  ConfigGeneral.max_accept = (yyvsp[-1].number);
5760   }
5761   #line 5762 "conf_parser.c" /* yacc.c:1646  */
5762      break;
# Line 5764 | Line 5764 | yyreduce:
5764    case 524:
5765   #line 2616 "conf_parser.y" /* yacc.c:1646  */
5766      {
5767 <  ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[-1].number);
5767 >  ConfigGeneral.anti_spam_exit_message_time = (yyvsp[-1].number);
5768   }
5769   #line 5770 "conf_parser.c" /* yacc.c:1646  */
5770      break;
# Line 5772 | Line 5772 | yyreduce:
5772    case 525:
5773   #line 2621 "conf_parser.y" /* yacc.c:1646  */
5774      {
5775 <  ConfigFileEntry.ts_warn_delta = (yyvsp[-1].number);
5775 >  ConfigGeneral.ts_warn_delta = (yyvsp[-1].number);
5776   }
5777   #line 5778 "conf_parser.c" /* yacc.c:1646  */
5778      break;
# Line 5781 | Line 5781 | yyreduce:
5781   #line 2626 "conf_parser.y" /* yacc.c:1646  */
5782      {
5783    if (conf_parser_ctx.pass == 2)
5784 <    ConfigFileEntry.ts_max_delta = (yyvsp[-1].number);
5784 >    ConfigGeneral.ts_max_delta = (yyvsp[-1].number);
5785   }
5786   #line 5787 "conf_parser.c" /* yacc.c:1646  */
5787      break;
# Line 5803 | Line 5803 | yyreduce:
5803    case 528:
5804   #line 2643 "conf_parser.y" /* yacc.c:1646  */
5805      {
5806 <  ConfigFileEntry.invisible_on_connect = yylval.number;
5806 >  ConfigGeneral.invisible_on_connect = yylval.number;
5807   }
5808   #line 5809 "conf_parser.c" /* yacc.c:1646  */
5809      break;
# Line 5811 | Line 5811 | yyreduce:
5811    case 529:
5812   #line 2648 "conf_parser.y" /* yacc.c:1646  */
5813      {
5814 <  ConfigFileEntry.warn_no_connect_block = yylval.number;
5814 >  ConfigGeneral.warn_no_connect_block = yylval.number;
5815   }
5816   #line 5817 "conf_parser.c" /* yacc.c:1646  */
5817      break;
# Line 5819 | Line 5819 | yyreduce:
5819    case 530:
5820   #line 2653 "conf_parser.y" /* yacc.c:1646  */
5821      {
5822 <  ConfigFileEntry.stats_e_disabled = yylval.number;
5822 >  ConfigGeneral.stats_e_disabled = yylval.number;
5823   }
5824   #line 5825 "conf_parser.c" /* yacc.c:1646  */
5825      break;
# Line 5827 | Line 5827 | yyreduce:
5827    case 531:
5828   #line 2658 "conf_parser.y" /* yacc.c:1646  */
5829      {
5830 <  ConfigFileEntry.stats_o_oper_only = yylval.number;
5830 >  ConfigGeneral.stats_o_oper_only = yylval.number;
5831   }
5832   #line 5833 "conf_parser.c" /* yacc.c:1646  */
5833      break;
# Line 5835 | Line 5835 | yyreduce:
5835    case 532:
5836   #line 2663 "conf_parser.y" /* yacc.c:1646  */
5837      {
5838 <  ConfigFileEntry.stats_P_oper_only = yylval.number;
5838 >  ConfigGeneral.stats_P_oper_only = yylval.number;
5839   }
5840   #line 5841 "conf_parser.c" /* yacc.c:1646  */
5841      break;
# Line 5843 | Line 5843 | yyreduce:
5843    case 533:
5844   #line 2668 "conf_parser.y" /* yacc.c:1646  */
5845      {
5846 <  ConfigFileEntry.stats_u_oper_only = yylval.number;
5846 >  ConfigGeneral.stats_u_oper_only = yylval.number;
5847   }
5848   #line 5849 "conf_parser.c" /* yacc.c:1646  */
5849      break;
# Line 5851 | Line 5851 | yyreduce:
5851    case 534:
5852   #line 2673 "conf_parser.y" /* yacc.c:1646  */
5853      {
5854 <  ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
5854 >  ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
5855   }
5856   #line 5857 "conf_parser.c" /* yacc.c:1646  */
5857      break;
# Line 5859 | Line 5859 | yyreduce:
5859    case 535:
5860   #line 2676 "conf_parser.y" /* yacc.c:1646  */
5861      {
5862 <  ConfigFileEntry.stats_k_oper_only = 1;
5862 >  ConfigGeneral.stats_k_oper_only = 1;
5863   }
5864   #line 5865 "conf_parser.c" /* yacc.c:1646  */
5865      break;
# Line 5867 | Line 5867 | yyreduce:
5867    case 536:
5868   #line 2681 "conf_parser.y" /* yacc.c:1646  */
5869      {
5870 <  ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
5870 >  ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
5871   }
5872   #line 5873 "conf_parser.c" /* yacc.c:1646  */
5873      break;
# Line 5875 | Line 5875 | yyreduce:
5875    case 537:
5876   #line 2684 "conf_parser.y" /* yacc.c:1646  */
5877      {
5878 <  ConfigFileEntry.stats_i_oper_only = 1;
5878 >  ConfigGeneral.stats_i_oper_only = 1;
5879   }
5880   #line 5881 "conf_parser.c" /* yacc.c:1646  */
5881      break;
# Line 5883 | Line 5883 | yyreduce:
5883    case 538:
5884   #line 2689 "conf_parser.y" /* yacc.c:1646  */
5885      {
5886 <  ConfigFileEntry.pace_wait = (yyvsp[-1].number);
5886 >  ConfigGeneral.pace_wait = (yyvsp[-1].number);
5887   }
5888   #line 5889 "conf_parser.c" /* yacc.c:1646  */
5889      break;
# Line 5891 | Line 5891 | yyreduce:
5891    case 539:
5892   #line 2694 "conf_parser.y" /* yacc.c:1646  */
5893      {
5894 <  ConfigFileEntry.caller_id_wait = (yyvsp[-1].number);
5894 >  ConfigGeneral.caller_id_wait = (yyvsp[-1].number);
5895   }
5896   #line 5897 "conf_parser.c" /* yacc.c:1646  */
5897      break;
# Line 5899 | Line 5899 | yyreduce:
5899    case 540:
5900   #line 2699 "conf_parser.y" /* yacc.c:1646  */
5901      {
5902 <  ConfigFileEntry.opers_bypass_callerid = yylval.number;
5902 >  ConfigGeneral.opers_bypass_callerid = yylval.number;
5903   }
5904   #line 5905 "conf_parser.c" /* yacc.c:1646  */
5905      break;
# Line 5907 | Line 5907 | yyreduce:
5907    case 541:
5908   #line 2704 "conf_parser.y" /* yacc.c:1646  */
5909      {
5910 <  ConfigFileEntry.pace_wait_simple = (yyvsp[-1].number);
5910 >  ConfigGeneral.pace_wait_simple = (yyvsp[-1].number);
5911   }
5912   #line 5913 "conf_parser.c" /* yacc.c:1646  */
5913      break;
# Line 5915 | Line 5915 | yyreduce:
5915    case 542:
5916   #line 2709 "conf_parser.y" /* yacc.c:1646  */
5917      {
5918 <  ConfigFileEntry.short_motd = yylval.number;
5918 >  ConfigGeneral.short_motd = yylval.number;
5919   }
5920   #line 5921 "conf_parser.c" /* yacc.c:1646  */
5921      break;
# Line 5923 | Line 5923 | yyreduce:
5923    case 543:
5924   #line 2714 "conf_parser.y" /* yacc.c:1646  */
5925      {
5926 <  ConfigFileEntry.no_oper_flood = yylval.number;
5926 >  ConfigGeneral.no_oper_flood = yylval.number;
5927   }
5928   #line 5929 "conf_parser.c" /* yacc.c:1646  */
5929      break;
# Line 5931 | Line 5931 | yyreduce:
5931    case 544:
5932   #line 2719 "conf_parser.y" /* yacc.c:1646  */
5933      {
5934 <  ConfigFileEntry.true_no_oper_flood = yylval.number;
5934 >  ConfigGeneral.true_no_oper_flood = yylval.number;
5935   }
5936   #line 5937 "conf_parser.c" /* yacc.c:1646  */
5937      break;
# Line 5939 | Line 5939 | yyreduce:
5939    case 545:
5940   #line 2724 "conf_parser.y" /* yacc.c:1646  */
5941      {
5942 <  ConfigFileEntry.oper_pass_resv = yylval.number;
5942 >  ConfigGeneral.oper_pass_resv = yylval.number;
5943   }
5944   #line 5945 "conf_parser.c" /* yacc.c:1646  */
5945      break;
# Line 5947 | Line 5947 | yyreduce:
5947    case 546:
5948   #line 2729 "conf_parser.y" /* yacc.c:1646  */
5949      {
5950 <  ConfigFileEntry.dots_in_ident = (yyvsp[-1].number);
5950 >  ConfigGeneral.dots_in_ident = (yyvsp[-1].number);
5951   }
5952   #line 5953 "conf_parser.c" /* yacc.c:1646  */
5953      break;
# Line 5955 | Line 5955 | yyreduce:
5955    case 547:
5956   #line 2734 "conf_parser.y" /* yacc.c:1646  */
5957      {
5958 <  ConfigFileEntry.max_targets = (yyvsp[-1].number);
5958 >  ConfigGeneral.max_targets = (yyvsp[-1].number);
5959   }
5960   #line 5961 "conf_parser.c" /* yacc.c:1646  */
5961      break;
# Line 5965 | Line 5965 | yyreduce:
5965      {
5966    if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
5967    {
5968 <    MyFree(ConfigFileEntry.service_name);
5969 <    ConfigFileEntry.service_name = xstrdup(yylval.string);
5968 >    MyFree(ConfigGeneral.service_name);
5969 >    ConfigGeneral.service_name = xstrdup(yylval.string);
5970    }
5971   }
5972   #line 5973 "conf_parser.c" /* yacc.c:1646  */
# Line 5975 | Line 5975 | yyreduce:
5975    case 549:
5976   #line 2748 "conf_parser.y" /* yacc.c:1646  */
5977      {
5978 <  ConfigFileEntry.ping_cookie = yylval.number;
5978 >  ConfigGeneral.ping_cookie = yylval.number;
5979   }
5980   #line 5981 "conf_parser.c" /* yacc.c:1646  */
5981      break;
# Line 5983 | Line 5983 | yyreduce:
5983    case 550:
5984   #line 2753 "conf_parser.y" /* yacc.c:1646  */
5985      {
5986 <  ConfigFileEntry.disable_auth = yylval.number;
5986 >  ConfigGeneral.disable_auth = yylval.number;
5987   }
5988   #line 5989 "conf_parser.c" /* yacc.c:1646  */
5989      break;
# Line 5991 | Line 5991 | yyreduce:
5991    case 551:
5992   #line 2758 "conf_parser.y" /* yacc.c:1646  */
5993      {
5994 <  ConfigFileEntry.throttle_count = (yyvsp[-1].number);
5994 >  ConfigGeneral.throttle_count = (yyvsp[-1].number);
5995   }
5996   #line 5997 "conf_parser.c" /* yacc.c:1646  */
5997      break;
# Line 5999 | Line 5999 | yyreduce:
5999    case 552:
6000   #line 2763 "conf_parser.y" /* yacc.c:1646  */
6001      {
6002 <  ConfigFileEntry.throttle_time = (yyvsp[-1].number);
6002 >  ConfigGeneral.throttle_time = (yyvsp[-1].number);
6003   }
6004   #line 6005 "conf_parser.c" /* yacc.c:1646  */
6005      break;
# Line 6007 | Line 6007 | yyreduce:
6007    case 553:
6008   #line 2768 "conf_parser.y" /* yacc.c:1646  */
6009      {
6010 <  ConfigFileEntry.oper_umodes = 0;
6010 >  ConfigGeneral.oper_umodes = 0;
6011   }
6012   #line 6013 "conf_parser.c" /* yacc.c:1646  */
6013      break;
# Line 6015 | Line 6015 | yyreduce:
6015    case 557:
6016   #line 2774 "conf_parser.y" /* yacc.c:1646  */
6017      {
6018 <  ConfigFileEntry.oper_umodes |= UMODE_BOTS;
6018 >  ConfigGeneral.oper_umodes |= UMODE_BOTS;
6019   }
6020   #line 6021 "conf_parser.c" /* yacc.c:1646  */
6021      break;
# Line 6023 | Line 6023 | yyreduce:
6023    case 558:
6024   #line 2777 "conf_parser.y" /* yacc.c:1646  */
6025      {
6026 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN;
6026 >  ConfigGeneral.oper_umodes |= UMODE_CCONN;
6027   }
6028   #line 6029 "conf_parser.c" /* yacc.c:1646  */
6029      break;
# Line 6031 | Line 6031 | yyreduce:
6031    case 559:
6032   #line 2780 "conf_parser.y" /* yacc.c:1646  */
6033      {
6034 <  ConfigFileEntry.oper_umodes |= UMODE_DEAF;
6034 >  ConfigGeneral.oper_umodes |= UMODE_DEAF;
6035   }
6036   #line 6037 "conf_parser.c" /* yacc.c:1646  */
6037      break;
# Line 6039 | Line 6039 | yyreduce:
6039    case 560:
6040   #line 2783 "conf_parser.y" /* yacc.c:1646  */
6041      {
6042 <  ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
6042 >  ConfigGeneral.oper_umodes |= UMODE_DEBUG;
6043   }
6044   #line 6045 "conf_parser.c" /* yacc.c:1646  */
6045      break;
# Line 6047 | Line 6047 | yyreduce:
6047    case 561:
6048   #line 2786 "conf_parser.y" /* yacc.c:1646  */
6049      {
6050 <  ConfigFileEntry.oper_umodes |= UMODE_FULL;
6050 >  ConfigGeneral.oper_umodes |= UMODE_FULL;
6051   }
6052   #line 6053 "conf_parser.c" /* yacc.c:1646  */
6053      break;
# Line 6055 | Line 6055 | yyreduce:
6055    case 562:
6056   #line 2789 "conf_parser.y" /* yacc.c:1646  */
6057      {
6058 <  ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
6058 >  ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
6059   }
6060   #line 6061 "conf_parser.c" /* yacc.c:1646  */
6061      break;
# Line 6063 | Line 6063 | yyreduce:
6063    case 563:
6064   #line 2792 "conf_parser.y" /* yacc.c:1646  */
6065      {
6066 <  ConfigFileEntry.oper_umodes |= UMODE_HIDECHANS;
6066 >  ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
6067   }
6068   #line 6069 "conf_parser.c" /* yacc.c:1646  */
6069      break;
# Line 6071 | Line 6071 | yyreduce:
6071    case 564:
6072   #line 2795 "conf_parser.y" /* yacc.c:1646  */
6073      {
6074 <  ConfigFileEntry.oper_umodes |= UMODE_HIDEIDLE;
6074 >  ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
6075   }
6076   #line 6077 "conf_parser.c" /* yacc.c:1646  */
6077      break;
# Line 6079 | Line 6079 | yyreduce:
6079    case 565:
6080   #line 2798 "conf_parser.y" /* yacc.c:1646  */
6081      {
6082 <  ConfigFileEntry.oper_umodes |= UMODE_SKILL;
6082 >  ConfigGeneral.oper_umodes |= UMODE_SKILL;
6083   }
6084   #line 6085 "conf_parser.c" /* yacc.c:1646  */
6085      break;
# Line 6087 | Line 6087 | yyreduce:
6087    case 566:
6088   #line 2801 "conf_parser.y" /* yacc.c:1646  */
6089      {
6090 <  ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
6090 >  ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
6091   }
6092   #line 6093 "conf_parser.c" /* yacc.c:1646  */
6093      break;
# Line 6095 | Line 6095 | yyreduce:
6095    case 567:
6096   #line 2804 "conf_parser.y" /* yacc.c:1646  */
6097      {
6098 <  ConfigFileEntry.oper_umodes |= UMODE_REJ;
6098 >  ConfigGeneral.oper_umodes |= UMODE_REJ;
6099   }
6100   #line 6101 "conf_parser.c" /* yacc.c:1646  */
6101      break;
# Line 6103 | Line 6103 | yyreduce:
6103    case 568:
6104   #line 2807 "conf_parser.y" /* yacc.c:1646  */
6105      {
6106 <  ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
6106 >  ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
6107   }
6108   #line 6109 "conf_parser.c" /* yacc.c:1646  */
6109      break;
# Line 6111 | Line 6111 | yyreduce:
6111    case 569:
6112   #line 2810 "conf_parser.y" /* yacc.c:1646  */
6113      {
6114 <  ConfigFileEntry.oper_umodes |= UMODE_SPY;
6114 >  ConfigGeneral.oper_umodes |= UMODE_SPY;
6115   }
6116   #line 6117 "conf_parser.c" /* yacc.c:1646  */
6117      break;
# Line 6119 | Line 6119 | yyreduce:
6119    case 570:
6120   #line 2813 "conf_parser.y" /* yacc.c:1646  */
6121      {
6122 <  ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
6122 >  ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
6123   }
6124   #line 6125 "conf_parser.c" /* yacc.c:1646  */
6125      break;
# Line 6127 | Line 6127 | yyreduce:
6127    case 571:
6128   #line 2816 "conf_parser.y" /* yacc.c:1646  */
6129      {
6130 <  ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
6130 >  ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
6131   }
6132   #line 6133 "conf_parser.c" /* yacc.c:1646  */
6133      break;
# Line 6135 | Line 6135 | yyreduce:
6135    case 572:
6136   #line 2819 "conf_parser.y" /* yacc.c:1646  */
6137      {
6138 <  ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
6138 >  ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
6139   }
6140   #line 6141 "conf_parser.c" /* yacc.c:1646  */
6141      break;
# Line 6143 | Line 6143 | yyreduce:
6143    case 573:
6144   #line 2822 "conf_parser.y" /* yacc.c:1646  */
6145      {
6146 <  ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
6146 >  ConfigGeneral.oper_umodes |= UMODE_WALLOP;
6147   }
6148   #line 6149 "conf_parser.c" /* yacc.c:1646  */
6149      break;
# Line 6151 | Line 6151 | yyreduce:
6151    case 574:
6152   #line 2825 "conf_parser.y" /* yacc.c:1646  */
6153      {
6154 <  ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
6154 >  ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
6155   }
6156   #line 6157 "conf_parser.c" /* yacc.c:1646  */
6157      break;
# Line 6159 | Line 6159 | yyreduce:
6159    case 575:
6160   #line 2828 "conf_parser.y" /* yacc.c:1646  */
6161      {
6162 <  ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
6162 >  ConfigGeneral.oper_umodes |= UMODE_CALLERID;
6163   }
6164   #line 6165 "conf_parser.c" /* yacc.c:1646  */
6165      break;
# Line 6167 | Line 6167 | yyreduce:
6167    case 576:
6168   #line 2831 "conf_parser.y" /* yacc.c:1646  */
6169      {
6170 <  ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
6170 >  ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
6171   }
6172   #line 6173 "conf_parser.c" /* yacc.c:1646  */
6173      break;
# Line 6175 | Line 6175 | yyreduce:
6175    case 577:
6176   #line 2834 "conf_parser.y" /* yacc.c:1646  */
6177      {
6178 <  ConfigFileEntry.oper_umodes |= UMODE_REGONLY;
6178 >  ConfigGeneral.oper_umodes |= UMODE_REGONLY;
6179   }
6180   #line 6181 "conf_parser.c" /* yacc.c:1646  */
6181      break;
# Line 6183 | Line 6183 | yyreduce:
6183    case 578:
6184   #line 2837 "conf_parser.y" /* yacc.c:1646  */
6185      {
6186 <  ConfigFileEntry.oper_umodes |= UMODE_FARCONNECT;
6186 >  ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
6187   }
6188   #line 6189 "conf_parser.c" /* yacc.c:1646  */
6189      break;
# Line 6191 | Line 6191 | yyreduce:
6191    case 579:
6192   #line 2842 "conf_parser.y" /* yacc.c:1646  */
6193      {
6194 <  ConfigFileEntry.oper_only_umodes = 0;
6194 >  ConfigGeneral.oper_only_umodes = 0;
6195   }
6196   #line 6197 "conf_parser.c" /* yacc.c:1646  */
6197      break;
# Line 6199 | Line 6199 | yyreduce:
6199    case 583:
6200   #line 2848 "conf_parser.y" /* yacc.c:1646  */
6201      {
6202 <  ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
6202 >  ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
6203   }
6204   #line 6205 "conf_parser.c" /* yacc.c:1646  */
6205      break;
# Line 6207 | Line 6207 | yyreduce:
6207    case 584:
6208   #line 2851 "conf_parser.y" /* yacc.c:1646  */
6209      {
6210 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
6210 >  ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
6211   }
6212   #line 6213 "conf_parser.c" /* yacc.c:1646  */
6213      break;
# Line 6215 | Line 6215 | yyreduce:
6215    case 585:
6216   #line 2854 "conf_parser.y" /* yacc.c:1646  */
6217      {
6218 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
6218 >  ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
6219   }
6220   #line 6221 "conf_parser.c" /* yacc.c:1646  */
6221      break;
# Line 6223 | Line 6223 | yyreduce:
6223    case 586:
6224   #line 2857 "conf_parser.y" /* yacc.c:1646  */
6225      {
6226 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
6226 >  ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
6227   }
6228   #line 6229 "conf_parser.c" /* yacc.c:1646  */
6229      break;
# Line 6231 | Line 6231 | yyreduce:
6231    case 587:
6232   #line 2860 "conf_parser.y" /* yacc.c:1646  */
6233      {
6234 <  ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
6234 >  ConfigGeneral.oper_only_umodes |= UMODE_FULL;
6235   }
6236   #line 6237 "conf_parser.c" /* yacc.c:1646  */
6237      break;
# Line 6239 | Line 6239 | yyreduce:
6239    case 588:
6240   #line 2863 "conf_parser.y" /* yacc.c:1646  */
6241      {
6242 <  ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
6242 >  ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
6243   }
6244   #line 6245 "conf_parser.c" /* yacc.c:1646  */
6245      break;
# Line 6247 | Line 6247 | yyreduce:
6247    case 589:
6248   #line 2866 "conf_parser.y" /* yacc.c:1646  */
6249      {
6250 <  ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
6250 >  ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
6251   }
6252   #line 6253 "conf_parser.c" /* yacc.c:1646  */
6253      break;
# Line 6255 | Line 6255 | yyreduce:
6255    case 590:
6256   #line 2869 "conf_parser.y" /* yacc.c:1646  */
6257      {
6258 <  ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
6258 >  ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
6259   }
6260   #line 6261 "conf_parser.c" /* yacc.c:1646  */
6261      break;
# Line 6263 | Line 6263 | yyreduce:
6263    case 591:
6264   #line 2872 "conf_parser.y" /* yacc.c:1646  */
6265      {
6266 <  ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
6266 >  ConfigGeneral.oper_only_umodes |= UMODE_REJ;
6267   }
6268   #line 6269 "conf_parser.c" /* yacc.c:1646  */
6269      break;
# Line 6271 | Line 6271 | yyreduce:
6271    case 592:
6272   #line 2875 "conf_parser.y" /* yacc.c:1646  */
6273      {
6274 <  ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
6274 >  ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
6275   }
6276   #line 6277 "conf_parser.c" /* yacc.c:1646  */
6277      break;
# Line 6279 | Line 6279 | yyreduce:
6279    case 593:
6280   #line 2878 "conf_parser.y" /* yacc.c:1646  */
6281      {
6282 <  ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
6282 >  ConfigGeneral.oper_only_umodes |= UMODE_SPY;
6283   }
6284   #line 6285 "conf_parser.c" /* yacc.c:1646  */
6285      break;
# Line 6287 | Line 6287 | yyreduce:
6287    case 594:
6288   #line 2881 "conf_parser.y" /* yacc.c:1646  */
6289      {
6290 <  ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
6290 >  ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
6291   }
6292   #line 6293 "conf_parser.c" /* yacc.c:1646  */
6293      break;
# Line 6295 | Line 6295 | yyreduce:
6295    case 595:
6296   #line 2884 "conf_parser.y" /* yacc.c:1646  */
6297      {
6298 <  ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
6298 >  ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
6299   }
6300   #line 6301 "conf_parser.c" /* yacc.c:1646  */
6301      break;
# Line 6303 | Line 6303 | yyreduce:
6303    case 596:
6304   #line 2887 "conf_parser.y" /* yacc.c:1646  */
6305      {
6306 <  ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
6306 >  ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
6307   }
6308   #line 6309 "conf_parser.c" /* yacc.c:1646  */
6309      break;
# Line 6311 | Line 6311 | yyreduce:
6311    case 597:
6312   #line 2890 "conf_parser.y" /* yacc.c:1646  */
6313      {
6314 <  ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
6314 >  ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
6315   }
6316   #line 6317 "conf_parser.c" /* yacc.c:1646  */
6317      break;
# Line 6319 | Line 6319 | yyreduce:
6319    case 598:
6320   #line 2893 "conf_parser.y" /* yacc.c:1646  */
6321      {
6322 <  ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
6322 >  ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
6323   }
6324   #line 6325 "conf_parser.c" /* yacc.c:1646  */
6325      break;
# Line 6327 | Line 6327 | yyreduce:
6327    case 599:
6328   #line 2896 "conf_parser.y" /* yacc.c:1646  */
6329      {
6330 <  ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
6330 >  ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
6331   }
6332   #line 6333 "conf_parser.c" /* yacc.c:1646  */
6333      break;
# Line 6335 | Line 6335 | yyreduce:
6335    case 600:
6336   #line 2899 "conf_parser.y" /* yacc.c:1646  */
6337      {
6338 <  ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
6338 >  ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
6339   }
6340   #line 6341 "conf_parser.c" /* yacc.c:1646  */
6341      break;
# Line 6343 | Line 6343 | yyreduce:
6343    case 601:
6344   #line 2902 "conf_parser.y" /* yacc.c:1646  */
6345      {
6346 <  ConfigFileEntry.oper_only_umodes |= UMODE_REGONLY;
6346 >  ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
6347   }
6348   #line 6349 "conf_parser.c" /* yacc.c:1646  */
6349      break;
# Line 6351 | Line 6351 | yyreduce:
6351    case 602:
6352   #line 2905 "conf_parser.y" /* yacc.c:1646  */
6353      {
6354 <  ConfigFileEntry.oper_only_umodes |= UMODE_FARCONNECT;
6354 >  ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
6355   }
6356   #line 6357 "conf_parser.c" /* yacc.c:1646  */
6357      break;
# Line 6359 | Line 6359 | yyreduce:
6359    case 603:
6360   #line 2910 "conf_parser.y" /* yacc.c:1646  */
6361      {
6362 <  ConfigFileEntry.min_nonwildcard = (yyvsp[-1].number);
6362 >  ConfigGeneral.min_nonwildcard = (yyvsp[-1].number);
6363   }
6364   #line 6365 "conf_parser.c" /* yacc.c:1646  */
6365      break;
# Line 6367 | Line 6367 | yyreduce:
6367    case 604:
6368   #line 2915 "conf_parser.y" /* yacc.c:1646  */
6369      {
6370 <  ConfigFileEntry.min_nonwildcard_simple = (yyvsp[-1].number);
6370 >  ConfigGeneral.min_nonwildcard_simple = (yyvsp[-1].number);
6371   }
6372   #line 6373 "conf_parser.c" /* yacc.c:1646  */
6373      break;
# Line 6375 | Line 6375 | yyreduce:
6375    case 605:
6376   #line 2920 "conf_parser.y" /* yacc.c:1646  */
6377      {
6378 <  ConfigFileEntry.default_floodcount = (yyvsp[-1].number);
6378 >  ConfigGeneral.default_floodcount = (yyvsp[-1].number);
6379   }
6380   #line 6381 "conf_parser.c" /* yacc.c:1646  */
6381      break;

Diff Legend

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