- klines, dlines, xlines, glines and resv now make use of the new database;

  also, temporary *lines are now stored, so they're not lost after
  restarting the ircd. This also applies to G-lines.


git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1622 82007160-df01-0410-b94d-b575c5fd34c7

1 files changed, 158 insertions, 156 deletions

diff --git a/src/conf_parser.c b/src/conf_parser.c
index 28901a6..ae5874f 100644
--- a/src/conf_parser.c
+++ b/src/conf_parser.c
@@ -1251,31 +1251,31 @@ static const yytype_uint16 yyrline[] =
     2059,  2059,  2060,  2060,  2060,  2061,  2061,  2062,  2062,  2062,
     2063,  2063,  2063,  2064,  2064,  2065,  2067,  2076,  2085,  2111,
     2129,  2147,  2153,  2157,  2166,  2165,  2169,  2169,  2170,  2174,
-    2180,  2191,  2202,  2213,  2222,  2241,  2240,  2306,  2305,  2309,
-    2309,  2310,  2316,  2316,  2317,  2317,  2317,  2317,  2319,  2338,
-    2348,  2347,  2372,  2372,  2373,  2373,  2373,  2375,  2381,  2390,
-    2392,  2392,  2393,  2393,  2395,  2414,  2413,  2461,  2460,  2464,
-    2464,  2465,  2471,  2471,  2472,  2472,  2472,  2472,  2474,  2480,
-    2489,  2492,  2492,  2493,  2493,  2494,  2494,  2495,  2495,  2496,
-    2496,  2497,  2497,  2498,  2499,  2500,  2500,  2501,  2501,  2502,
-    2502,  2503,  2503,  2504,  2504,  2505,  2505,  2506,  2507,  2507,
-    2508,  2508,  2509,  2509,  2510,  2510,  2511,  2511,  2512,  2513,
-    2513,  2514,  2515,  2516,  2516,  2517,  2517,  2518,  2519,  2520,
-    2521,  2521,  2522,  2525,  2530,  2536,  2542,  2548,  2553,  2558,
-    2563,  2568,  2573,  2578,  2583,  2588,  2593,  2598,  2603,  2608,
-    2613,  2618,  2624,  2635,  2640,  2645,  2650,  2655,  2660,  2663,
-    2668,  2671,  2676,  2681,  2686,  2691,  2696,  2701,  2706,  2711,
-    2716,  2727,  2732,  2737,  2742,  2751,  2760,  2765,  2770,  2776,
-    2775,  2780,  2780,  2781,  2784,  2787,  2790,  2793,  2796,  2799,
-    2802,  2805,  2808,  2811,  2814,  2817,  2820,  2823,  2826,  2829,
-    2832,  2835,  2838,  2844,  2843,  2848,  2848,  2849,  2852,  2855,
-    2858,  2861,  2864,  2867,  2870,  2873,  2876,  2879,  2882,  2885,
-    2888,  2891,  2894,  2897,  2900,  2903,  2906,  2911,  2916,  2921,
-    2930,  2933,  2933,  2934,  2935,  2935,  2936,  2936,  2937,  2937,
-    2938,  2939,  2939,  2940,  2941,  2941,  2942,  2942,  2944,  2949,
-    2954,  2959,  2964,  2969,  2974,  2979,  2984,  2989,  2994,  2999,
-    3004,  3009,  3017,  3020,  3020,  3021,  3021,  3022,  3023,  3023,
-    3024,  3025,  3027,  3033,  3039,  3048,  3062,  3068
+    2180,  2191,  2202,  2213,  2222,  2241,  2240,  2308,  2307,  2311,
+    2311,  2312,  2318,  2318,  2319,  2319,  2319,  2319,  2321,  2340,
+    2350,  2349,  2373,  2373,  2374,  2374,  2374,  2376,  2382,  2391,
+    2393,  2393,  2394,  2394,  2396,  2415,  2414,  2463,  2462,  2466,
+    2466,  2467,  2473,  2473,  2474,  2474,  2474,  2474,  2476,  2482,
+    2491,  2494,  2494,  2495,  2495,  2496,  2496,  2497,  2497,  2498,
+    2498,  2499,  2499,  2500,  2501,  2502,  2502,  2503,  2503,  2504,
+    2504,  2505,  2505,  2506,  2506,  2507,  2507,  2508,  2509,  2509,
+    2510,  2510,  2511,  2511,  2512,  2512,  2513,  2513,  2514,  2515,
+    2515,  2516,  2517,  2518,  2518,  2519,  2519,  2520,  2521,  2522,
+    2523,  2523,  2524,  2527,  2532,  2538,  2544,  2550,  2555,  2560,
+    2565,  2570,  2575,  2580,  2585,  2590,  2595,  2600,  2605,  2610,
+    2615,  2620,  2626,  2637,  2642,  2647,  2652,  2657,  2662,  2665,
+    2670,  2673,  2678,  2683,  2688,  2693,  2698,  2703,  2708,  2713,
+    2718,  2729,  2734,  2739,  2744,  2753,  2762,  2767,  2772,  2778,
+    2777,  2782,  2782,  2783,  2786,  2789,  2792,  2795,  2798,  2801,
+    2804,  2807,  2810,  2813,  2816,  2819,  2822,  2825,  2828,  2831,
+    2834,  2837,  2840,  2846,  2845,  2850,  2850,  2851,  2854,  2857,
+    2860,  2863,  2866,  2869,  2872,  2875,  2878,  2881,  2884,  2887,
+    2890,  2893,  2896,  2899,  2902,  2905,  2908,  2913,  2918,  2923,
+    2932,  2935,  2935,  2936,  2937,  2937,  2938,  2938,  2939,  2939,
+    2940,  2941,  2941,  2942,  2943,  2943,  2944,  2944,  2946,  2951,
+    2956,  2961,  2966,  2971,  2976,  2981,  2986,  2991,  2996,  3001,
+    3006,  3011,  3019,  3022,  3022,  3023,  3023,  3024,  3025,  3025,
+    3026,  3027,  3029,  3035,  3041,  3050,  3064,  3070
 };
 #endif
 
@@ -5682,6 +5682,8 @@ yyreduce:
         yy_aconf->regexuser = exp_user;
         yy_aconf->regexhost = exp_host;
 
+        SetConfMain(yy_aconf);
+
         DupString(yy_aconf->user, userbuf);
         DupString(yy_aconf->host, hostbuf);
 
@@ -5696,10 +5698,10 @@ yyreduce:
       }
       else
       {
-        find_and_delete_temporary(userbuf, hostbuf, CONF_KLINE);
-
         yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
 
+        SetConfMain(yy_aconf);
+
         DupString(yy_aconf->user, userbuf);
         DupString(yy_aconf->host, hostbuf);
 
@@ -5718,14 +5720,14 @@ yyreduce:
 
   case 387:
 /* Line 1813 of yacc.c  */
-#line 2306 "conf_parser.y"
+#line 2308 "conf_parser.y"
     {
 }
     break;
 
   case 391:
 /* Line 1813 of yacc.c  */
-#line 2311 "conf_parser.y"
+#line 2313 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     regex_ban = 1;
@@ -5734,7 +5736,7 @@ yyreduce:
 
   case 398:
 /* Line 1813 of yacc.c  */
-#line 2320 "conf_parser.y"
+#line 2322 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5756,7 +5758,7 @@ yyreduce:
 
   case 399:
 /* Line 1813 of yacc.c  */
-#line 2339 "conf_parser.y"
+#line 2341 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
@@ -5765,7 +5767,7 @@ yyreduce:
 
   case 400:
 /* Line 1813 of yacc.c  */
-#line 2348 "conf_parser.y"
+#line 2350 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     hostbuf[0] = reasonbuf[0] = '\0';
@@ -5774,16 +5776,15 @@ yyreduce:
 
   case 401:
 /* Line 1813 of yacc.c  */
-#line 2352 "conf_parser.y"
+#line 2354 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
     if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
     {
-      find_and_delete_temporary(NULL, hostbuf, CONF_DLINE);
-
       yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
       DupString(yy_aconf->host, hostbuf);
+      SetConfMain(yy_aconf);
 
       if (reasonbuf[0])
         DupString(yy_aconf->reason, reasonbuf);
@@ -5798,7 +5799,7 @@ yyreduce:
 
   case 407:
 /* Line 1813 of yacc.c  */
-#line 2376 "conf_parser.y"
+#line 2377 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
@@ -5807,7 +5808,7 @@ yyreduce:
 
   case 408:
 /* Line 1813 of yacc.c  */
-#line 2382 "conf_parser.y"
+#line 2383 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
@@ -5816,7 +5817,7 @@ yyreduce:
 
   case 414:
 /* Line 1813 of yacc.c  */
-#line 2396 "conf_parser.y"
+#line 2397 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5834,7 +5835,7 @@ yyreduce:
 
   case 415:
 /* Line 1813 of yacc.c  */
-#line 2414 "conf_parser.y"
+#line 2415 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5846,7 +5847,7 @@ yyreduce:
 
   case 416:
 /* Line 1813 of yacc.c  */
-#line 2421 "conf_parser.y"
+#line 2422 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -5875,6 +5876,7 @@ yyreduce:
       else
         yy_conf = make_conf_item(XLINE_TYPE);
 
+      SetConfMain(yy_conf);
       yy_match_item = map_to_conf(yy_conf);
       DupString(yy_conf->name, gecos_name);
 
@@ -5889,14 +5891,14 @@ yyreduce:
 
   case 417:
 /* Line 1813 of yacc.c  */
-#line 2461 "conf_parser.y"
+#line 2463 "conf_parser.y"
     {
 }
     break;
 
   case 421:
 /* Line 1813 of yacc.c  */
-#line 2466 "conf_parser.y"
+#line 2468 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     regex_ban = 1;
@@ -5905,7 +5907,7 @@ yyreduce:
 
   case 428:
 /* Line 1813 of yacc.c  */
-#line 2475 "conf_parser.y"
+#line 2477 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
@@ -5914,7 +5916,7 @@ yyreduce:
 
   case 429:
 /* Line 1813 of yacc.c  */
-#line 2481 "conf_parser.y"
+#line 2483 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
@@ -5923,7 +5925,7 @@ yyreduce:
 
   case 483:
 /* Line 1813 of yacc.c  */
-#line 2526 "conf_parser.y"
+#line 2528 "conf_parser.y"
     {
   ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number);
 }
@@ -5931,7 +5933,7 @@ yyreduce:
 
   case 484:
 /* Line 1813 of yacc.c  */
-#line 2531 "conf_parser.y"
+#line 2533 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigFileEntry.glines = yylval.number;
@@ -5940,7 +5942,7 @@ yyreduce:
 
   case 485:
 /* Line 1813 of yacc.c  */
-#line 2537 "conf_parser.y"
+#line 2539 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number);
@@ -5949,7 +5951,7 @@ yyreduce:
 
   case 486:
 /* Line 1813 of yacc.c  */
-#line 2543 "conf_parser.y"
+#line 2545 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigFileEntry.gline_request_time = (yyvsp[(3) - (4)].number);
@@ -5958,7 +5960,7 @@ yyreduce:
 
   case 487:
 /* Line 1813 of yacc.c  */
-#line 2549 "conf_parser.y"
+#line 2551 "conf_parser.y"
     {
   ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number);
 }
@@ -5966,7 +5968,7 @@ yyreduce:
 
   case 488:
 /* Line 1813 of yacc.c  */
-#line 2554 "conf_parser.y"
+#line 2556 "conf_parser.y"
     {
   ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number);
 }
@@ -5974,7 +5976,7 @@ yyreduce:
 
   case 489:
 /* Line 1813 of yacc.c  */
-#line 2559 "conf_parser.y"
+#line 2561 "conf_parser.y"
     {
   ConfigFileEntry.tkline_expire_notices = yylval.number;
 }
@@ -5982,7 +5984,7 @@ yyreduce:
 
   case 490:
 /* Line 1813 of yacc.c  */
-#line 2564 "conf_parser.y"
+#line 2566 "conf_parser.y"
     {
   ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number);
 }
@@ -5990,7 +5992,7 @@ yyreduce:
 
   case 491:
 /* Line 1813 of yacc.c  */
-#line 2569 "conf_parser.y"
+#line 2571 "conf_parser.y"
     {
   ConfigFileEntry.hide_spoof_ips = yylval.number;
 }
@@ -5998,7 +6000,7 @@ yyreduce:
 
   case 492:
 /* Line 1813 of yacc.c  */
-#line 2574 "conf_parser.y"
+#line 2576 "conf_parser.y"
     {
   ConfigFileEntry.ignore_bogus_ts = yylval.number;
 }
@@ -6006,7 +6008,7 @@ yyreduce:
 
   case 493:
 /* Line 1813 of yacc.c  */
-#line 2579 "conf_parser.y"
+#line 2581 "conf_parser.y"
     {
   ConfigFileEntry.disable_remote = yylval.number;
 }
@@ -6014,7 +6016,7 @@ yyreduce:
 
   case 494:
 /* Line 1813 of yacc.c  */
-#line 2584 "conf_parser.y"
+#line 2586 "conf_parser.y"
     {
   ConfigFileEntry.failed_oper_notice = yylval.number;
 }
@@ -6022,7 +6024,7 @@ yyreduce:
 
   case 495:
 /* Line 1813 of yacc.c  */
-#line 2589 "conf_parser.y"
+#line 2591 "conf_parser.y"
     {
   ConfigFileEntry.anti_nick_flood = yylval.number;
 }
@@ -6030,7 +6032,7 @@ yyreduce:
 
   case 496:
 /* Line 1813 of yacc.c  */
-#line 2594 "conf_parser.y"
+#line 2596 "conf_parser.y"
     {
   ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number); 
 }
@@ -6038,7 +6040,7 @@ yyreduce:
 
   case 497:
 /* Line 1813 of yacc.c  */
-#line 2599 "conf_parser.y"
+#line 2601 "conf_parser.y"
     {
   ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number);
 }
@@ -6046,7 +6048,7 @@ yyreduce:
 
   case 498:
 /* Line 1813 of yacc.c  */
-#line 2604 "conf_parser.y"
+#line 2606 "conf_parser.y"
     {
   ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number);
 }
@@ -6054,7 +6056,7 @@ yyreduce:
 
   case 499:
 /* Line 1813 of yacc.c  */
-#line 2609 "conf_parser.y"
+#line 2611 "conf_parser.y"
     {
   ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number);
 }
@@ -6062,7 +6064,7 @@ yyreduce:
 
   case 500:
 /* Line 1813 of yacc.c  */
-#line 2614 "conf_parser.y"
+#line 2616 "conf_parser.y"
     {
   ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number);
 }
@@ -6070,7 +6072,7 @@ yyreduce:
 
   case 501:
 /* Line 1813 of yacc.c  */
-#line 2619 "conf_parser.y"
+#line 2621 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number);
@@ -6079,7 +6081,7 @@ yyreduce:
 
   case 502:
 /* Line 1813 of yacc.c  */
-#line 2625 "conf_parser.y"
+#line 2627 "conf_parser.y"
     {
   if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1)
   {
@@ -6093,7 +6095,7 @@ yyreduce:
 
   case 503:
 /* Line 1813 of yacc.c  */
-#line 2636 "conf_parser.y"
+#line 2638 "conf_parser.y"
     {
   ConfigFileEntry.invisible_on_connect = yylval.number;
 }
@@ -6101,7 +6103,7 @@ yyreduce:
 
   case 504:
 /* Line 1813 of yacc.c  */
-#line 2641 "conf_parser.y"
+#line 2643 "conf_parser.y"
     {
   ConfigFileEntry.warn_no_nline = yylval.number;
 }
@@ -6109,7 +6111,7 @@ yyreduce:
 
   case 505:
 /* Line 1813 of yacc.c  */
-#line 2646 "conf_parser.y"
+#line 2648 "conf_parser.y"
     {
   ConfigFileEntry.stats_e_disabled = yylval.number;
 }
@@ -6117,7 +6119,7 @@ yyreduce:
 
   case 506:
 /* Line 1813 of yacc.c  */
-#line 2651 "conf_parser.y"
+#line 2653 "conf_parser.y"
     {
   ConfigFileEntry.stats_o_oper_only = yylval.number;
 }
@@ -6125,7 +6127,7 @@ yyreduce:
 
   case 507:
 /* Line 1813 of yacc.c  */
-#line 2656 "conf_parser.y"
+#line 2658 "conf_parser.y"
     {
   ConfigFileEntry.stats_P_oper_only = yylval.number;
 }
@@ -6133,7 +6135,7 @@ yyreduce:
 
   case 508:
 /* Line 1813 of yacc.c  */
-#line 2661 "conf_parser.y"
+#line 2663 "conf_parser.y"
     {
   ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
 }
@@ -6141,7 +6143,7 @@ yyreduce:
 
   case 509:
 /* Line 1813 of yacc.c  */
-#line 2664 "conf_parser.y"
+#line 2666 "conf_parser.y"
     {
   ConfigFileEntry.stats_k_oper_only = 1;
 }
@@ -6149,7 +6151,7 @@ yyreduce:
 
   case 510:
 /* Line 1813 of yacc.c  */
-#line 2669 "conf_parser.y"
+#line 2671 "conf_parser.y"
     {
   ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
 }
@@ -6157,7 +6159,7 @@ yyreduce:
 
   case 511:
 /* Line 1813 of yacc.c  */
-#line 2672 "conf_parser.y"
+#line 2674 "conf_parser.y"
     {
   ConfigFileEntry.stats_i_oper_only = 1;
 }
@@ -6165,7 +6167,7 @@ yyreduce:
 
   case 512:
 /* Line 1813 of yacc.c  */
-#line 2677 "conf_parser.y"
+#line 2679 "conf_parser.y"
     {
   ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number);
 }
@@ -6173,7 +6175,7 @@ yyreduce:
 
   case 513:
 /* Line 1813 of yacc.c  */
-#line 2682 "conf_parser.y"
+#line 2684 "conf_parser.y"
     {
   ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number);
 }
@@ -6181,7 +6183,7 @@ yyreduce:
 
   case 514:
 /* Line 1813 of yacc.c  */
-#line 2687 "conf_parser.y"
+#line 2689 "conf_parser.y"
     {
   ConfigFileEntry.opers_bypass_callerid = yylval.number;
 }
@@ -6189,7 +6191,7 @@ yyreduce:
 
   case 515:
 /* Line 1813 of yacc.c  */
-#line 2692 "conf_parser.y"
+#line 2694 "conf_parser.y"
     {
   ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number);
 }
@@ -6197,7 +6199,7 @@ yyreduce:
 
   case 516:
 /* Line 1813 of yacc.c  */
-#line 2697 "conf_parser.y"
+#line 2699 "conf_parser.y"
     {
   ConfigFileEntry.short_motd = yylval.number;
 }
@@ -6205,7 +6207,7 @@ yyreduce:
 
   case 517:
 /* Line 1813 of yacc.c  */
-#line 2702 "conf_parser.y"
+#line 2704 "conf_parser.y"
     {
   ConfigFileEntry.no_oper_flood = yylval.number;
 }
@@ -6213,7 +6215,7 @@ yyreduce:
 
   case 518:
 /* Line 1813 of yacc.c  */
-#line 2707 "conf_parser.y"
+#line 2709 "conf_parser.y"
     {
   ConfigFileEntry.true_no_oper_flood = yylval.number;
 }
@@ -6221,7 +6223,7 @@ yyreduce:
 
   case 519:
 /* Line 1813 of yacc.c  */
-#line 2712 "conf_parser.y"
+#line 2714 "conf_parser.y"
     {
   ConfigFileEntry.oper_pass_resv = yylval.number;
 }
@@ -6229,7 +6231,7 @@ yyreduce:
 
   case 520:
 /* Line 1813 of yacc.c  */
-#line 2717 "conf_parser.y"
+#line 2719 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -6243,7 +6245,7 @@ yyreduce:
 
   case 521:
 /* Line 1813 of yacc.c  */
-#line 2728 "conf_parser.y"
+#line 2730 "conf_parser.y"
     {
   ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number);
 }
@@ -6251,7 +6253,7 @@ yyreduce:
 
   case 522:
 /* Line 1813 of yacc.c  */
-#line 2733 "conf_parser.y"
+#line 2735 "conf_parser.y"
     {
   ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number);
 }
@@ -6259,7 +6261,7 @@ yyreduce:
 
   case 523:
 /* Line 1813 of yacc.c  */
-#line 2738 "conf_parser.y"
+#line 2740 "conf_parser.y"
     {
   ConfigFileEntry.use_egd = yylval.number;
 }
@@ -6267,7 +6269,7 @@ yyreduce:
 
   case 524:
 /* Line 1813 of yacc.c  */
-#line 2743 "conf_parser.y"
+#line 2745 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -6279,7 +6281,7 @@ yyreduce:
 
   case 525:
 /* Line 1813 of yacc.c  */
-#line 2752 "conf_parser.y"
+#line 2754 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
   {
@@ -6291,7 +6293,7 @@ yyreduce:
 
   case 526:
 /* Line 1813 of yacc.c  */
-#line 2761 "conf_parser.y"
+#line 2763 "conf_parser.y"
     {
   ConfigFileEntry.ping_cookie = yylval.number;
 }
@@ -6299,7 +6301,7 @@ yyreduce:
 
   case 527:
 /* Line 1813 of yacc.c  */
-#line 2766 "conf_parser.y"
+#line 2768 "conf_parser.y"
     {
   ConfigFileEntry.disable_auth = yylval.number;
 }
@@ -6307,7 +6309,7 @@ yyreduce:
 
   case 528:
 /* Line 1813 of yacc.c  */
-#line 2771 "conf_parser.y"
+#line 2773 "conf_parser.y"
     {
   ConfigFileEntry.throttle_time = yylval.number;
 }
@@ -6315,7 +6317,7 @@ yyreduce:
 
   case 529:
 /* Line 1813 of yacc.c  */
-#line 2776 "conf_parser.y"
+#line 2778 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes = 0;
 }
@@ -6323,7 +6325,7 @@ yyreduce:
 
   case 533:
 /* Line 1813 of yacc.c  */
-#line 2782 "conf_parser.y"
+#line 2784 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_BOTS;
 }
@@ -6331,7 +6333,7 @@ yyreduce:
 
   case 534:
 /* Line 1813 of yacc.c  */
-#line 2785 "conf_parser.y"
+#line 2787 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_CCONN;
 }
@@ -6339,7 +6341,7 @@ yyreduce:
 
   case 535:
 /* Line 1813 of yacc.c  */
-#line 2788 "conf_parser.y"
+#line 2790 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
 }
@@ -6347,7 +6349,7 @@ yyreduce:
 
   case 536:
 /* Line 1813 of yacc.c  */
-#line 2791 "conf_parser.y"
+#line 2793 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_DEAF;
 }
@@ -6355,7 +6357,7 @@ yyreduce:
 
   case 537:
 /* Line 1813 of yacc.c  */
-#line 2794 "conf_parser.y"
+#line 2796 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
 }
@@ -6363,7 +6365,7 @@ yyreduce:
 
   case 538:
 /* Line 1813 of yacc.c  */
-#line 2797 "conf_parser.y"
+#line 2799 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_FULL;
 }
@@ -6371,7 +6373,7 @@ yyreduce:
 
   case 539:
 /* Line 1813 of yacc.c  */
-#line 2800 "conf_parser.y"
+#line 2802 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
 }
@@ -6379,7 +6381,7 @@ yyreduce:
 
   case 540:
 /* Line 1813 of yacc.c  */
-#line 2803 "conf_parser.y"
+#line 2805 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_SKILL;
 }
@@ -6387,7 +6389,7 @@ yyreduce:
 
   case 541:
 /* Line 1813 of yacc.c  */
-#line 2806 "conf_parser.y"
+#line 2808 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
 }
@@ -6395,7 +6397,7 @@ yyreduce:
 
   case 542:
 /* Line 1813 of yacc.c  */
-#line 2809 "conf_parser.y"
+#line 2811 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_REJ;
 }
@@ -6403,7 +6405,7 @@ yyreduce:
 
   case 543:
 /* Line 1813 of yacc.c  */
-#line 2812 "conf_parser.y"
+#line 2814 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
 }
@@ -6411,7 +6413,7 @@ yyreduce:
 
   case 544:
 /* Line 1813 of yacc.c  */
-#line 2815 "conf_parser.y"
+#line 2817 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_SPY;
 }
@@ -6419,7 +6421,7 @@ yyreduce:
 
   case 545:
 /* Line 1813 of yacc.c  */
-#line 2818 "conf_parser.y"
+#line 2820 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
 }
@@ -6427,7 +6429,7 @@ yyreduce:
 
   case 546:
 /* Line 1813 of yacc.c  */
-#line 2821 "conf_parser.y"
+#line 2823 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
 }
@@ -6435,7 +6437,7 @@ yyreduce:
 
   case 547:
 /* Line 1813 of yacc.c  */
-#line 2824 "conf_parser.y"
+#line 2826 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
 }
@@ -6443,7 +6445,7 @@ yyreduce:
 
   case 548:
 /* Line 1813 of yacc.c  */
-#line 2827 "conf_parser.y"
+#line 2829 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
 }
@@ -6451,7 +6453,7 @@ yyreduce:
 
   case 549:
 /* Line 1813 of yacc.c  */
-#line 2830 "conf_parser.y"
+#line 2832 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
 }
@@ -6459,7 +6461,7 @@ yyreduce:
 
   case 550:
 /* Line 1813 of yacc.c  */
-#line 2833 "conf_parser.y"
+#line 2835 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
 }
@@ -6467,7 +6469,7 @@ yyreduce:
 
   case 551:
 /* Line 1813 of yacc.c  */
-#line 2836 "conf_parser.y"
+#line 2838 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
 }
@@ -6475,7 +6477,7 @@ yyreduce:
 
   case 552:
 /* Line 1813 of yacc.c  */
-#line 2839 "conf_parser.y"
+#line 2841 "conf_parser.y"
     {
   ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
 }
@@ -6483,7 +6485,7 @@ yyreduce:
 
   case 553:
 /* Line 1813 of yacc.c  */
-#line 2844 "conf_parser.y"
+#line 2846 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes = 0;
 }
@@ -6491,7 +6493,7 @@ yyreduce:
 
   case 557:
 /* Line 1813 of yacc.c  */
-#line 2850 "conf_parser.y"
+#line 2852 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
 }
@@ -6499,7 +6501,7 @@ yyreduce:
 
   case 558:
 /* Line 1813 of yacc.c  */
-#line 2853 "conf_parser.y"
+#line 2855 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
 }
@@ -6507,7 +6509,7 @@ yyreduce:
 
   case 559:
 /* Line 1813 of yacc.c  */
-#line 2856 "conf_parser.y"
+#line 2858 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
 }
@@ -6515,7 +6517,7 @@ yyreduce:
 
   case 560:
 /* Line 1813 of yacc.c  */
-#line 2859 "conf_parser.y"
+#line 2861 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
 }
@@ -6523,7 +6525,7 @@ yyreduce:
 
   case 561:
 /* Line 1813 of yacc.c  */
-#line 2862 "conf_parser.y"
+#line 2864 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
 }
@@ -6531,7 +6533,7 @@ yyreduce:
 
   case 562:
 /* Line 1813 of yacc.c  */
-#line 2865 "conf_parser.y"
+#line 2867 "conf_parser.y"
     { 
   ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
 }
@@ -6539,7 +6541,7 @@ yyreduce:
 
   case 563:
 /* Line 1813 of yacc.c  */
-#line 2868 "conf_parser.y"
+#line 2870 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
 }
@@ -6547,7 +6549,7 @@ yyreduce:
 
   case 564:
 /* Line 1813 of yacc.c  */
-#line 2871 "conf_parser.y"
+#line 2873 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
 }
@@ -6555,7 +6557,7 @@ yyreduce:
 
   case 565:
 /* Line 1813 of yacc.c  */
-#line 2874 "conf_parser.y"
+#line 2876 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
 }
@@ -6563,7 +6565,7 @@ yyreduce:
 
   case 566:
 /* Line 1813 of yacc.c  */
-#line 2877 "conf_parser.y"
+#line 2879 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
 }
@@ -6571,7 +6573,7 @@ yyreduce:
 
   case 567:
 /* Line 1813 of yacc.c  */
-#line 2880 "conf_parser.y"
+#line 2882 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
 }
@@ -6579,7 +6581,7 @@ yyreduce:
 
   case 568:
 /* Line 1813 of yacc.c  */
-#line 2883 "conf_parser.y"
+#line 2885 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
 }
@@ -6587,7 +6589,7 @@ yyreduce:
 
   case 569:
 /* Line 1813 of yacc.c  */
-#line 2886 "conf_parser.y"
+#line 2888 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
 }
@@ -6595,7 +6597,7 @@ yyreduce:
 
   case 570:
 /* Line 1813 of yacc.c  */
-#line 2889 "conf_parser.y"
+#line 2891 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
 }
@@ -6603,7 +6605,7 @@ yyreduce:
 
   case 571:
 /* Line 1813 of yacc.c  */
-#line 2892 "conf_parser.y"
+#line 2894 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
 }
@@ -6611,7 +6613,7 @@ yyreduce:
 
   case 572:
 /* Line 1813 of yacc.c  */
-#line 2895 "conf_parser.y"
+#line 2897 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
 }
@@ -6619,7 +6621,7 @@ yyreduce:
 
   case 573:
 /* Line 1813 of yacc.c  */
-#line 2898 "conf_parser.y"
+#line 2900 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
 }
@@ -6627,7 +6629,7 @@ yyreduce:
 
   case 574:
 /* Line 1813 of yacc.c  */
-#line 2901 "conf_parser.y"
+#line 2903 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
 }
@@ -6635,7 +6637,7 @@ yyreduce:
 
   case 575:
 /* Line 1813 of yacc.c  */
-#line 2904 "conf_parser.y"
+#line 2906 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
 }
@@ -6643,7 +6645,7 @@ yyreduce:
 
   case 576:
 /* Line 1813 of yacc.c  */
-#line 2907 "conf_parser.y"
+#line 2909 "conf_parser.y"
     {
   ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
 }
@@ -6651,7 +6653,7 @@ yyreduce:
 
   case 577:
 /* Line 1813 of yacc.c  */
-#line 2912 "conf_parser.y"
+#line 2914 "conf_parser.y"
     {
   ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number);
 }
@@ -6659,7 +6661,7 @@ yyreduce:
 
   case 578:
 /* Line 1813 of yacc.c  */
-#line 2917 "conf_parser.y"
+#line 2919 "conf_parser.y"
     {
   ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number);
 }
@@ -6667,7 +6669,7 @@ yyreduce:
 
   case 579:
 /* Line 1813 of yacc.c  */
-#line 2922 "conf_parser.y"
+#line 2924 "conf_parser.y"
     {
   ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number);
 }
@@ -6675,7 +6677,7 @@ yyreduce:
 
   case 598:
 /* Line 1813 of yacc.c  */
-#line 2945 "conf_parser.y"
+#line 2947 "conf_parser.y"
     {
   ConfigChannel.disable_fake_channels = yylval.number;
 }
@@ -6683,7 +6685,7 @@ yyreduce:
 
   case 599:
 /* Line 1813 of yacc.c  */
-#line 2950 "conf_parser.y"
+#line 2952 "conf_parser.y"
     {
   ConfigChannel.restrict_channels = yylval.number;
 }
@@ -6691,7 +6693,7 @@ yyreduce:
 
   case 600:
 /* Line 1813 of yacc.c  */
-#line 2955 "conf_parser.y"
+#line 2957 "conf_parser.y"
     {
   ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number);
 }
@@ -6699,7 +6701,7 @@ yyreduce:
 
   case 601:
 /* Line 1813 of yacc.c  */
-#line 2960 "conf_parser.y"
+#line 2962 "conf_parser.y"
     {
   ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number);
 }
@@ -6707,7 +6709,7 @@ yyreduce:
 
   case 602:
 /* Line 1813 of yacc.c  */
-#line 2965 "conf_parser.y"
+#line 2967 "conf_parser.y"
     {
   ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number);
 }
@@ -6715,7 +6717,7 @@ yyreduce:
 
   case 603:
 /* Line 1813 of yacc.c  */
-#line 2970 "conf_parser.y"
+#line 2972 "conf_parser.y"
     {
   ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number);
 }
@@ -6723,7 +6725,7 @@ yyreduce:
 
   case 604:
 /* Line 1813 of yacc.c  */
-#line 2975 "conf_parser.y"
+#line 2977 "conf_parser.y"
     {
   ConfigChannel.quiet_on_ban = yylval.number;
 }
@@ -6731,7 +6733,7 @@ yyreduce:
 
   case 605:
 /* Line 1813 of yacc.c  */
-#line 2980 "conf_parser.y"
+#line 2982 "conf_parser.y"
     {
   ConfigChannel.max_bans = (yyvsp[(3) - (4)].number);
 }
@@ -6739,7 +6741,7 @@ yyreduce:
 
   case 606:
 /* Line 1813 of yacc.c  */
-#line 2985 "conf_parser.y"
+#line 2987 "conf_parser.y"
     {
   ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number);
 }
@@ -6747,7 +6749,7 @@ yyreduce:
 
   case 607:
 /* Line 1813 of yacc.c  */
-#line 2990 "conf_parser.y"
+#line 2992 "conf_parser.y"
     {
   ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number);
 }
@@ -6755,7 +6757,7 @@ yyreduce:
 
   case 608:
 /* Line 1813 of yacc.c  */
-#line 2995 "conf_parser.y"
+#line 2997 "conf_parser.y"
     {
   ConfigChannel.no_create_on_split = yylval.number;
 }
@@ -6763,7 +6765,7 @@ yyreduce:
 
   case 609:
 /* Line 1813 of yacc.c  */
-#line 3000 "conf_parser.y"
+#line 3002 "conf_parser.y"
     {
   ConfigChannel.no_join_on_split = yylval.number;
 }
@@ -6771,7 +6773,7 @@ yyreduce:
 
   case 610:
 /* Line 1813 of yacc.c  */
-#line 3005 "conf_parser.y"
+#line 3007 "conf_parser.y"
     {
   GlobalSetOptions.joinfloodcount = yylval.number;
 }
@@ -6779,7 +6781,7 @@ yyreduce:
 
   case 611:
 /* Line 1813 of yacc.c  */
-#line 3010 "conf_parser.y"
+#line 3012 "conf_parser.y"
     {
   GlobalSetOptions.joinfloodtime = yylval.number;
 }
@@ -6787,7 +6789,7 @@ yyreduce:
 
   case 622:
 /* Line 1813 of yacc.c  */
-#line 3028 "conf_parser.y"
+#line 3030 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigServerHide.flatten_links = yylval.number;
@@ -6796,7 +6798,7 @@ yyreduce:
 
   case 623:
 /* Line 1813 of yacc.c  */
-#line 3034 "conf_parser.y"
+#line 3036 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigServerHide.hide_servers = yylval.number;
@@ -6805,7 +6807,7 @@ yyreduce:
 
   case 624:
 /* Line 1813 of yacc.c  */
-#line 3040 "conf_parser.y"
+#line 3042 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -6817,7 +6819,7 @@ yyreduce:
 
   case 625:
 /* Line 1813 of yacc.c  */
-#line 3049 "conf_parser.y"
+#line 3051 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
   {
@@ -6834,7 +6836,7 @@ yyreduce:
 
   case 626:
 /* Line 1813 of yacc.c  */
-#line 3063 "conf_parser.y"
+#line 3065 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigServerHide.hidden = yylval.number;
@@ -6843,7 +6845,7 @@ yyreduce:
 
   case 627:
 /* Line 1813 of yacc.c  */
-#line 3069 "conf_parser.y"
+#line 3071 "conf_parser.y"
     {
   if (conf_parser_ctx.pass == 2)
     ConfigServerHide.hide_server_ips = yylval.number;
@@ -6852,7 +6854,7 @@ yyreduce:
 
 
 /* Line 1813 of yacc.c  */
-#line 6856 "conf_parser.c"
+#line 6858 "conf_parser.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires