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-7.2/src/ircd_parser.y (file contents), Revision 885 by michael, Wed Oct 31 18:09:24 2007 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (file contents), Revision 9234 by michael, Fri Jan 31 17:38:34 2020 UTC

# Line 1 | Line 1
1   /*
2 < *  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3 < *  ircd_parser.y: Parses the ircd configuration file.
2 > *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (C) 2005 by the past and present ircd coders, and others.
4 > *  Copyright (c) 2000-2020 ircd-hybrid development team
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 16 | Line 15
15   *
16   *  You should have received a copy of the GNU General Public License
17   *  along with this program; if not, write to the Free Software
18 < *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18 > *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19   *  USA
21 *
22 *  $Id$
20   */
21  
22 < %{
22 > /*! \file conf_parser.y
23 > * \brief Parses the ircd configuration file.
24 > * \version $Id$
25 > */
26  
27 #define YY_NO_UNPUT
28 #include <sys/types.h>
27  
28 + %{
29 +
30 + #include "config.h"
31   #include "stdinc.h"
32   #include "ircd.h"
32 #include "tools.h"
33   #include "list.h"
34 < #include "s_conf.h"
34 > #include "parse.h"
35 > #include "conf.h"
36 > #include "conf_class.h"
37 > #include "conf_cluster.h"
38 > #include "conf_gecos.h"
39 > #include "conf_pseudo.h"
40 > #include "conf_resv.h"
41 > #include "conf_service.h"
42 > #include "conf_shared.h"
43   #include "event.h"
44 < #include "s_log.h"
45 < #include "client.h"     /* for UMODE_ALL only */
38 < #include "pcre.h"
44 > #include "id.h"
45 > #include "log.h"
46   #include "irc_string.h"
40 #include "irc_getaddrinfo.h"
41 #include "sprintf_irc.h"
47   #include "memory.h"
48   #include "modules.h"
49 < #include "s_serv.h"
49 > #include "server.h"
50   #include "hostmask.h"
46 #include "send.h"
51   #include "listener.h"
52 < #include "resv.h"
53 < #include "numeric.h"
50 < #include "s_user.h"
51 <
52 < #ifdef HAVE_LIBCRYPTO
53 < #include <openssl/rsa.h>
54 < #include <openssl/bio.h>
55 < #include <openssl/pem.h>
56 < #endif
52 > #include "user.h"
53 > #include "motd.h"
54  
55 < static char *class_name = NULL;
59 < static struct ConfItem *yy_conf = NULL;
60 < static struct AccessItem *yy_aconf = NULL;
61 < static struct MatchItem *yy_match_item = NULL;
62 < static struct ClassItem *yy_class = NULL;
63 < static char *yy_class_name = NULL;
64 <
65 < static dlink_list col_conf_list  = { NULL, NULL, 0 };
66 < static dlink_list hub_conf_list  = { NULL, NULL, 0 };
67 < static dlink_list leaf_conf_list = { NULL, NULL, 0 };
68 < static unsigned int listener_flags = 0;
69 < static unsigned int regex_ban = 0;
70 < static char userbuf[IRCD_BUFSIZE];
71 < static char hostbuf[IRCD_BUFSIZE];
72 < static char reasonbuf[REASONLEN + 1];
73 < static char gecos_name[REALLEN * 4];
74 <
75 < extern dlink_list gdeny_items; /* XXX */
76 <
77 < static char *resv_reason = NULL;
78 < static char *listener_address = NULL;
79 < static int not_atom = 0;
80 <
81 < struct CollectItem
82 < {
83 <  dlink_node node;
84 <  char *name;
85 <  char *user;
86 <  char *host;
87 <  char *passwd;
88 <  int  port;
89 <  int  flags;
90 < #ifdef HAVE_LIBCRYPTO
91 <  char *rsa_public_key_file;
92 <  RSA *rsa_public_key;
93 < #endif
94 < };
55 > int yylex(void);
56  
57 < static void
97 < free_collect_item(struct CollectItem *item)
57 > static struct
58   {
59 <  MyFree(item->name);
60 <  MyFree(item->user);
61 <  MyFree(item->host);
62 <  MyFree(item->passwd);
63 < #ifdef HAVE_LIBCRYPTO
64 <  MyFree(item->rsa_public_key_file);
65 < #endif
66 <  MyFree(item);
67 < }
59 >  struct
60 >  {
61 >    dlink_list list;
62 >  } mask,
63 >    leaf,
64 >    hub;
65 >
66 >  struct
67 >  {
68 >    char buf[IRCD_BUFSIZE];
69 >  } name,
70 >    nick,
71 >    user,
72 >    host,
73 >    addr,
74 >    bind,
75 >    file,
76 >    ciph,
77 >    cert,
78 >    rpass,
79 >    spass,
80 >    whois,
81 >    class,
82 >    target,
83 >    prepend,
84 >    command;
85 >
86 >  struct
87 >  {
88 >    unsigned int value;
89 >  } flags,
90 >    modes,
91 >    size,
92 >    type,
93 >    port,
94 >    timeout,
95 >    aftype,
96 >    ping_freq,
97 >    max_perip_local,
98 >    max_perip_global,
99 >    con_freq,
100 >    min_idle,
101 >    max_idle,
102 >    max_total,
103 >    max_sendq,
104 >    max_recvq,
105 >    max_channels,
106 >    cidr_bitlen_ipv4,
107 >    cidr_bitlen_ipv6,
108 >    number_per_cidr;
109 > } block_state;
110  
111   static void
112 < unhook_hub_leaf_confs(void)
112 > reset_block_state(void)
113   {
114 <  dlink_node *ptr;
115 <  dlink_node *next_ptr;
116 <  struct CollectItem *yy_hconf;
115 <  struct CollectItem *yy_lconf;
114 >  dlink_node *node, *node_next;
115 >  dlink_list *tab[] = { &block_state.mask.list,
116 >                        &block_state.leaf.list, &block_state.hub.list, NULL };
117  
118 <  DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
118 >  for (dlink_list **list = tab; *list; ++list)
119    {
120 <    yy_hconf = ptr->data;
121 <    dlinkDelete(&yy_hconf->node, &hub_conf_list);
122 <    free_collect_item(yy_hconf);
120 >    DLINK_FOREACH_SAFE(node, node_next, (*list)->head)
121 >    {
122 >      xfree(node->data);
123 >      dlinkDelete(node, *list);
124 >      free_dlink_node(node);
125 >    }
126    }
127  
128 <  DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
125 <  {
126 <    yy_lconf = ptr->data;
127 <    dlinkDelete(&yy_lconf->node, &leaf_conf_list);
128 <    free_collect_item(yy_lconf);
129 <  }
128 >  memset(&block_state, 0, sizeof(block_state));
129   }
130  
131   %}
# Line 137 | Line 136 | unhook_hub_leaf_confs(void)
136   }
137  
138   %token  ACCEPT_PASSWORD
140 %token  ACTION
139   %token  ADMIN
140   %token  AFTYPE
143 %token  T_ALLOW
141   %token  ANTI_NICK_FLOOD
142   %token  ANTI_SPAM_EXIT_MESSAGE_TIME
143   %token  AUTOCONN
144 < %token  T_BLOCK
145 < %token  BURST_AWAY
146 < %token  BURST_TOPICWHO
150 < %token  BYTES KBYTES MBYTES GBYTES TBYTES
144 > %token  AWAY_COUNT
145 > %token  AWAY_TIME
146 > %token  BYTES KBYTES MBYTES
147   %token  CALLER_ID_WAIT
148   %token  CAN_FLOOD
153 %token  CAN_IDLE
149   %token  CHANNEL
150 < %token  CIDR_BITLEN_IPV4
151 < %token  CIDR_BITLEN_IPV6
157 < %token  CIPHER_PREFERENCE
150 > %token  CIDR_BITLEN_IPV4
151 > %token  CIDR_BITLEN_IPV6
152   %token  CLASS
153 < %token  COMPRESSED
160 < %token  COMPRESSION_LEVEL
153 > %token  CLOSE
154   %token  CONNECT
155   %token  CONNECTFREQ
156 < %token  CRYPTLINK
164 < %token  DEFAULT_CIPHER_PREFERENCE
156 > %token  CYCLE_ON_HOST_CHANGE
157   %token  DEFAULT_FLOODCOUNT
158 < %token  DEFAULT_SPLIT_SERVER_COUNT
159 < %token  DEFAULT_SPLIT_USER_COUNT
158 > %token  DEFAULT_FLOODTIME
159 > %token  DEFAULT_JOIN_FLOOD_COUNT
160 > %token  DEFAULT_JOIN_FLOOD_TIME
161 > %token  DEFAULT_MAX_CLIENTS
162   %token  DENY
163   %token  DESCRIPTION
164   %token  DIE
165   %token  DISABLE_AUTH
166   %token  DISABLE_FAKE_CHANNELS
173 %token  DISABLE_HIDDEN
174 %token  DISABLE_LOCAL_CHANNELS
167   %token  DISABLE_REMOTE_COMMANDS
168 < %token  DOT_IN_IP6_ADDR
168 > %token  DLINE_MIN_CIDR
169 > %token  DLINE_MIN_CIDR6
170   %token  DOTS_IN_IDENT
178 %token  DURATION
179 %token  EGDPOOL_PATH
171   %token  EMAIL
172 < %token  ENABLE
172 > %token  ENABLE_EXTBANS
173   %token  ENCRYPTED
174   %token  EXCEED_LIMIT
175   %token  EXEMPT
176 + %token  EXPIRATION
177   %token  FAILED_OPER_NOTICE
186 %token  FAKENAME
187 %token  IRCD_FLAGS
178   %token  FLATTEN_LINKS
179 < %token  FFAILED_OPERLOG
180 < %token  FKILLLOG
191 < %token  FKLINELOG
192 < %token  FGLINELOG
193 < %token  FIOERRLOG
194 < %token  FOPERLOG
195 < %token  FOPERSPYLOG
196 < %token  FUSERLOG
179 > %token  FLATTEN_LINKS_DELAY
180 > %token  FLATTEN_LINKS_FILE
181   %token  GECOS
182   %token  GENERAL
199 %token  GLINE
200 %token  GLINES
201 %token  GLINE_EXEMPT
202 %token  GLINE_LOG
203 %token  GLINE_TIME
204 %token  GLINE_MIN_CIDR
205 %token  GLINE_MIN_CIDR6
206 %token  GLOBAL_KILL
207 %token  IRCD_AUTH
208 %token  NEED_IDENT
209 %token  HAVENT_READ_CONF
183   %token  HIDDEN
184 < %token  HIDDEN_ADMIN
185 < %token  HIDDEN_NAME
186 < %token  HIDDEN_OPER
184 > %token  HIDDEN_NAME
185 > %token  HIDE_CHANS
186 > %token  HIDE_IDLE
187 > %token  HIDE_IDLE_FROM_OPERS
188   %token  HIDE_SERVER_IPS
189   %token  HIDE_SERVERS
190 < %token  HIDE_SPOOF_IPS
190 > %token  HIDE_SERVICES
191   %token  HOST
192   %token  HUB
193   %token  HUB_MASK
220 %token  IDLETIME
221 %token  IGNORE_BOGUS_TS
194   %token  INVISIBLE_ON_CONNECT
195 + %token  INVITE_CLIENT_COUNT
196 + %token  INVITE_CLIENT_TIME
197 + %token  INVITE_DELAY_CHANNEL
198 + %token  INVITE_EXPIRE_TIME
199   %token  IP
200 + %token  IRCD_AUTH
201 + %token  IRCD_FLAGS
202 + %token  IRCD_SID
203 + %token  JOIN
204   %token  KILL
205 < %token  KILL_CHASE_TIME_LIMIT
205 > %token  KILL_CHASE_TIME_LIMIT
206   %token  KLINE
207   %token  KLINE_EXEMPT
208 < %token  KLINE_REASON
209 < %token  KLINE_WITH_REASON
210 < %token  KNOCK_DELAY
208 > %token  KLINE_MIN_CIDR
209 > %token  KLINE_MIN_CIDR6
210 > %token  KNOCK_CLIENT_COUNT
211 > %token  KNOCK_CLIENT_TIME
212   %token  KNOCK_DELAY_CHANNEL
213   %token  LEAF_MASK
233 %token  LINKS_DELAY
214   %token  LISTEN
215 < %token  T_LOG
236 < %token  LOGGING
237 < %token  LOG_LEVEL
215 > %token  MASK
216   %token  MAX_ACCEPT
217   %token  MAX_BANS
218 < %token  MAX_CHANS_PER_USER
219 < %token  MAX_GLOBAL
220 < %token  MAX_IDENT
221 < %token  MAX_LOCAL
218 > %token  MAX_BANS_LARGE
219 > %token  MAX_CHANNELS
220 > %token  MAX_IDLE
221 > %token  MAX_INVITES
222   %token  MAX_NICK_CHANGES
223 + %token  MAX_NICK_LENGTH
224   %token  MAX_NICK_TIME
225   %token  MAX_NUMBER
226   %token  MAX_TARGETS
227 + %token  MAX_TOPIC_LENGTH
228   %token  MAX_WATCH
229 < %token  MESSAGE_LOCALE
229 > %token  MIN_IDLE
230   %token  MIN_NONWILDCARD
231   %token  MIN_NONWILDCARD_SIMPLE
232   %token  MODULE
233   %token  MODULES
234 + %token  MOTD
235   %token  NAME
236 + %token  NEED_IDENT
237   %token  NEED_PASSWORD
238   %token  NETWORK_DESC
239   %token  NETWORK_NAME
240   %token  NICK
259 %token  NICK_CHANGES
260 %token  NO_CREATE_ON_SPLIT
261 %token  NO_JOIN_ON_SPLIT
241   %token  NO_OPER_FLOOD
242   %token  NO_TILDE
264 %token  NOT
243   %token  NUMBER
266 %token  NUMBER_PER_IDENT
244   %token  NUMBER_PER_CIDR
268 %token  NUMBER_PER_IP
245   %token  NUMBER_PER_IP_GLOBAL
246 < %token  OPERATOR
271 < %token  OPERS_BYPASS_CALLERID
272 < %token  OPER_LOG
246 > %token  NUMBER_PER_IP_LOCAL
247   %token  OPER_ONLY_UMODES
274 %token  OPER_PASS_RESV
275 %token  OPER_SPY_T
248   %token  OPER_UMODES
249 < %token  JOIN_FLOOD_COUNT
250 < %token  JOIN_FLOOD_TIME
249 > %token  OPERATOR
250 > %token  OPERS_BYPASS_CALLERID
251   %token  PACE_WAIT
252   %token  PACE_WAIT_SIMPLE
253   %token  PASSWORD
254   %token  PATH
255   %token  PING_COOKIE
256   %token  PING_TIME
285 %token  PING_WARNING
257   %token  PORT
258   %token  QSTRING
259 < %token  QUIET_ON_BAN
259 > %token  RANDOM_IDLE
260   %token  REASON
261   %token  REDIRPORT
262   %token  REDIRSERV
292 %token  REGEX_T
263   %token  REHASH
294 %token  TREJECT_HOLD_TIME
264   %token  REMOTE
265   %token  REMOTEBAN
297 %token  RESTRICT_CHANNELS
298 %token  RESTRICTED
299 %token  RSA_PRIVATE_KEY_FILE
300 %token  RSA_PUBLIC_KEY_FILE
301 %token  SSL_CERTIFICATE_FILE
266   %token  RESV
267   %token  RESV_EXEMPT
268 < %token  SECONDS MINUTES HOURS DAYS WEEKS
269 < %token  SENDQ
268 > %token  RSA_PRIVATE_KEY_FILE
269 > %token  SECONDS MINUTES HOURS DAYS WEEKS MONTHS YEARS
270   %token  SEND_PASSWORD
271 + %token  SENDQ
272   %token  SERVERHIDE
273   %token  SERVERINFO
309 %token  SERVLINK_PATH
310 %token  IRCD_SID
311 %token  TKLINE_EXPIRE_NOTICES
312 %token  T_SHARED
313 %token  T_CLUSTER
314 %token  TYPE
274   %token  SHORT_MOTD
316 %token  SILENT
275   %token  SPOOF
276   %token  SPOOF_NOTICE
277 + %token  SQUIT
278   %token  STATS_E_DISABLED
279   %token  STATS_I_OPER_ONLY
280   %token  STATS_K_OPER_ONLY
281 + %token  STATS_M_OPER_ONLY
282   %token  STATS_O_OPER_ONLY
283   %token  STATS_P_OPER_ONLY
284 < %token  TBOOL
325 < %token  TMASKED
326 < %token  T_REJECT
327 < %token  TS_MAX_DELTA
328 < %token  TS_WARN_DELTA
329 < %token  TWODOTS
284 > %token  STATS_U_OPER_ONLY
285   %token  T_ALL
286 + %token  T_BIND
287   %token  T_BOTS
332 %token  T_SOFTCALLERID
288   %token  T_CALLERID
289   %token  T_CCONN
290 < %token  T_CCONN_FULL
291 < %token  T_CLIENT_FLOOD
290 > %token  T_COMMAND
291 > %token  T_CLUSTER
292   %token  T_DEAF
293   %token  T_DEBUG
294 < %token  T_DRONE
294 > %token  T_DLINE
295   %token  T_EXTERNAL
296 + %token  T_FARCONNECT
297 + %token  T_FILE
298   %token  T_FULL
299 + %token  T_GLOBOPS
300   %token  T_INVISIBLE
301   %token  T_IPV4
302   %token  T_IPV6
303   %token  T_LOCOPS
304 < %token  T_LOGPATH
347 < %token  T_L_CRIT
348 < %token  T_L_DEBUG
349 < %token  T_L_ERROR
350 < %token  T_L_INFO
351 < %token  T_L_NOTICE
352 < %token  T_L_TRACE
353 < %token  T_L_WARN
354 < %token  T_MAX_CLIENTS
304 > %token  T_LOG
305   %token  T_NCHANGE
306 < %token  T_OPERWALL
306 > %token  T_NONONREG
307 > %token  T_OPME
308 > %token  T_PREPEND
309 > %token  T_PSEUDO
310 > %token  T_RECVQ
311   %token  T_REJ
312 + %token  T_RESTART
313 + %token  T_SERVER
314 + %token  T_SERVICE
315   %token  T_SERVNOTICE
316 + %token  T_SET
317 + %token  T_SHARED
318 + %token  T_SIZE
319   %token  T_SKILL
320 + %token  T_SOFTCALLERID
321   %token  T_SPY
322 < %token  T_SSL
322 > %token  T_TARGET
323 > %token  T_TLS
324   %token  T_UMODES
325   %token  T_UNAUTH
326 + %token  T_UNDLINE
327 + %token  T_UNLIMITED
328   %token  T_UNRESV
329   %token  T_UNXLINE
330   %token  T_WALLOP
331 + %token  T_WALLOPS
332 + %token  T_WEBIRC
333 + %token  TBOOL
334 + %token  THROTTLE_COUNT
335   %token  THROTTLE_TIME
336 < %token  TOPICBURST
337 < %token  TRUE_NO_OPER_FLOOD
338 < %token  TKLINE
339 < %token  TXLINE
340 < %token  TRESV
336 > %token  TIMEOUT
337 > %token  TLS_CERTIFICATE_FILE
338 > %token  TLS_CERTIFICATE_FINGERPRINT
339 > %token  TLS_CIPHER_LIST
340 > %token  TLS_CIPHER_SUITES
341 > %token  TLS_CONNECTION_REQUIRED
342 > %token  TLS_DH_PARAM_FILE
343 > %token  TLS_MESSAGE_DIGEST_ALGORITHM
344 > %token  TLS_SUPPORTED_GROUPS
345 > %token  TMASKED
346 > %token  TS_MAX_DELTA
347 > %token  TS_WARN_DELTA
348 > %token  TWODOTS
349 > %token  TYPE
350   %token  UNKLINE
374 %token  USER
375 %token  USE_EGD
376 %token  USE_EXCEPT
377 %token  USE_INVEX
378 %token  USE_KNOCK
351   %token  USE_LOGGING
352 < %token  USE_WHOIS_ACTUALLY
352 > %token  USER
353   %token  VHOST
354   %token  VHOST6
355 + %token  WARN_NO_CONNECT_BLOCK
356 + %token  WHOIS
357 + %token  WHOWAS_HISTORY_LENGTH
358   %token  XLINE
359 < %token  WARN
385 < %token  WARN_NO_NLINE
359 > %token  XLINE_EXEMPT
360  
361 < %type <string> QSTRING
362 < %type <number> NUMBER
363 < %type <number> timespec
364 < %type <number> timespec_
365 < %type <number> sizespec
366 < %type <number> sizespec_
361 > %type  <string> QSTRING
362 > %type  <number> NUMBER
363 > %type  <number> timespec
364 > %type  <number> timespec_
365 > %type  <number> sizespec
366 > %type  <number> sizespec_
367  
368   %%
369 < conf:  
369 > conf:
370          | conf conf_item
371          ;
372  
373   conf_item:        admin_entry
374                  | logging_entry
375                  | oper_entry
376 <                | channel_entry
377 <                | class_entry
376 >                | channel_entry
377 >                | class_entry
378                  | listen_entry
379                  | auth_entry
380                  | serverinfo_entry
381 <                | serverhide_entry
381 >                | serverhide_entry
382                  | resv_entry
383 +                | service_entry
384                  | shared_entry
385 <                | cluster_entry
385 >                | cluster_entry
386                  | connect_entry
387                  | kill_entry
388                  | deny_entry
389 <                | exempt_entry
390 <                | general_entry
416 <                | gline_entry
389 >                | exempt_entry
390 >                | general_entry
391                  | gecos_entry
392                  | modules_entry
393 +                | motd_entry
394 +                | pseudo_entry
395                  | error ';'
396                  | error '}'
397          ;
398  
399  
400   timespec_: { $$ = 0; } | timespec;
401 < timespec:       NUMBER timespec_
402 <                {
403 <                        $$ = $1 + $2;
404 <                }
405 <                | NUMBER SECONDS timespec_
406 <                {
407 <                        $$ = $1 + $3;
408 <                }
409 <                | NUMBER MINUTES timespec_
410 <                {
411 <                        $$ = $1 * 60 + $3;
412 <                }
413 <                | NUMBER HOURS timespec_
414 <                {
415 <                        $$ = $1 * 60 * 60 + $3;
416 <                }
441 <                | NUMBER DAYS timespec_
442 <                {
443 <                        $$ = $1 * 60 * 60 * 24 + $3;
444 <                }
445 <                | NUMBER WEEKS timespec_
446 <                {
447 <                        $$ = $1 * 60 * 60 * 24 * 7 + $3;
448 <                }
449 <                ;
450 <
451 < sizespec_:      { $$ = 0; } | sizespec;
452 < sizespec:       NUMBER sizespec_ { $$ = $1 + $2; }
453 <                | NUMBER BYTES sizespec_ { $$ = $1 + $3; }
454 <                | NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; }
455 <                | NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
456 <                ;
401 > timespec:  NUMBER timespec_         { $$ = $1 + $2; } |
402 >           NUMBER SECONDS timespec_ { $$ = $1 + $3; } |
403 >           NUMBER MINUTES timespec_ { $$ = $1 * 60 + $3; } |
404 >           NUMBER HOURS timespec_   { $$ = $1 * 60 * 60 + $3; } |
405 >           NUMBER DAYS timespec_    { $$ = $1 * 60 * 60 * 24 + $3; } |
406 >           NUMBER WEEKS timespec_   { $$ = $1 * 60 * 60 * 24 * 7 + $3; } |
407 >           NUMBER MONTHS timespec_  { $$ = $1 * 60 * 60 * 24 * 7 * 4 + $3; } |
408 >           NUMBER YEARS timespec_   { $$ = $1 * 60 * 60 * 24 * 365 + $3; }
409 >           ;
410 >
411 > sizespec_:  { $$ = 0; } | sizespec;
412 > sizespec:   NUMBER sizespec_ { $$ = $1 + $2; } |
413 >            NUMBER BYTES sizespec_ { $$ = $1 + $3; } |
414 >            NUMBER KBYTES sizespec_ { $$ = $1 * 1024 + $3; } |
415 >            NUMBER MBYTES sizespec_ { $$ = $1 * 1024 * 1024 + $3; }
416 >            ;
417  
418  
419   /***************************************************************************
420 < *  section modules
420 > * modules {} section
421   ***************************************************************************/
422 < modules_entry: MODULES
463 <  '{' modules_items '}' ';';
422 > modules_entry: MODULES '{' modules_items '}' ';';
423  
424   modules_items:  modules_items modules_item | modules_item;
425   modules_item:   modules_module | modules_path | error ';' ;
426  
427   modules_module: MODULE '=' QSTRING ';'
428   {
429 < #ifndef STATIC_MODULES /* NOOP in the static case */
430 <  if (ypass == 2)
472 <  {
473 <    char *m_bn;
474 <
475 <    m_bn = basename(yylval.string);
476 <
477 <    /* I suppose we should just ignore it if it is already loaded(since
478 <     * otherwise we would flood the opers on rehash) -A1kmm.
479 <     */
480 <    add_conf_module(yylval.string);
481 <  }
482 < #endif
429 >  if (conf_parser_ctx.pass == 2)
430 >    add_conf_module(libio_basename(yylval.string));
431   };
432  
433   modules_path: PATH '=' QSTRING ';'
434   {
435 < #ifndef STATIC_MODULES
488 <  if (ypass == 2)
435 >  if (conf_parser_ctx.pass == 2)
436      mod_add_path(yylval.string);
490 #endif
437   };
438  
439 +
440   /***************************************************************************
441 < *  section serverinfo
441 > * serverinfo {} section
442   ***************************************************************************/
443 < serverinfo_entry: SERVERINFO
444 <  '{' serverinfo_items '}' ';';
443 > serverinfo_entry: SERVERINFO '{' serverinfo_items '}' ';';
444 >
445 > serverinfo_items:       serverinfo_items serverinfo_item | serverinfo_item ;
446 > serverinfo_item:        serverinfo_name |
447 >                        serverinfo_hub |
448 >                        serverinfo_description |
449 >                        serverinfo_network_name |
450 >                        serverinfo_network_desc |
451 >                        serverinfo_default_max_clients |
452 >                        serverinfo_max_nick_length |
453 >                        serverinfo_max_topic_length |
454 >                        serverinfo_tls_dh_param_file |
455 >                        serverinfo_tls_supported_groups |
456 >                        serverinfo_rsa_private_key_file |
457 >                        serverinfo_sid |
458 >                        serverinfo_tls_certificate_file |
459 >                        serverinfo_tls_cipher_list |
460 >                        serverinfo_tls_cipher_suites |
461 >                        serverinfo_tls_message_digest_algorithm |
462 >                        error ';' ;
463  
499 serverinfo_items:       serverinfo_items serverinfo_item |
500                        serverinfo_item ;
501 serverinfo_item:        serverinfo_name | serverinfo_vhost |
502                        serverinfo_hub | serverinfo_description |
503                        serverinfo_network_name | serverinfo_network_desc |
504                        serverinfo_max_clients |
505                        serverinfo_rsa_private_key_file | serverinfo_vhost6 |
506                        serverinfo_sid | serverinfo_ssl_certificate_file |
507                        error ';' ;
464  
465 < serverinfo_ssl_certificate_file: SSL_CERTIFICATE_FILE '=' QSTRING ';'
465 > serverinfo_tls_certificate_file: TLS_CERTIFICATE_FILE '=' QSTRING ';'
466   {
467 < #ifdef HAVE_LIBCRYPTO
512 <  if (ypass == 2 && ServerInfo.ctx)
467 >  if (conf_parser_ctx.pass == 2)
468    {
469 <    if (!ServerInfo.rsa_private_key_file)
470 <    {
516 <      yyerror("No rsa_private_key_file specified, SSL disabled");
517 <      break;
518 <    }
519 <
520 <    if (SSL_CTX_use_certificate_file(ServerInfo.ctx,
521 <      yylval.string, SSL_FILETYPE_PEM) <= 0)
522 <    {
523 <      yyerror(ERR_lib_error_string(ERR_get_error()));
524 <      break;
525 <    }
526 <
527 <    if (SSL_CTX_use_PrivateKey_file(ServerInfo.ctx,
528 <      ServerInfo.rsa_private_key_file, SSL_FILETYPE_PEM) <= 0)
529 <    {
530 <      yyerror(ERR_lib_error_string(ERR_get_error()));
531 <      break;
532 <    }
533 <
534 <    if (!SSL_CTX_check_private_key(ServerInfo.ctx))
535 <    {
536 <      yyerror("RSA private key does not match the SSL certificate public key!");
537 <      break;
538 <    }
469 >    xfree(ConfigServerInfo.tls_certificate_file);
470 >    ConfigServerInfo.tls_certificate_file = xstrdup(yylval.string);
471    }
540 #endif
472   };
473  
474   serverinfo_rsa_private_key_file: RSA_PRIVATE_KEY_FILE '=' QSTRING ';'
475   {
476 < #ifdef HAVE_LIBCRYPTO
546 <  if (ypass == 1)
476 >  if (conf_parser_ctx.pass == 2)
477    {
478 <    BIO *file;
479 <
480 <    if (ServerInfo.rsa_private_key)
481 <    {
552 <      RSA_free(ServerInfo.rsa_private_key);
553 <      ServerInfo.rsa_private_key = NULL;
554 <    }
555 <
556 <    if (ServerInfo.rsa_private_key_file)
557 <    {
558 <      MyFree(ServerInfo.rsa_private_key_file);
559 <      ServerInfo.rsa_private_key_file = NULL;
560 <    }
561 <
562 <    DupString(ServerInfo.rsa_private_key_file, yylval.string);
563 <
564 <    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
565 <    {
566 <      yyerror("File open failed, ignoring");
567 <      break;
568 <    }
569 <
570 <    ServerInfo.rsa_private_key = (RSA *)PEM_read_bio_RSAPrivateKey(file, NULL,
571 <      0, NULL);
572 <
573 <    BIO_set_close(file, BIO_CLOSE);
574 <    BIO_free(file);
478 >    xfree(ConfigServerInfo.rsa_private_key_file);
479 >    ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
480 >  }
481 > };
482  
483 <    if (ServerInfo.rsa_private_key == NULL)
484 <    {
485 <      yyerror("Couldn't extract key, ignoring");
486 <      break;
487 <    }
483 > serverinfo_tls_dh_param_file: TLS_DH_PARAM_FILE '=' QSTRING ';'
484 > {
485 >  if (conf_parser_ctx.pass == 2)
486 >  {
487 >    xfree(ConfigServerInfo.tls_dh_param_file);
488 >    ConfigServerInfo.tls_dh_param_file = xstrdup(yylval.string);
489 >  }
490 > };
491  
492 <    if (!RSA_check_key(ServerInfo.rsa_private_key))
493 <    {
494 <      RSA_free(ServerInfo.rsa_private_key);
495 <      ServerInfo.rsa_private_key = NULL;
492 > serverinfo_tls_cipher_list: TLS_CIPHER_LIST '=' QSTRING ';'
493 > {
494 >  if (conf_parser_ctx.pass == 2)
495 >  {
496 >    xfree(ConfigServerInfo.tls_cipher_list);
497 >    ConfigServerInfo.tls_cipher_list = xstrdup(yylval.string);
498 >  }
499 > };
500  
501 <      yyerror("Invalid key, ignoring");
502 <      break;
503 <    }
501 > serverinfo_tls_cipher_suites: TLS_CIPHER_SUITES '=' QSTRING ';'
502 > {
503 >  if (conf_parser_ctx.pass == 2)
504 >  {
505 >    xfree(ConfigServerInfo.tls_cipher_suites);
506 >    ConfigServerInfo.tls_cipher_suites = xstrdup(yylval.string);
507 >  }
508 > };
509  
510 <    /* require 2048 bit (256 byte) key */
511 <    if (RSA_size(ServerInfo.rsa_private_key) != 256)
512 <    {
513 <      RSA_free(ServerInfo.rsa_private_key);
514 <      ServerInfo.rsa_private_key = NULL;
510 > serverinfo_tls_message_digest_algorithm: TLS_MESSAGE_DIGEST_ALGORITHM '=' QSTRING ';'
511 > {
512 >  if (conf_parser_ctx.pass == 2)
513 >  {
514 >    xfree(ConfigServerInfo.tls_message_digest_algorithm);
515 >    ConfigServerInfo.tls_message_digest_algorithm = xstrdup(yylval.string);
516 >  }
517 > }
518  
519 <      yyerror("Not a 2048 bit key, ignoring");
520 <    }
519 > serverinfo_tls_supported_groups: TLS_SUPPORTED_GROUPS '=' QSTRING ';'
520 > {
521 >  if (conf_parser_ctx.pass == 2)
522 >  {
523 >    xfree(ConfigServerInfo.tls_supported_groups);
524 >    ConfigServerInfo.tls_supported_groups = xstrdup(yylval.string);
525    }
600 #endif
526   };
527  
528 < serverinfo_name: NAME '=' QSTRING ';'
528 > serverinfo_name: NAME '=' QSTRING ';'
529   {
530 <  /* this isn't rehashable */
531 <  if (ypass == 2)
530 >  /* This isn't rehashable */
531 >  if (conf_parser_ctx.pass == 2 && ConfigServerInfo.name == NULL)
532    {
533 <    if (ServerInfo.name == NULL)
533 >    if (server_valid_name(yylval.string) == true)
534 >      ConfigServerInfo.name = xstrdup(yylval.string);
535 >    else
536      {
537 <      /* the ircd will exit() in main() if we dont set one */
538 <      if (strlen(yylval.string) <= HOSTLEN)
612 <        DupString(ServerInfo.name, yylval.string);
537 >      conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
538 >      exit(EXIT_FAILURE);
539      }
540    }
541   };
542  
543 < serverinfo_sid: IRCD_SID '=' QSTRING ';'
543 > serverinfo_sid: IRCD_SID '=' QSTRING ';'
544   {
545 <  /* this isn't rehashable */
546 <  if (ypass == 2 && !ServerInfo.sid)
545 >  /* This isn't rehashable */
546 >  if (conf_parser_ctx.pass == 2 && ConfigServerInfo.sid == NULL)
547    {
548      if (valid_sid(yylval.string))
549 <      DupString(ServerInfo.sid, yylval.string);
549 >      ConfigServerInfo.sid = xstrdup(yylval.string);
550      else
551      {
552 <      ilog(L_ERROR, "Ignoring config file entry SID -- invalid SID. Aborting.");
553 <      exit(0);
552 >      conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
553 >      exit(EXIT_FAILURE);
554      }
555    }
556   };
557  
558   serverinfo_description: DESCRIPTION '=' QSTRING ';'
559   {
560 <  if (ypass == 2)
560 >  if (conf_parser_ctx.pass == 2)
561    {
562 <    MyFree(ServerInfo.description);
563 <    DupString(ServerInfo.description,yylval.string);
562 >    xfree(ConfigServerInfo.description);
563 >    ConfigServerInfo.description = xstrdup(yylval.string);
564 >    strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
565    }
566   };
567  
568   serverinfo_network_name: NETWORK_NAME '=' QSTRING ';'
569   {
570 <  if (ypass == 2)
570 >  if (conf_parser_ctx.pass == 2)
571    {
572 <    char *p;
572 >    char *p = strchr(yylval.string, ' ');
573  
574 <    if ((p = strchr(yylval.string, ' ')) != NULL)
575 <      p = '\0';
574 >    if (p)
575 >      *p = '\0';
576  
577 <    MyFree(ServerInfo.network_name);
578 <    DupString(ServerInfo.network_name, yylval.string);
577 >    xfree(ConfigServerInfo.network_name);
578 >    ConfigServerInfo.network_name = xstrdup(yylval.string);
579    }
580   };
581  
582   serverinfo_network_desc: NETWORK_DESC '=' QSTRING ';'
583   {
584 <  if (ypass == 2)
585 <  {
586 <    MyFree(ServerInfo.network_desc);
587 <    DupString(ServerInfo.network_desc, yylval.string);
588 <  }
584 >  if (conf_parser_ctx.pass != 2)
585 >    break;
586 >
587 >  xfree(ConfigServerInfo.network_desc);
588 >  ConfigServerInfo.network_desc = xstrdup(yylval.string);
589   };
590  
591 < serverinfo_vhost: VHOST '=' QSTRING ';'
591 > serverinfo_default_max_clients: DEFAULT_MAX_CLIENTS '=' NUMBER ';'
592   {
593 <  if (ypass == 2 && *yylval.string != '*')
594 <  {
668 <    struct addrinfo hints, *res;
669 <
670 <    memset(&hints, 0, sizeof(hints));
671 <
672 <    hints.ai_family   = AF_UNSPEC;
673 <    hints.ai_socktype = SOCK_STREAM;
674 <    hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
593 >  if (conf_parser_ctx.pass != 2)
594 >    break;
595  
596 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
597 <      ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
598 <    else
599 <    {
600 <      assert(res != NULL);
596 >  if ($3 < 1)
597 >  {
598 >    conf_error_report("default_max_clients too low, setting to 1");
599 >    ConfigServerInfo.default_max_clients = 1;
600 >  }
601 >  else if ($3 > MAXCLIENTS_MAX)
602 >  {
603 >    char buf[IRCD_BUFSIZE];
604  
605 <      memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
606 <      ServerInfo.ip.ss.ss_family = res->ai_family;
684 <      ServerInfo.ip.ss_len = res->ai_addrlen;
685 <      irc_freeaddrinfo(res);
605 >    snprintf(buf, sizeof(buf), "default_max_clients too high, setting to %d", MAXCLIENTS_MAX);
606 >    conf_error_report(buf);
607  
608 <      ServerInfo.specific_ipv4_vhost = 1;
688 <    }
608 >    ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
609    }
610 +  else
611 +    ConfigServerInfo.default_max_clients = $3;
612   };
613  
614 < serverinfo_vhost6: VHOST6 '=' QSTRING ';'
614 > serverinfo_max_nick_length: MAX_NICK_LENGTH '=' NUMBER ';'
615   {
616 < #ifdef IPV6
617 <  if (ypass == 2 && *yylval.string != '*')
696 <  {
697 <    struct addrinfo hints, *res;
616 >  if (conf_parser_ctx.pass != 2)
617 >    break;
618  
619 <    memset(&hints, 0, sizeof(hints));
620 <
621 <    hints.ai_family   = AF_UNSPEC;
622 <    hints.ai_socktype = SOCK_STREAM;
623 <    hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
624 <
625 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
626 <      ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
707 <    else
708 <    {
709 <      assert(res != NULL);
619 >  if ($3 < 9)
620 >  {
621 >    conf_error_report("max_nick_length too low, setting to 9");
622 >    ConfigServerInfo.max_nick_length = 9;
623 >  }
624 >  else if ($3 > NICKLEN)
625 >  {
626 >    char buf[IRCD_BUFSIZE];
627  
628 <      memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
629 <      ServerInfo.ip6.ss.ss_family = res->ai_family;
713 <      ServerInfo.ip6.ss_len = res->ai_addrlen;
714 <      irc_freeaddrinfo(res);
628 >    snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
629 >    conf_error_report(buf);
630  
631 <      ServerInfo.specific_ipv6_vhost = 1;
717 <    }
631 >    ConfigServerInfo.max_nick_length = NICKLEN;
632    }
633 < #endif
633 >  else
634 >    ConfigServerInfo.max_nick_length = $3;
635   };
636  
637 < serverinfo_max_clients: T_MAX_CLIENTS '=' NUMBER ';'
637 > serverinfo_max_topic_length: MAX_TOPIC_LENGTH '=' NUMBER ';'
638   {
639 <  if (ypass == 2)
639 >  if (conf_parser_ctx.pass != 2)
640 >    break;
641 >
642 >  if ($3 < 80)
643 >  {
644 >    conf_error_report("max_topic_length too low, setting to 80");
645 >    ConfigServerInfo.max_topic_length = 80;
646 >  }
647 >  else if ($3 > TOPICLEN)
648    {
649 <    recalc_fdlimit(NULL);
649 >    char buf[IRCD_BUFSIZE];
650  
651 <    if ($3 < MAXCLIENTS_MIN)
652 <    {
653 <      char buf[IRCD_BUFSIZE];
654 <      ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
732 <      yyerror(buf);
733 <    }
734 <    else if ($3 > MAXCLIENTS_MAX)
735 <    {
736 <      char buf[IRCD_BUFSIZE];
737 <      ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
738 <      yyerror(buf);
739 <    }
740 <    else
741 <      ServerInfo.max_clients = $3;
651 >    snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
652 >    conf_error_report(buf);
653 >
654 >    ConfigServerInfo.max_topic_length = TOPICLEN;
655    }
656 +  else
657 +    ConfigServerInfo.max_topic_length = $3;
658   };
659  
660 < serverinfo_hub: HUB '=' TBOOL ';'
660 > serverinfo_hub: HUB '=' TBOOL ';'
661   {
662 <  if (ypass == 2)
663 <  {
749 <    if (yylval.number)
750 <    {
751 <      ServerInfo.hub = 1;
752 <      delete_capability("HUB");
753 <      add_capability("HUB", CAP_HUB, 1);
754 <    }
755 <    else if (ServerInfo.hub)
756 <    {
757 <
758 <      ServerInfo.hub = 0;
759 <      delete_capability("HUB");
760 <    }
761 <  }
662 >  if (conf_parser_ctx.pass == 2)
663 >    ConfigServerInfo.hub = yylval.number;
664   };
665  
666 +
667   /***************************************************************************
668 < * admin section
668 > * admin {} section
669   ***************************************************************************/
670 < admin_entry: ADMIN  '{' admin_items '}' ';' ;
670 > admin_entry: ADMIN '{' admin_items '}' ';' ;
671  
672   admin_items: admin_items admin_item | admin_item;
673 < admin_item:  admin_name | admin_description |
674 <             admin_email | error ';' ;
673 > admin_item:  admin_name |
674 >             admin_description |
675 >             admin_email |
676 >             error ';' ;
677  
678 < admin_name: NAME '=' QSTRING ';'
678 > admin_name: NAME '=' QSTRING ';'
679   {
680 <  if (ypass == 2)
681 <  {
682 <    MyFree(AdminInfo.name);
683 <    DupString(AdminInfo.name, yylval.string);
684 <  }
680 >  if (conf_parser_ctx.pass != 2)
681 >    break;
682 >
683 >  xfree(ConfigAdminInfo.name);
684 >  ConfigAdminInfo.name = xstrdup(yylval.string);
685   };
686  
687   admin_email: EMAIL '=' QSTRING ';'
688   {
689 <  if (ypass == 2)
690 <  {
691 <    MyFree(AdminInfo.email);
692 <    DupString(AdminInfo.email, yylval.string);
693 <  }
689 >  if (conf_parser_ctx.pass != 2)
690 >    break;
691 >
692 >  xfree(ConfigAdminInfo.email);
693 >  ConfigAdminInfo.email = xstrdup(yylval.string);
694   };
695  
696   admin_description: DESCRIPTION '=' QSTRING ';'
697   {
698 <  if (ypass == 2)
699 <  {
700 <    MyFree(AdminInfo.description);
701 <    DupString(AdminInfo.description, yylval.string);
702 <  }
698 >  if (conf_parser_ctx.pass != 2)
699 >    break;
700 >
701 >  xfree(ConfigAdminInfo.description);
702 >  ConfigAdminInfo.description = xstrdup(yylval.string);
703   };
704  
705 +
706   /***************************************************************************
707 < *  section logging
707 > * motd {} section
708   ***************************************************************************/
709 < /* XXX */
710 < logging_entry:          LOGGING  '{' logging_items '}' ';' ;
709 > motd_entry: MOTD
710 > {
711 >  if (conf_parser_ctx.pass == 2)
712 >    reset_block_state();
713 > } '{' motd_items '}' ';'
714 > {
715 >  dlink_node *node;
716  
717 < logging_items:          logging_items logging_item |
718 <                        logging_item ;
717 >  if (conf_parser_ctx.pass != 2)
718 >    break;
719  
720 < logging_item:           logging_path | logging_oper_log |
721 <                        logging_log_level |
811 <                        logging_use_logging | logging_fuserlog |
812 <                        logging_foperlog | logging_fglinelog |
813 <                        logging_fklinelog | logging_killlog |
814 <                        logging_foperspylog | logging_ioerrlog |
815 <                        logging_ffailed_operlog |
816 <                        error ';' ;
720 >  if (!block_state.file.buf[0])
721 >    break;
722  
723 < logging_path:           T_LOGPATH '=' QSTRING ';'
724 <                        {
725 <                        };
723 >  DLINK_FOREACH(node, block_state.mask.list.head)
724 >    motd_add(node->data, block_state.file.buf);
725 > };
726  
727 < logging_oper_log:       OPER_LOG '=' QSTRING ';'
728 <                        {
824 <                        };
727 > motd_items: motd_items motd_item | motd_item;
728 > motd_item:  motd_mask | motd_file | error ';' ;
729  
730 < logging_fuserlog: FUSERLOG '=' QSTRING ';'
730 > motd_mask: MASK '=' QSTRING ';'
731   {
732 <  if (ypass == 2)
733 <    strlcpy(ConfigLoggingEntry.userlog, yylval.string,
830 <            sizeof(ConfigLoggingEntry.userlog));
732 >  if (conf_parser_ctx.pass == 2)
733 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
734   };
735  
736 < logging_ffailed_operlog: FFAILED_OPERLOG '=' QSTRING ';'
736 > motd_file: T_FILE '=' QSTRING ';'
737   {
738 <  if (ypass == 2)
739 <    strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
837 <            sizeof(ConfigLoggingEntry.failed_operlog));
738 >  if (conf_parser_ctx.pass == 2)
739 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
740   };
741  
840 logging_foperlog: FOPERLOG '=' QSTRING ';'
841 {
842  if (ypass == 2)
843    strlcpy(ConfigLoggingEntry.operlog, yylval.string,
844            sizeof(ConfigLoggingEntry.operlog));
845 };
742  
743 < logging_foperspylog: FOPERSPYLOG '=' QSTRING ';'
743 > /***************************************************************************
744 > * pseudo {} section
745 > ***************************************************************************/
746 > pseudo_entry: T_PSEUDO
747   {
748 <  if (ypass == 2)
749 <    strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
750 <            sizeof(ConfigLoggingEntry.operspylog));
852 < };
853 <
854 < logging_fglinelog: FGLINELOG '=' QSTRING ';'
748 >  if (conf_parser_ctx.pass == 2)
749 >    reset_block_state();
750 > } '{' pseudo_items '}' ';'
751   {
752 <  if (ypass == 2)
753 <    strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
754 <            sizeof(ConfigLoggingEntry.glinelog));
752 >  if (conf_parser_ctx.pass != 2)
753 >    break;
754 >
755 >  if (!block_state.command.buf[0] ||
756 >      !block_state.name.buf[0] ||
757 >      !block_state.nick.buf[0] ||
758 >      !block_state.host.buf[0])
759 >    break;
760 >
761 >  pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
762 >                  block_state.prepend.buf, block_state.command.buf);
763   };
764  
765 < logging_fklinelog: FKLINELOG '=' QSTRING ';'
765 > pseudo_items: pseudo_items pseudo_item | pseudo_item;
766 > pseudo_item:  pseudo_command | pseudo_prepend | pseudo_name | pseudo_target | error ';' ;
767 >
768 > pseudo_command: T_COMMAND '=' QSTRING ';'
769   {
770 <  if (ypass == 2)
771 <    strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
865 <            sizeof(ConfigLoggingEntry.klinelog));
770 >  if (conf_parser_ctx.pass == 2)
771 >    strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
772   };
773  
774 < logging_ioerrlog: FIOERRLOG '=' QSTRING ';'
774 > pseudo_name: NAME '=' QSTRING ';'
775   {
776 <  if (ypass == 2)
777 <    strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
872 <            sizeof(ConfigLoggingEntry.ioerrlog));
776 >  if (conf_parser_ctx.pass == 2)
777 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
778   };
779  
780 < logging_killlog: FKILLLOG '=' QSTRING ';'
780 > pseudo_prepend: T_PREPEND '=' QSTRING ';'
781   {
782 <  if (ypass == 2)
783 <    strlcpy(ConfigLoggingEntry.killlog, yylval.string,
879 <            sizeof(ConfigLoggingEntry.killlog));
782 >  if (conf_parser_ctx.pass == 2)
783 >    strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
784   };
785  
786 < logging_log_level: LOG_LEVEL '=' T_L_CRIT ';'
883 < {
884 <  if (ypass == 2)
885 <    set_log_level(L_CRIT);
886 < } | LOG_LEVEL '=' T_L_ERROR ';'
887 < {
888 <  if (ypass == 2)
889 <    set_log_level(L_ERROR);
890 < } | LOG_LEVEL '=' T_L_WARN ';'
891 < {
892 <  if (ypass == 2)
893 <    set_log_level(L_WARN);
894 < } | LOG_LEVEL '=' T_L_NOTICE ';'
786 > pseudo_target: T_TARGET '=' QSTRING ';'
787   {
788 <  if (ypass == 2)
789 <    set_log_level(L_NOTICE);
790 < } | LOG_LEVEL '=' T_L_TRACE ';'
791 < {
792 <  if (ypass == 2)
793 <    set_log_level(L_TRACE);
794 < } | LOG_LEVEL '=' T_L_INFO ';'
795 < {
796 <  if (ypass == 2)
797 <    set_log_level(L_INFO);
798 < } | LOG_LEVEL '=' T_L_DEBUG ';'
799 < {
800 <  if (ypass == 2)
801 <    set_log_level(L_DEBUG);
788 >  if (conf_parser_ctx.pass == 2)
789 >  {
790 >    struct split_nuh_item nuh;
791 >
792 >    nuh.nuhmask  = yylval.string;
793 >    nuh.nickptr  = NULL;
794 >    nuh.userptr  = block_state.nick.buf;
795 >    nuh.hostptr  = block_state.host.buf;
796 >    nuh.nicksize = 0;
797 >    nuh.usersize = sizeof(block_state.nick.buf);
798 >    nuh.hostsize = sizeof(block_state.host.buf);
799 >
800 >    split_nuh(&nuh);
801 >  }
802   };
803  
804 +
805 + /***************************************************************************
806 + * log {} section
807 + ***************************************************************************/
808 + logging_entry:          T_LOG '{' logging_items '}' ';' ;
809 + logging_items:          logging_items logging_item | logging_item ;
810 +
811 + logging_item:           logging_use_logging | logging_file_entry |
812 +                        error ';' ;
813 +
814   logging_use_logging: USE_LOGGING '=' TBOOL ';'
815   {
816 <  if (ypass == 2)
817 <    ConfigLoggingEntry.use_logging = yylval.number;
816 >  if (conf_parser_ctx.pass == 2)
817 >    ConfigLog.use_logging = yylval.number;
818   };
819  
820 < /***************************************************************************
919 < * section oper
920 < ***************************************************************************/
921 < oper_entry: OPERATOR
820 > logging_file_entry:
821   {
822 <  if (ypass == 2)
823 <  {
824 <    yy_conf = make_conf_item(OPER_TYPE);
926 <    yy_aconf = map_to_conf(yy_conf);
927 <    SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
928 <  }
929 <  else
930 <  {
931 <    MyFree(class_name);
932 <    class_name = NULL;
933 <  }
934 < } oper_name_b '{' oper_items '}' ';'
822 >  if (conf_parser_ctx.pass == 2)
823 >    reset_block_state();
824 > } T_FILE  '{' logging_file_items '}' ';'
825   {
826 <  if (ypass == 2)
827 <  {
938 <    struct CollectItem *yy_tmp;
939 <    dlink_node *ptr;
940 <    dlink_node *next_ptr;
826 >  if (conf_parser_ctx.pass != 2)
827 >    break;
828  
829 <    conf_add_class_to_conf(yy_conf, class_name);
829 >  if (block_state.type.value && block_state.file.buf[0])
830 >    log_set_file(block_state.type.value, block_state.size.value,
831 >                 block_state.file.buf);
832 > };
833  
834 <    /* Now, make sure there is a copy of the "base" given oper
835 <     * block in each of the collected copies
946 <     */
834 > logging_file_items: logging_file_items logging_file_item |
835 >                    logging_file_item ;
836  
837 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
838 <    {
950 <      struct AccessItem *new_aconf;
951 <      struct ConfItem *new_conf;
952 <      yy_tmp = ptr->data;
953 <
954 <      new_conf = make_conf_item(OPER_TYPE);
955 <      new_aconf = (struct AccessItem *)map_to_conf(new_conf);
956 <
957 <      new_aconf->flags = yy_aconf->flags;
958 <
959 <      if (yy_conf->name != NULL)
960 <        DupString(new_conf->name, yy_conf->name);
961 <      if (yy_tmp->user != NULL)
962 <        DupString(new_aconf->user, yy_tmp->user);
963 <      else
964 <        DupString(new_aconf->user, "*");
965 <      if (yy_tmp->host != NULL)
966 <        DupString(new_aconf->host, yy_tmp->host);
967 <      else
968 <        DupString(new_aconf->host, "*");
969 <      conf_add_class_to_conf(new_conf, class_name);
970 <      if (yy_aconf->passwd != NULL)
971 <        DupString(new_aconf->passwd, yy_aconf->passwd);
972 <
973 <      new_aconf->port = yy_aconf->port;
974 < #ifdef HAVE_LIBCRYPTO
975 <      if (yy_aconf->rsa_public_key_file != NULL)
976 <      {
977 <        BIO *file;
978 <
979 <        DupString(new_aconf->rsa_public_key_file,
980 <                  yy_aconf->rsa_public_key_file);
981 <
982 <        file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
983 <        new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
984 <                                                           NULL, 0, NULL);
985 <        BIO_set_close(file, BIO_CLOSE);
986 <        BIO_free(file);
987 <      }
988 < #endif
837 > logging_file_item:  logging_file_name | logging_file_type |
838 >                    logging_file_size | error ';' ;
839  
840 < #ifdef HAVE_LIBCRYPTO
841 <      if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
842 <          && yy_tmp->host)
843 < #else
994 <      if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
995 < #endif
996 <      {
997 <        conf_add_class_to_conf(new_conf, class_name);
998 <        if (yy_tmp->name != NULL)
999 <          DupString(new_conf->name, yy_tmp->name);
1000 <      }
840 > logging_file_name: NAME '=' QSTRING ';'
841 > {
842 >  if (conf_parser_ctx.pass != 2)
843 >    break;
844  
845 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
846 <      free_collect_item(yy_tmp);
1004 <    }
845 >  strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
846 > }
847  
848 <    yy_conf = NULL;
849 <    yy_aconf = NULL;
848 > logging_file_size: T_SIZE '=' sizespec ';'
849 > {
850 >  block_state.size.value = $3;
851 > } | T_SIZE '=' T_UNLIMITED ';'
852 > {
853 >  block_state.size.value = 0;
854 > };
855  
856 + logging_file_type: TYPE
857 + {
858 +  if (conf_parser_ctx.pass == 2)
859 +    block_state.type.value = 0;
860 + } '=' logging_file_type_items ';' ;
861  
862 <    MyFree(class_name);
863 <    class_name = NULL;
864 <  }
865 < };
862 > logging_file_type_items: logging_file_type_items ',' logging_file_type_item | logging_file_type_item;
863 > logging_file_type_item:  USER
864 > {
865 >  if (conf_parser_ctx.pass == 2)
866 >    block_state.type.value = LOG_TYPE_USER;
867 > } | OPERATOR
868 > {
869 >  if (conf_parser_ctx.pass == 2)
870 >    block_state.type.value = LOG_TYPE_OPER;
871 > } | XLINE
872 > {
873 >  if (conf_parser_ctx.pass == 2)
874 >    block_state.type.value = LOG_TYPE_XLINE;
875 > } | RESV
876 > {
877 >  if (conf_parser_ctx.pass == 2)
878 >    block_state.type.value = LOG_TYPE_RESV;
879 > } | T_DLINE
880 > {
881 >  if (conf_parser_ctx.pass == 2)
882 >    block_state.type.value = LOG_TYPE_DLINE;
883 > } | KLINE
884 > {
885 >  if (conf_parser_ctx.pass == 2)
886 >    block_state.type.value = LOG_TYPE_KLINE;
887 > } | KILL
888 > {
889 >  if (conf_parser_ctx.pass == 2)
890 >    block_state.type.value = LOG_TYPE_KILL;
891 > } | T_DEBUG
892 > {
893 >  if (conf_parser_ctx.pass == 2)
894 >    block_state.type.value = LOG_TYPE_DEBUG;
895 > };
896  
1015 oper_name_b: | oper_name_t;
1016 oper_items:     oper_items oper_item | oper_item;
1017 oper_item:      oper_name | oper_user | oper_password | oper_hidden_admin |
1018                oper_hidden_oper | oper_umodes |
1019                oper_class | oper_global_kill | oper_remote |
1020                oper_kline | oper_xline | oper_unkline |
1021                oper_gline | oper_nick_changes | oper_remoteban |
1022                oper_die | oper_rehash | oper_admin | oper_operwall |
1023                oper_encrypted | oper_rsa_public_key_file |
1024                oper_flags | error ';' ;
897  
898 < oper_name: NAME '=' QSTRING ';'
898 > /***************************************************************************
899 > * operator {} section
900 > ***************************************************************************/
901 > oper_entry: OPERATOR
902   {
903 <  if (ypass == 2)
904 <  {
1030 <    if (strlen(yylval.string) > OPERNICKLEN)
1031 <      yylval.string[OPERNICKLEN] = '\0';
1032 <
1033 <    MyFree(yy_conf->name);
1034 <    DupString(yy_conf->name, yylval.string);
1035 <  }
1036 < };
903 >  if (conf_parser_ctx.pass != 2)
904 >    break;
905  
906 < oper_name_t: QSTRING
906 >  reset_block_state();
907 >  block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
908 > } '{' oper_items '}' ';'
909   {
910 <  if (ypass == 2)
1041 <  {
1042 <    if (strlen(yylval.string) > OPERNICKLEN)
1043 <      yylval.string[OPERNICKLEN] = '\0';
910 >  dlink_node *node;
911  
912 <    MyFree(yy_conf->name);
913 <    DupString(yy_conf->name, yylval.string);
1047 <  }
1048 < };
912 >  if (conf_parser_ctx.pass != 2)
913 >    break;
914  
915 < oper_user: USER '=' QSTRING ';'
916 < {
917 <  if (ypass == 2)
915 >  if (!block_state.name.buf[0])
916 >    break;
917 >
918 >  if (!block_state.rpass.buf[0])
919 >    break;
920 >
921 >  DLINK_FOREACH(node, block_state.mask.list.head)
922    {
923      struct split_nuh_item nuh;
924 +    char *s = node->data;
925  
926 <    nuh.nuhmask  = yylval.string;
926 >    if (EmptyString(s))
927 >      continue;
928 >
929 >    nuh.nuhmask  = s;
930      nuh.nickptr  = NULL;
931 <    nuh.userptr  = userbuf;
932 <    nuh.hostptr  = hostbuf;
931 >    nuh.userptr  = block_state.user.buf;
932 >    nuh.hostptr  = block_state.host.buf;
933  
934      nuh.nicksize = 0;
935 <    nuh.usersize = sizeof(userbuf);
936 <    nuh.hostsize = sizeof(hostbuf);
935 >    nuh.usersize = sizeof(block_state.user.buf);
936 >    nuh.hostsize = sizeof(block_state.host.buf);
937  
938      split_nuh(&nuh);
939  
940 <    if (yy_aconf->user == NULL)
941 <    {
942 <      DupString(yy_aconf->user, userbuf);
943 <      DupString(yy_aconf->host, hostbuf);
944 <    }
945 <    else
946 <    {
947 <      struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
940 >    struct MaskItem *conf = conf_make(CONF_OPER);
941 >    conf->addr = xcalloc(sizeof(*conf->addr));
942 >    conf->name = xstrdup(block_state.name.buf);
943 >    conf->user = xstrdup(block_state.user.buf);
944 >    conf->host = xstrdup(block_state.host.buf);
945 >
946 >    if (block_state.cert.buf[0])
947 >      conf->certfp = xstrdup(block_state.cert.buf);
948 >
949 >    if (block_state.rpass.buf[0])
950 >      conf->passwd = xstrdup(block_state.rpass.buf);
951 >
952 >    if (block_state.whois.buf[0])
953 >      conf->whois = xstrdup(block_state.whois.buf);
954 >
955 >    conf->flags = block_state.flags.value;
956 >    conf->modes = block_state.modes.value;
957 >    conf->port  = block_state.port.value;
958 >    conf->htype = parse_netmask(conf->host, conf->addr, &conf->bits);
959  
960 <      DupString(yy_tmp->user, userbuf);
1077 <      DupString(yy_tmp->host, hostbuf);
1078 <
1079 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1080 <    }
960 >    conf_add_class_to_conf(conf, block_state.class.buf);
961    }
962   };
963  
964 < oper_password: PASSWORD '=' QSTRING ';'
965 < {
966 <  if (ypass == 2)
967 <  {
968 <    if (yy_aconf->passwd != NULL)
969 <      memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
964 > oper_items:     oper_items oper_item | oper_item;
965 > oper_item:      oper_name |
966 >                oper_user |
967 >                oper_password |
968 >                oper_whois |
969 >                oper_umodes |
970 >                oper_class |
971 >                oper_encrypted |
972 >                oper_tls_certificate_fingerprint |
973 >                oper_tls_connection_required |
974 >                oper_flags |
975 >                error ';' ;
976  
977 <    MyFree(yy_aconf->passwd);
978 <    DupString(yy_aconf->passwd, yylval.string);
979 <  }
977 > oper_name: NAME '=' QSTRING ';'
978 > {
979 >  if (conf_parser_ctx.pass == 2)
980 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
981   };
982  
983 < oper_encrypted: ENCRYPTED '=' TBOOL ';'
983 > oper_user: USER '=' QSTRING ';'
984   {
985 <  if (ypass == 2)
986 <  {
1100 <    if (yylval.number)
1101 <      SetConfEncrypted(yy_aconf);
1102 <    else
1103 <      ClearConfEncrypted(yy_aconf);
1104 <  }
985 >  if (conf_parser_ctx.pass == 2)
986 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
987   };
988  
989 < oper_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
989 > oper_password: PASSWORD '=' QSTRING ';'
990   {
991 < #ifdef HAVE_LIBCRYPTO
992 <  if (ypass == 2)
993 <  {
1112 <    BIO *file;
1113 <
1114 <    if (yy_aconf->rsa_public_key != NULL)
1115 <    {
1116 <      RSA_free(yy_aconf->rsa_public_key);
1117 <      yy_aconf->rsa_public_key = NULL;
1118 <    }
991 >  if (conf_parser_ctx.pass == 2)
992 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
993 > };
994  
995 <    if (yy_aconf->rsa_public_key_file != NULL)
996 <    {
997 <      MyFree(yy_aconf->rsa_public_key_file);
998 <      yy_aconf->rsa_public_key_file = NULL;
999 <    }
995 > oper_whois: WHOIS '=' QSTRING ';'
996 > {
997 >  if (conf_parser_ctx.pass == 2)
998 >    strlcpy(block_state.whois.buf, yylval.string, sizeof(block_state.whois.buf));
999 > };
1000  
1001 <    DupString(yy_aconf->rsa_public_key_file, yylval.string);
1002 <    file = BIO_new_file(yylval.string, "r");
1001 > oper_encrypted: ENCRYPTED '=' TBOOL ';'
1002 > {
1003 >  if (conf_parser_ctx.pass != 2)
1004 >    break;
1005  
1006 <    if (file == NULL)
1007 <    {
1008 <      yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
1009 <      break;
1010 <    }
1006 >  if (yylval.number)
1007 >    block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1008 >  else
1009 >    block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1010 > };
1011  
1012 <    yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
1012 > oper_tls_certificate_fingerprint: TLS_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
1013 > {
1014 >  if (conf_parser_ctx.pass == 2)
1015 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
1016 > };
1017  
1018 <    if (yy_aconf->rsa_public_key == NULL)
1019 <    {
1020 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
1021 <      break;
1141 <    }
1018 > oper_tls_connection_required: TLS_CONNECTION_REQUIRED '=' TBOOL ';'
1019 > {
1020 >  if (conf_parser_ctx.pass != 2)
1021 >    break;
1022  
1023 <    BIO_set_close(file, BIO_CLOSE);
1024 <    BIO_free(file);
1025 <  }
1026 < #endif /* HAVE_LIBCRYPTO */
1023 >  if (yylval.number)
1024 >    block_state.flags.value |= CONF_FLAGS_TLS;
1025 >  else
1026 >    block_state.flags.value &= ~CONF_FLAGS_TLS;
1027   };
1028  
1029   oper_class: CLASS '=' QSTRING ';'
1030   {
1031 <  if (ypass == 2)
1032 <  {
1153 <    MyFree(class_name);
1154 <    DupString(class_name, yylval.string);
1155 <  }
1031 >  if (conf_parser_ctx.pass == 2)
1032 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1033   };
1034  
1035   oper_umodes: T_UMODES
1036   {
1037 <  if (ypass == 2)
1038 <    yy_aconf->modes = 0;
1039 < } '='  oper_umodes_items ';' ;
1037 >  if (conf_parser_ctx.pass == 2)
1038 >    block_state.modes.value = 0;
1039 > } '=' oper_umodes_items ';' ;
1040  
1041   oper_umodes_items: oper_umodes_items ',' oper_umodes_item | oper_umodes_item;
1042   oper_umodes_item:  T_BOTS
1043   {
1044 <  if (ypass == 2)
1045 <    yy_aconf->modes |= UMODE_BOTS;
1044 >  if (conf_parser_ctx.pass == 2)
1045 >    block_state.modes.value |= UMODE_BOTS;
1046   } | T_CCONN
1047   {
1048 <  if (ypass == 2)
1049 <    yy_aconf->modes |= UMODE_CCONN;
1173 < } | T_CCONN_FULL
1174 < {
1175 <  if (ypass == 2)
1176 <    yy_aconf->modes |= UMODE_CCONN_FULL;
1048 >  if (conf_parser_ctx.pass == 2)
1049 >    block_state.modes.value |= UMODE_CCONN;
1050   } | T_DEAF
1051   {
1052 <  if (ypass == 2)
1053 <    yy_aconf->modes |= UMODE_DEAF;
1052 >  if (conf_parser_ctx.pass == 2)
1053 >    block_state.modes.value |= UMODE_DEAF;
1054   } | T_DEBUG
1055   {
1056 <  if (ypass == 2)
1057 <    yy_aconf->modes |= UMODE_DEBUG;
1056 >  if (conf_parser_ctx.pass == 2)
1057 >    block_state.modes.value |= UMODE_DEBUG;
1058   } | T_FULL
1059   {
1060 <  if (ypass == 2)
1061 <    yy_aconf->modes |= UMODE_FULL;
1060 >  if (conf_parser_ctx.pass == 2)
1061 >    block_state.modes.value |= UMODE_FULL;
1062 > } | HIDDEN
1063 > {
1064 >  if (conf_parser_ctx.pass == 2)
1065 >    block_state.modes.value |= UMODE_HIDDEN;
1066 > } | HIDE_CHANS
1067 > {
1068 >  if (conf_parser_ctx.pass == 2)
1069 >    block_state.modes.value |= UMODE_HIDECHANS;
1070 > } | HIDE_IDLE
1071 > {
1072 >  if (conf_parser_ctx.pass == 2)
1073 >    block_state.modes.value |= UMODE_HIDEIDLE;
1074   } | T_SKILL
1075   {
1076 <  if (ypass == 2)
1077 <    yy_aconf->modes |= UMODE_SKILL;
1076 >  if (conf_parser_ctx.pass == 2)
1077 >    block_state.modes.value |= UMODE_SKILL;
1078   } | T_NCHANGE
1079   {
1080 <  if (ypass == 2)
1081 <    yy_aconf->modes |= UMODE_NCHANGE;
1080 >  if (conf_parser_ctx.pass == 2)
1081 >    block_state.modes.value |= UMODE_NCHANGE;
1082   } | T_REJ
1083   {
1084 <  if (ypass == 2)
1085 <    yy_aconf->modes |= UMODE_REJ;
1084 >  if (conf_parser_ctx.pass == 2)
1085 >    block_state.modes.value |= UMODE_REJ;
1086   } | T_UNAUTH
1087   {
1088 <  if (ypass == 2)
1089 <    yy_aconf->modes |= UMODE_UNAUTH;
1088 >  if (conf_parser_ctx.pass == 2)
1089 >    block_state.modes.value |= UMODE_UNAUTH;
1090   } | T_SPY
1091   {
1092 <  if (ypass == 2)
1093 <    yy_aconf->modes |= UMODE_SPY;
1092 >  if (conf_parser_ctx.pass == 2)
1093 >    block_state.modes.value |= UMODE_SPY;
1094   } | T_EXTERNAL
1095   {
1096 <  if (ypass == 2)
1097 <    yy_aconf->modes |= UMODE_EXTERNAL;
1213 < } | T_OPERWALL
1214 < {
1215 <  if (ypass == 2)
1216 <    yy_aconf->modes |= UMODE_OPERWALL;
1096 >  if (conf_parser_ctx.pass == 2)
1097 >    block_state.modes.value |= UMODE_EXTERNAL;
1098   } | T_SERVNOTICE
1099   {
1100 <  if (ypass == 2)
1101 <    yy_aconf->modes |= UMODE_SERVNOTICE;
1100 >  if (conf_parser_ctx.pass == 2)
1101 >    block_state.modes.value |= UMODE_SERVNOTICE;
1102   } | T_INVISIBLE
1103   {
1104 <  if (ypass == 2)
1105 <    yy_aconf->modes |= UMODE_INVISIBLE;
1104 >  if (conf_parser_ctx.pass == 2)
1105 >    block_state.modes.value |= UMODE_INVISIBLE;
1106   } | T_WALLOP
1107   {
1108 <  if (ypass == 2)
1109 <    yy_aconf->modes |= UMODE_WALLOP;
1108 >  if (conf_parser_ctx.pass == 2)
1109 >    block_state.modes.value |= UMODE_WALLOP;
1110   } | T_SOFTCALLERID
1111   {
1112 <  if (ypass == 2)
1113 <    yy_aconf->modes |= UMODE_SOFTCALLERID;
1112 >  if (conf_parser_ctx.pass == 2)
1113 >    block_state.modes.value |= UMODE_SOFTCALLERID;
1114   } | T_CALLERID
1115   {
1116 <  if (ypass == 2)
1117 <    yy_aconf->modes |= UMODE_CALLERID;
1116 >  if (conf_parser_ctx.pass == 2)
1117 >    block_state.modes.value |= UMODE_CALLERID;
1118   } | T_LOCOPS
1119   {
1120 <  if (ypass == 2)
1121 <    yy_aconf->modes |= UMODE_LOCOPS;
1122 < };
1123 <
1124 < oper_global_kill: GLOBAL_KILL '=' TBOOL ';'
1125 < {
1126 <  if (ypass == 2)
1127 <  {
1128 <    if (yylval.number)
1129 <      yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1130 <    else
1250 <      yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1251 <  }
1252 < };
1253 <
1254 < oper_remote: REMOTE '=' TBOOL ';'
1255 < {
1256 <  if (ypass == 2)
1257 <  {
1258 <    if (yylval.number)
1259 <      yy_aconf->port |= OPER_FLAG_REMOTE;
1260 <    else
1261 <      yy_aconf->port &= ~OPER_FLAG_REMOTE;
1262 <  }
1263 < };
1264 <
1265 < oper_remoteban: REMOTEBAN '=' TBOOL ';'
1266 < {
1267 <  if (ypass == 2)
1268 <  {
1269 <    if (yylval.number)
1270 <      yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1271 <    else
1272 <      yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1273 <  }
1274 < };
1275 <
1276 < oper_kline: KLINE '=' TBOOL ';'
1277 < {
1278 <  if (ypass == 2)
1279 <  {
1280 <    if (yylval.number)
1281 <      yy_aconf->port |= OPER_FLAG_K;
1282 <    else
1283 <      yy_aconf->port &= ~OPER_FLAG_K;
1284 <  }
1285 < };
1286 <
1287 < oper_xline: XLINE '=' TBOOL ';'
1288 < {
1289 <  if (ypass == 2)
1290 <  {
1291 <    if (yylval.number)
1292 <      yy_aconf->port |= OPER_FLAG_X;
1293 <    else
1294 <      yy_aconf->port &= ~OPER_FLAG_X;
1295 <  }
1296 < };
1297 <
1298 < oper_unkline: UNKLINE '=' TBOOL ';'
1299 < {
1300 <  if (ypass == 2)
1301 <  {
1302 <    if (yylval.number)
1303 <      yy_aconf->port |= OPER_FLAG_UNKLINE;
1304 <    else
1305 <      yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1306 <  }
1307 < };
1308 <
1309 < oper_gline: GLINE '=' TBOOL ';'
1310 < {
1311 <  if (ypass == 2)
1312 <  {
1313 <    if (yylval.number)
1314 <      yy_aconf->port |= OPER_FLAG_GLINE;
1315 <    else
1316 <      yy_aconf->port &= ~OPER_FLAG_GLINE;
1317 <  }
1318 < };
1319 <
1320 < oper_nick_changes: NICK_CHANGES '=' TBOOL ';'
1321 < {
1322 <  if (ypass == 2)
1323 <  {
1324 <    if (yylval.number)
1325 <      yy_aconf->port |= OPER_FLAG_N;
1326 <    else
1327 <      yy_aconf->port &= ~OPER_FLAG_N;
1328 <  }
1329 < };
1330 <
1331 < oper_die: DIE '=' TBOOL ';'
1332 < {
1333 <  if (ypass == 2)
1334 <  {
1335 <    if (yylval.number)
1336 <      yy_aconf->port |= OPER_FLAG_DIE;
1337 <    else
1338 <      yy_aconf->port &= ~OPER_FLAG_DIE;
1339 <  }
1340 < };
1341 <
1342 < oper_rehash: REHASH '=' TBOOL ';'
1343 < {
1344 <  if (ypass == 2)
1345 <  {
1346 <    if (yylval.number)
1347 <      yy_aconf->port |= OPER_FLAG_REHASH;
1348 <    else
1349 <      yy_aconf->port &= ~OPER_FLAG_REHASH;
1350 <  }
1351 < };
1352 <
1353 < oper_admin: ADMIN '=' TBOOL ';'
1354 < {
1355 <  if (ypass == 2)
1356 <  {
1357 <    if (yylval.number)
1358 <      yy_aconf->port |= OPER_FLAG_ADMIN;
1359 <    else
1360 <      yy_aconf->port &= ~OPER_FLAG_ADMIN;
1361 <  }
1362 < };
1363 <
1364 < oper_hidden_admin: HIDDEN_ADMIN '=' TBOOL ';'
1365 < {
1366 <  if (ypass == 2)
1367 <  {
1368 <    if (yylval.number)
1369 <      yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1370 <    else
1371 <      yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1372 <  }
1373 < };
1374 <
1375 < oper_hidden_oper: HIDDEN_OPER '=' TBOOL ';'
1120 >  if (conf_parser_ctx.pass == 2)
1121 >    block_state.modes.value |= UMODE_LOCOPS;
1122 > } | T_NONONREG
1123 > {
1124 >  if (conf_parser_ctx.pass == 2)
1125 >    block_state.modes.value |= UMODE_REGONLY;
1126 > } | T_FARCONNECT
1127 > {
1128 >  if (conf_parser_ctx.pass == 2)
1129 >    block_state.modes.value |= UMODE_FARCONNECT;
1130 > } | EXPIRATION
1131   {
1132 <  if (ypass == 2)
1133 <  {
1379 <    if (yylval.number)
1380 <      yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1381 <    else
1382 <      yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1383 <  }
1384 < };
1385 <
1386 < oper_operwall: T_OPERWALL '=' TBOOL ';'
1387 < {
1388 <  if (ypass == 2)
1389 <  {
1390 <    if (yylval.number)
1391 <      yy_aconf->port |= OPER_FLAG_OPERWALL;
1392 <    else
1393 <      yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1394 <  }
1132 >  if (conf_parser_ctx.pass == 2)
1133 >    block_state.modes.value |= UMODE_EXPIRATION;
1134   };
1135  
1136   oper_flags: IRCD_FLAGS
1137   {
1138 < } '='  oper_flags_items ';';
1138 >  if (conf_parser_ctx.pass == 2)
1139 >    block_state.port.value = 0;
1140 > } '=' oper_flags_items ';';
1141  
1142   oper_flags_items: oper_flags_items ',' oper_flags_item | oper_flags_item;
1143 < oper_flags_item: NOT { not_atom = 1; } oper_flags_item_atom
1403 <                | { not_atom = 0; } oper_flags_item_atom;
1404 <
1405 < oper_flags_item_atom: GLOBAL_KILL
1143 > oper_flags_item: KILL ':' REMOTE
1144   {
1145 <  if (ypass == 2)
1146 <  {
1147 <    if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
1148 <    else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
1149 <  }
1150 < } | REMOTE
1145 >  if (conf_parser_ctx.pass == 2)
1146 >    block_state.port.value |= OPER_FLAG_KILL_REMOTE;
1147 > } | KILL
1148 > {
1149 >  if (conf_parser_ctx.pass == 2)
1150 >    block_state.port.value |= OPER_FLAG_KILL;
1151 > } | CONNECT ':' REMOTE
1152 > {
1153 >  if (conf_parser_ctx.pass == 2)
1154 >    block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
1155 > } | CONNECT
1156 > {
1157 >  if (conf_parser_ctx.pass == 2)
1158 >    block_state.port.value |= OPER_FLAG_CONNECT;
1159 > } | SQUIT ':' REMOTE
1160 > {
1161 >  if (conf_parser_ctx.pass == 2)
1162 >    block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
1163 > } | SQUIT
1164   {
1165 <  if (ypass == 2)
1166 <  {
1416 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
1417 <    else yy_aconf->port |= OPER_FLAG_REMOTE;
1418 <  }
1165 >  if (conf_parser_ctx.pass == 2)
1166 >    block_state.port.value |= OPER_FLAG_SQUIT;
1167   } | KLINE
1168   {
1169 <  if (ypass == 2)
1170 <  {
1423 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
1424 <    else yy_aconf->port |= OPER_FLAG_K;
1425 <  }
1169 >  if (conf_parser_ctx.pass == 2)
1170 >    block_state.port.value |= OPER_FLAG_KLINE;
1171   } | UNKLINE
1172   {
1173 <  if (ypass == 2)
1174 <  {
1175 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
1176 <    else yy_aconf->port |= OPER_FLAG_UNKLINE;
1177 <  }
1173 >  if (conf_parser_ctx.pass == 2)
1174 >    block_state.port.value |= OPER_FLAG_UNKLINE;
1175 > } | T_DLINE
1176 > {
1177 >  if (conf_parser_ctx.pass == 2)
1178 >    block_state.port.value |= OPER_FLAG_DLINE;
1179 > } | T_UNDLINE
1180 > {
1181 >  if (conf_parser_ctx.pass == 2)
1182 >    block_state.port.value |= OPER_FLAG_UNDLINE;
1183   } | XLINE
1184   {
1185 <  if (ypass == 2)
1186 <  {
1187 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
1438 <    else yy_aconf->port |= OPER_FLAG_X;
1439 <  }
1440 < } | GLINE
1185 >  if (conf_parser_ctx.pass == 2)
1186 >    block_state.port.value |= OPER_FLAG_XLINE;
1187 > } | T_UNXLINE
1188   {
1189 <  if (ypass == 2)
1190 <  {
1444 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
1445 <    else yy_aconf->port |= OPER_FLAG_GLINE;
1446 <  }
1189 >  if (conf_parser_ctx.pass == 2)
1190 >    block_state.port.value |= OPER_FLAG_UNXLINE;
1191   } | DIE
1192   {
1193 <  if (ypass == 2)
1194 <  {
1195 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
1196 <    else yy_aconf->port |= OPER_FLAG_DIE;
1197 <  }
1193 >  if (conf_parser_ctx.pass == 2)
1194 >    block_state.port.value |= OPER_FLAG_DIE;
1195 > } | T_RESTART
1196 > {
1197 >  if (conf_parser_ctx.pass == 2)
1198 >    block_state.port.value |= OPER_FLAG_RESTART;
1199 > } | REHASH ':' REMOTE
1200 > {
1201 >  if (conf_parser_ctx.pass == 2)
1202 >    block_state.port.value |= OPER_FLAG_REHASH_REMOTE;
1203   } | REHASH
1204   {
1205 <  if (ypass == 2)
1206 <  {
1458 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
1459 <    else yy_aconf->port |= OPER_FLAG_REHASH;
1460 <  }
1205 >  if (conf_parser_ctx.pass == 2)
1206 >    block_state.port.value |= OPER_FLAG_REHASH;
1207   } | ADMIN
1208   {
1209 <  if (ypass == 2)
1210 <  {
1211 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
1212 <    else yy_aconf->port |= OPER_FLAG_ADMIN;
1213 <  }
1214 < } | HIDDEN_ADMIN
1209 >  if (conf_parser_ctx.pass == 2)
1210 >    block_state.port.value |= OPER_FLAG_ADMIN;
1211 > } | T_GLOBOPS
1212 > {
1213 >  if (conf_parser_ctx.pass == 2)
1214 >    block_state.port.value |= OPER_FLAG_GLOBOPS;
1215 > } | T_WALLOPS
1216   {
1217 <  if (ypass == 2)
1218 <  {
1219 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
1473 <    else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
1474 <  }
1475 < } | NICK_CHANGES
1217 >  if (conf_parser_ctx.pass == 2)
1218 >    block_state.port.value |= OPER_FLAG_WALLOPS;
1219 > } | T_LOCOPS
1220   {
1221 <  if (ypass == 2)
1222 <  {
1223 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
1480 <    else yy_aconf->port |= OPER_FLAG_N;
1481 <  }
1482 < } | T_OPERWALL
1221 >  if (conf_parser_ctx.pass == 2)
1222 >    block_state.port.value |= OPER_FLAG_LOCOPS;
1223 > } | REMOTEBAN
1224   {
1225 <  if (ypass == 2)
1226 <  {
1227 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
1228 <    else yy_aconf->port |= OPER_FLAG_OPERWALL;
1229 <  }
1230 < } | OPER_SPY_T
1225 >  if (conf_parser_ctx.pass == 2)
1226 >    block_state.port.value |= OPER_FLAG_REMOTEBAN;
1227 > } | T_SET
1228 > {
1229 >  if (conf_parser_ctx.pass == 2)
1230 >    block_state.port.value |= OPER_FLAG_SET;
1231 > } | MODULE
1232 > {
1233 >  if (conf_parser_ctx.pass == 2)
1234 >    block_state.port.value |= OPER_FLAG_MODULE;
1235 > } | T_OPME
1236 > {
1237 >  if (conf_parser_ctx.pass == 2)
1238 >    block_state.port.value |= OPER_FLAG_OPME;
1239 > } | NICK ':' RESV
1240 > {
1241 >  if (conf_parser_ctx.pass == 2)
1242 >    block_state.port.value |= OPER_FLAG_NICK_RESV;
1243 > } | JOIN ':' RESV
1244   {
1245 <  if (ypass == 2)
1246 <  {
1247 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
1494 <    else yy_aconf->port |= OPER_FLAG_OPER_SPY;
1495 <  }
1496 < } | HIDDEN_OPER
1245 >  if (conf_parser_ctx.pass == 2)
1246 >    block_state.port.value |= OPER_FLAG_JOIN_RESV;
1247 > } | RESV
1248   {
1249 <  if (ypass == 2)
1250 <  {
1251 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
1501 <    else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
1502 <  }
1503 < } | REMOTEBAN
1249 >  if (conf_parser_ctx.pass == 2)
1250 >    block_state.port.value |= OPER_FLAG_RESV;
1251 > } | T_UNRESV
1252   {
1253 <  if (ypass == 2)
1254 <  {
1255 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
1508 <    else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
1509 <  }
1510 < } | ENCRYPTED
1253 >  if (conf_parser_ctx.pass == 2)
1254 >    block_state.port.value |= OPER_FLAG_UNRESV;
1255 > } | CLOSE
1256   {
1257 <  if (ypass == 2)
1258 <  {
1514 <    if (not_atom) ClearConfEncrypted(yy_aconf);
1515 <    else SetConfEncrypted(yy_aconf);
1516 <  }
1257 >  if (conf_parser_ctx.pass == 2)
1258 >    block_state.port.value |= OPER_FLAG_CLOSE;
1259   };
1260  
1261  
1262   /***************************************************************************
1263 < *  section class
1263 > * class {} section
1264   ***************************************************************************/
1265   class_entry: CLASS
1266   {
1267 <  if (ypass == 1)
1268 <  {
1527 <    yy_conf = make_conf_item(CLASS_TYPE);
1528 <    yy_class = map_to_conf(yy_conf);
1529 <  }
1530 < } class_name_b '{' class_items '}' ';'
1531 < {
1532 <  if (ypass == 1)
1533 <  {
1534 <    struct ConfItem *cconf = NULL;
1535 <    struct ClassItem *class = NULL;
1267 >  if (conf_parser_ctx.pass != 1)
1268 >    break;
1269  
1270 <    if (yy_class_name == NULL)
1538 <      delete_conf_item(yy_conf);
1539 <    else
1540 <    {
1541 <      cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
1270 >  reset_block_state();
1271  
1272 <      if (cconf != NULL)                /* The class existed already */
1273 <      {
1274 <        int user_count = 0;
1275 <
1276 <        rebuild_cidr_class(cconf, yy_class);
1277 <
1278 <        class = map_to_conf(cconf);
1279 <
1280 <        user_count = class->curr_user_count;
1281 <        memcpy(class, yy_class, sizeof(*class));
1282 <        class->curr_user_count = user_count;
1283 <        class->active = 1;
1284 <
1285 <        delete_conf_item(yy_conf);
1286 <
1287 <        MyFree(cconf->name);            /* Allows case change of class name */
1288 <        cconf->name = yy_class_name;
1289 <      }
1290 <      else      /* Brand new class */
1291 <      {
1292 <        MyFree(yy_conf->name);          /* just in case it was allocated */
1293 <        yy_conf->name = yy_class_name;
1294 <        yy_class->active = 1;
1295 <      }
1296 <    }
1272 >  block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
1273 >  block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
1274 >  block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
1275 >  block_state.max_sendq.value = DEFAULT_SENDQ;
1276 >  block_state.max_recvq.value = DEFAULT_RECVQ;
1277 > } '{' class_items '}' ';'
1278 > {
1279 >  if (conf_parser_ctx.pass != 1)
1280 >    break;
1281 >
1282 >  if (!block_state.class.buf[0])
1283 >    break;
1284 >
1285 >  struct ClassItem *class = class_find(block_state.class.buf, false);
1286 >  if (class == NULL)
1287 >    class = class_make();
1288 >
1289 >  class->active = true;
1290 >  xfree(class->name);
1291 >  class->name = xstrdup(block_state.class.buf);
1292 >  class->ping_freq = block_state.ping_freq.value;
1293 >  class->max_perip_local = block_state.max_perip_local.value;
1294 >  class->max_perip_global = block_state.max_perip_global.value;
1295 >  class->con_freq = block_state.con_freq.value;
1296 >  class->max_total = block_state.max_total.value;
1297 >  class->max_sendq = block_state.max_sendq.value;
1298 >  class->max_recvq = block_state.max_recvq.value;
1299 >  class->max_channels = block_state.max_channels.value;
1300 >
1301 >  if (block_state.min_idle.value > block_state.max_idle.value)
1302 >  {
1303 >    block_state.min_idle.value = 0;
1304 >    block_state.max_idle.value = 0;
1305 >    block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
1306 >  }
1307 >
1308 >  class->flags = block_state.flags.value;
1309 >  class->min_idle = block_state.min_idle.value;
1310 >  class->max_idle = block_state.max_idle.value;
1311 >
1312 >  bool diff = (class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value ||
1313 >               class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value);
1314 >  class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
1315 >  class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
1316 >  class->number_per_cidr = block_state.number_per_cidr.value;
1317  
1318 <    yy_class_name = NULL;
1319 <  }
1318 >  if (diff)
1319 >    class_ip_limit_rebuild(class);
1320   };
1321  
1573 class_name_b: | class_name_t;
1574
1322   class_items:    class_items class_item | class_item;
1323   class_item:     class_name |
1324 <                class_cidr_bitlen_ipv4 | class_cidr_bitlen_ipv6 |
1324 >                class_cidr_bitlen_ipv4 |
1325 >                class_cidr_bitlen_ipv6 |
1326                  class_ping_time |
1327 <                class_ping_warning |
1328 <                class_number_per_cidr |
1329 <                class_number_per_ip |
1327 >                class_number_per_cidr |
1328 >                class_number_per_ip_local |
1329 >                class_number_per_ip_global |
1330                  class_connectfreq |
1331 +                class_max_channels |
1332                  class_max_number |
1584                class_max_global |
1585                class_max_local |
1586                class_max_ident |
1333                  class_sendq |
1334 <                error ';' ;
1334 >                class_recvq |
1335 >                class_min_idle |
1336 >                class_max_idle |
1337 >                class_flags |
1338 >                error ';' ;
1339  
1340 < class_name: NAME '=' QSTRING ';'
1340 > class_name: NAME '=' QSTRING ';'
1341   {
1342 <  if (ypass == 1)
1343 <  {
1594 <    MyFree(yy_class_name);
1595 <    DupString(yy_class_name, yylval.string);
1596 <  }
1342 >  if (conf_parser_ctx.pass == 1)
1343 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1344   };
1345  
1346 < class_name_t: QSTRING
1346 > class_ping_time: PING_TIME '=' timespec ';'
1347   {
1348 <  if (ypass == 1)
1349 <  {
1603 <    MyFree(yy_class_name);
1604 <    DupString(yy_class_name, yylval.string);
1605 <  }
1348 >  if (conf_parser_ctx.pass == 1)
1349 >    block_state.ping_freq.value = $3;
1350   };
1351  
1352 < class_ping_time: PING_TIME '=' timespec ';'
1352 > class_number_per_ip_local: NUMBER_PER_IP_LOCAL '=' NUMBER ';'
1353   {
1354 <  if (ypass == 1)
1355 <    PingFreq(yy_class) = $3;
1354 >  if (conf_parser_ctx.pass == 1)
1355 >    block_state.max_perip_local.value = $3;
1356   };
1357  
1358 < class_ping_warning: PING_WARNING '=' timespec ';'
1358 > class_number_per_ip_global: NUMBER_PER_IP_GLOBAL '=' NUMBER ';'
1359   {
1360 <  if (ypass == 1)
1361 <    PingWarning(yy_class) = $3;
1360 >  if (conf_parser_ctx.pass == 1)
1361 >    block_state.max_perip_global.value = $3;
1362   };
1363  
1364 < class_number_per_ip: NUMBER_PER_IP '=' NUMBER ';'
1364 > class_connectfreq: CONNECTFREQ '=' timespec ';'
1365   {
1366 <  if (ypass == 1)
1367 <    MaxPerIp(yy_class) = $3;
1366 >  if (conf_parser_ctx.pass == 1)
1367 >    block_state.con_freq.value = $3;
1368   };
1369  
1370 < class_connectfreq: CONNECTFREQ '=' timespec ';'
1370 > class_max_channels: MAX_CHANNELS '=' NUMBER ';'
1371   {
1372 <  if (ypass == 1)
1373 <    ConFreq(yy_class) = $3;
1372 >  if (conf_parser_ctx.pass == 1)
1373 >    block_state.max_channels.value = $3;
1374   };
1375  
1376   class_max_number: MAX_NUMBER '=' NUMBER ';'
1377   {
1378 <  if (ypass == 1)
1379 <    MaxTotal(yy_class) = $3;
1378 >  if (conf_parser_ctx.pass == 1)
1379 >    block_state.max_total.value = $3;
1380   };
1381  
1382 < class_max_global: MAX_GLOBAL '=' NUMBER ';'
1382 > class_sendq: SENDQ '=' sizespec ';'
1383   {
1384 <  if (ypass == 1)
1385 <    MaxGlobal(yy_class) = $3;
1384 >  if (conf_parser_ctx.pass == 1)
1385 >    block_state.max_sendq.value = $3;
1386   };
1387  
1388 < class_max_local: MAX_LOCAL '=' NUMBER ';'
1388 > class_recvq: T_RECVQ '=' sizespec ';'
1389   {
1390 <  if (ypass == 1)
1391 <    MaxLocal(yy_class) = $3;
1390 >  if (conf_parser_ctx.pass == 1)
1391 >    if ($3 >= CLIENT_FLOOD_MIN && $3 <= CLIENT_FLOOD_MAX)
1392 >      block_state.max_recvq.value = $3;
1393   };
1394  
1395 < class_max_ident: MAX_IDENT '=' NUMBER ';'
1395 > class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1396   {
1397 <  if (ypass == 1)
1398 <    MaxIdent(yy_class) = $3;
1397 >  if (conf_parser_ctx.pass == 1)
1398 >    block_state.cidr_bitlen_ipv4.value = $3 > 32 ? 32 : $3;
1399   };
1400  
1401 < class_sendq: SENDQ '=' sizespec ';'
1401 > class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1402   {
1403 <  if (ypass == 1)
1404 <    MaxSendq(yy_class) = $3;
1403 >  if (conf_parser_ctx.pass == 1)
1404 >    block_state.cidr_bitlen_ipv6.value = $3 > 128 ? 128 : $3;
1405   };
1406  
1407 < class_cidr_bitlen_ipv4: CIDR_BITLEN_IPV4 '=' NUMBER ';'
1407 > class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1408   {
1409 <  if (ypass == 1)
1410 <    CidrBitlenIPV4(yy_class) = $3;
1409 >  if (conf_parser_ctx.pass == 1)
1410 >    block_state.number_per_cidr.value = $3;
1411   };
1412  
1413 < class_cidr_bitlen_ipv6: CIDR_BITLEN_IPV6 '=' NUMBER ';'
1413 > class_min_idle: MIN_IDLE '=' timespec ';'
1414   {
1415 <  if (ypass == 1)
1416 <    CidrBitlenIPV6(yy_class) = $3;
1415 >  if (conf_parser_ctx.pass != 1)
1416 >    break;
1417 >
1418 >  block_state.min_idle.value = $3;
1419 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1420   };
1421  
1422 < class_number_per_cidr: NUMBER_PER_CIDR '=' NUMBER ';'
1422 > class_max_idle: MAX_IDLE '=' timespec ';'
1423 > {
1424 >  if (conf_parser_ctx.pass != 1)
1425 >    break;
1426 >
1427 >  block_state.max_idle.value = $3;
1428 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
1429 > };
1430 >
1431 > class_flags: IRCD_FLAGS
1432 > {
1433 >  if (conf_parser_ctx.pass == 1)
1434 >    block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
1435 > } '=' class_flags_items ';';
1436 >
1437 > class_flags_items: class_flags_items ',' class_flags_item | class_flags_item;
1438 > class_flags_item: RANDOM_IDLE
1439 > {
1440 >  if (conf_parser_ctx.pass == 1)
1441 >    block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
1442 > } | HIDE_IDLE_FROM_OPERS
1443   {
1444 <  if (ypass == 1)
1445 <    NumberPerCidr(yy_class) = $3;
1444 >  if (conf_parser_ctx.pass == 1)
1445 >    block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
1446   };
1447  
1448 +
1449   /***************************************************************************
1450 < *  section listen
1450 > * listen {} section
1451   ***************************************************************************/
1452   listen_entry: LISTEN
1453   {
1454 <  if (ypass == 2)
1455 <  {
1456 <    listener_address = NULL;
1688 <    listener_flags = 0;
1689 <  }
1690 < } '{' listen_items '}' ';'
1691 < {
1692 <  if (ypass == 2)
1693 <  {
1694 <    MyFree(listener_address);
1695 <    listener_address = NULL;
1696 <  }
1697 < };
1454 >  if (conf_parser_ctx.pass == 2)
1455 >    reset_block_state();
1456 > } '{' listen_items '}' ';';
1457  
1458   listen_flags: IRCD_FLAGS
1459   {
1460 <  listener_flags = 0;
1461 < } '='  listen_flags_items ';';
1460 >  block_state.flags.value = 0;
1461 > } '=' listen_flags_items ';';
1462  
1463   listen_flags_items: listen_flags_items ',' listen_flags_item | listen_flags_item;
1464 < listen_flags_item: T_SSL
1464 > listen_flags_item: T_TLS
1465   {
1466 <  if (ypass == 2)
1467 <    listener_flags |= LISTENER_SSL;
1466 >  if (conf_parser_ctx.pass == 2)
1467 >    block_state.flags.value |= LISTENER_TLS;
1468   } | HIDDEN
1469   {
1470 <  if (ypass == 2)
1471 <    listener_flags |= LISTENER_HIDDEN;
1470 >  if (conf_parser_ctx.pass == 2)
1471 >    block_state.flags.value |= LISTENER_HIDDEN;
1472 > } | T_SERVER
1473 > {
1474 >  if (conf_parser_ctx.pass == 2)
1475 >   block_state.flags.value |= LISTENER_SERVER;
1476   };
1477  
1478   listen_items:   listen_items listen_item | listen_item;
1479   listen_item:    listen_port | listen_flags | listen_address | listen_host | error ';';
1480  
1481 < listen_port: PORT '=' port_items { listener_flags = 0; } ';';
1481 > listen_port: PORT '=' port_items { block_state.flags.value = 0; } ';';
1482  
1483   port_items: port_items ',' port_item | port_item;
1484  
1485   port_item: NUMBER
1486   {
1487 <  if (ypass == 2)
1487 >  if (conf_parser_ctx.pass == 2)
1488    {
1489 <    if ((listener_flags & LISTENER_SSL))
1490 < #ifdef HAVE_LIBCRYPTO
1491 <      if (!ServerInfo.ctx)
1489 > #ifndef HAVE_TLS
1490 >    if (block_state.flags.value & LISTENER_TLS)
1491 >    {
1492 >      conf_error_report("TLS not available - port closed");
1493 >      break;
1494 >    }
1495   #endif
1496 <      {
1731 <        yyerror("SSL not available - port closed");
1732 <        break;
1733 <      }
1734 <    add_listener($1, listener_address, listener_flags);
1496 >    listener_add($1, block_state.addr.buf, block_state.flags.value);
1497    }
1498   } | NUMBER TWODOTS NUMBER
1499   {
1500 <  if (ypass == 2)
1500 >  if (conf_parser_ctx.pass == 2)
1501    {
1502 <    int i;
1503 <
1504 <    if ((listener_flags & LISTENER_SSL))
1505 < #ifdef HAVE_LIBCRYPTO
1506 <      if (!ServerInfo.ctx)
1502 > #ifndef HAVE_TLS
1503 >    if (block_state.flags.value & LISTENER_TLS)
1504 >    {
1505 >      conf_error_report("TLS not available - port closed");
1506 >      break;
1507 >    }
1508   #endif
1746      {
1747        yyerror("SSL not available - port closed");
1748        break;
1749      }
1509  
1510 <    for (i = $1; i <= $3; ++i)
1511 <      add_listener(i, listener_address, listener_flags);
1510 >    for (int i = $1; i <= $3; ++i)
1511 >      listener_add(i, block_state.addr.buf, block_state.flags.value);
1512    }
1513   };
1514  
1515   listen_address: IP '=' QSTRING ';'
1516   {
1517 <  if (ypass == 2)
1518 <  {
1760 <    MyFree(listener_address);
1761 <    DupString(listener_address, yylval.string);
1762 <  }
1517 >  if (conf_parser_ctx.pass == 2)
1518 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1519   };
1520  
1521   listen_host: HOST '=' QSTRING ';'
1522   {
1523 <  if (ypass == 2)
1524 <  {
1769 <    MyFree(listener_address);
1770 <    DupString(listener_address, yylval.string);
1771 <  }
1523 >  if (conf_parser_ctx.pass == 2)
1524 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
1525   };
1526  
1527 +
1528   /***************************************************************************
1529 < *  section auth
1529 > * auth {} section
1530   ***************************************************************************/
1531   auth_entry: IRCD_AUTH
1532   {
1533 <  if (ypass == 2)
1534 <  {
1781 <    yy_conf = make_conf_item(CLIENT_TYPE);
1782 <    yy_aconf = map_to_conf(yy_conf);
1783 <  }
1784 <  else
1785 <  {
1786 <    MyFree(class_name);
1787 <    class_name = NULL;
1788 <  }
1533 >  if (conf_parser_ctx.pass == 2)
1534 >    reset_block_state();
1535   } '{' auth_items '}' ';'
1536   {
1537 <  if (ypass == 2)
1792 <  {
1793 <    struct CollectItem *yy_tmp = NULL;
1794 <    dlink_node *ptr = NULL, *next_ptr = NULL;
1795 <
1796 <    if (yy_aconf->user && yy_aconf->host)
1797 <    {
1798 <      conf_add_class_to_conf(yy_conf, class_name);
1799 <      add_conf_by_address(CONF_CLIENT, yy_aconf);
1800 <    }
1801 <    else
1802 <      delete_conf_item(yy_conf);
1803 <
1804 <    /* copy over settings from first struct */
1805 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
1806 <    {
1807 <      struct AccessItem *new_aconf;
1808 <      struct ConfItem *new_conf;
1809 <
1810 <      new_conf = make_conf_item(CLIENT_TYPE);
1811 <      new_aconf = map_to_conf(new_conf);
1812 <
1813 <      yy_tmp = ptr->data;
1814 <
1815 <      assert(yy_tmp->user && yy_tmp->host);
1816 <
1817 <      if (yy_aconf->passwd != NULL)
1818 <        DupString(new_aconf->passwd, yy_aconf->passwd);
1819 <      if (yy_conf->name != NULL)
1820 <        DupString(new_conf->name, yy_conf->name);
1821 <      if (yy_aconf->passwd != NULL)
1822 <        DupString(new_aconf->passwd, yy_aconf->passwd);
1537 >  dlink_node *node;
1538  
1539 <      new_aconf->flags = yy_aconf->flags;
1540 <      new_aconf->port  = yy_aconf->port;
1539 >  if (conf_parser_ctx.pass != 2)
1540 >    break;
1541  
1542 <      DupString(new_aconf->user, yy_tmp->user);
1828 <      collapse(new_aconf->user);
1829 <
1830 <      DupString(new_aconf->host, yy_tmp->host);
1831 <      collapse(new_aconf->host);
1832 <
1833 <      conf_add_class_to_conf(new_conf, class_name);
1834 <      add_conf_by_address(CONF_CLIENT, new_aconf);
1835 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
1836 <      free_collect_item(yy_tmp);
1837 <    }
1838 <
1839 <    MyFree(class_name);
1840 <    class_name = NULL;
1841 <    yy_conf = NULL;
1842 <    yy_aconf = NULL;
1843 <  }
1844 < };
1845 <
1846 < auth_items:     auth_items auth_item | auth_item;
1847 < auth_item:      auth_user | auth_passwd | auth_class | auth_flags |
1848 <                auth_kline_exempt | auth_need_ident |
1849 <                auth_exceed_limit | auth_no_tilde | auth_gline_exempt |
1850 <                auth_spoof | auth_spoof_notice |
1851 <                auth_redir_serv | auth_redir_port | auth_can_flood |
1852 <                auth_need_password | auth_encrypted | error ';' ;
1853 <
1854 < auth_user: USER '=' QSTRING ';'
1855 < {
1856 <  if (ypass == 2)
1542 >  DLINK_FOREACH(node, block_state.mask.list.head)
1543    {
1858    struct CollectItem *yy_tmp = NULL;
1544      struct split_nuh_item nuh;
1545 +    char *s = node->data;
1546  
1547 <    nuh.nuhmask  = yylval.string;
1547 >    if (EmptyString(s))
1548 >      continue;
1549 >
1550 >    nuh.nuhmask  = s;
1551      nuh.nickptr  = NULL;
1552 <    nuh.userptr  = userbuf;
1553 <    nuh.hostptr  = hostbuf;
1552 >    nuh.userptr  = block_state.user.buf;
1553 >    nuh.hostptr  = block_state.host.buf;
1554  
1555      nuh.nicksize = 0;
1556 <    nuh.usersize = sizeof(userbuf);
1557 <    nuh.hostsize = sizeof(hostbuf);
1556 >    nuh.usersize = sizeof(block_state.user.buf);
1557 >    nuh.hostsize = sizeof(block_state.host.buf);
1558  
1559      split_nuh(&nuh);
1560  
1561 <    if (yy_aconf->user == NULL)
1562 <    {
1563 <      DupString(yy_aconf->user, userbuf);
1564 <      DupString(yy_aconf->host, hostbuf);
1565 <    }
1566 <    else
1567 <    {
1568 <      yy_tmp = MyMalloc(sizeof(struct CollectItem));
1561 >    struct MaskItem *conf = conf_make(CONF_CLIENT);
1562 >    conf->user = xstrdup(block_state.user.buf);
1563 >    conf->host = xstrdup(block_state.host.buf);
1564 >
1565 >    if (block_state.rpass.buf[0])
1566 >      conf->passwd = xstrdup(block_state.rpass.buf);
1567 >    if (block_state.name.buf[0])
1568 >      conf->name = xstrdup(block_state.name.buf);
1569  
1570 <      DupString(yy_tmp->user, userbuf);
1571 <      DupString(yy_tmp->host, hostbuf);
1570 >    conf->flags = block_state.flags.value;
1571 >    conf->port = block_state.port.value;
1572  
1573 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
1574 <    }
1573 >    conf_add_class_to_conf(conf, block_state.class.buf);
1574 >    add_conf_by_address(CONF_CLIENT, conf);
1575    }
1576   };
1577  
1578 < /* XXX - IP/IPV6 tags don't exist anymore - put IP/IPV6 into user. */
1578 > auth_items:     auth_items auth_item | auth_item;
1579 > auth_item:      auth_user |
1580 >                auth_passwd |
1581 >                auth_class |
1582 >                auth_flags |
1583 >                auth_spoof |
1584 >                auth_redir_serv |
1585 >                auth_redir_port |
1586 >                auth_encrypted |
1587 >                error ';' ;
1588  
1589 < auth_passwd: PASSWORD '=' QSTRING ';'
1589 > auth_user: USER '=' QSTRING ';'
1590   {
1591 <  if (ypass == 2)
1592 <  {
1895 <    /* be paranoid */
1896 <    if (yy_aconf->passwd != NULL)
1897 <      memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
1898 <
1899 <    MyFree(yy_aconf->passwd);
1900 <    DupString(yy_aconf->passwd, yylval.string);
1901 <  }
1591 >  if (conf_parser_ctx.pass == 2)
1592 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1593   };
1594  
1595 < auth_spoof_notice: SPOOF_NOTICE '=' TBOOL ';'
1595 > auth_passwd: PASSWORD '=' QSTRING ';'
1596   {
1597 <  if (ypass == 2)
1598 <  {
1908 <    if (yylval.number)
1909 <      yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1910 <    else
1911 <      yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1912 <  }
1597 >  if (conf_parser_ctx.pass == 2)
1598 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1599   };
1600  
1601   auth_class: CLASS '=' QSTRING ';'
1602   {
1603 <  if (ypass == 2)
1604 <  {
1919 <    MyFree(class_name);
1920 <    DupString(class_name, yylval.string);
1921 <  }
1603 >  if (conf_parser_ctx.pass == 2)
1604 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
1605   };
1606  
1607   auth_encrypted: ENCRYPTED '=' TBOOL ';'
1608   {
1609 <  if (ypass == 2)
1609 >  if (conf_parser_ctx.pass == 2)
1610    {
1611      if (yylval.number)
1612 <      SetConfEncrypted(yy_aconf);
1612 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
1613      else
1614 <      ClearConfEncrypted(yy_aconf);
1614 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
1615    }
1616   };
1617  
1618   auth_flags: IRCD_FLAGS
1619   {
1620 < } '='  auth_flags_items ';';
1620 >  if (conf_parser_ctx.pass == 2)
1621 >    block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
1622 > } '=' auth_flags_items ';';
1623  
1624   auth_flags_items: auth_flags_items ',' auth_flags_item | auth_flags_item;
1625 < auth_flags_item: NOT { not_atom = 1; } auth_flags_item_atom
1941 <                | { not_atom = 0; } auth_flags_item_atom;
1942 <
1943 < auth_flags_item_atom: SPOOF_NOTICE
1625 > auth_flags_item: SPOOF_NOTICE
1626   {
1627 <  if (ypass == 2)
1628 <  {
1947 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
1948 <    else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
1949 <  }
1950 <
1627 >  if (conf_parser_ctx.pass == 2)
1628 >    block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
1629   } | EXCEED_LIMIT
1630   {
1631 <  if (ypass == 2)
1632 <  {
1955 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
1956 <    else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
1957 <  }
1631 >  if (conf_parser_ctx.pass == 2)
1632 >    block_state.flags.value |= CONF_FLAGS_NOLIMIT;
1633   } | KLINE_EXEMPT
1634   {
1635 <  if (ypass == 2)
1636 <  {
1637 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
1638 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
1639 <  }
1635 >  if (conf_parser_ctx.pass == 2)
1636 >    block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
1637 > } | XLINE_EXEMPT
1638 > {
1639 >  if (conf_parser_ctx.pass == 2)
1640 >    block_state.flags.value |= CONF_FLAGS_EXEMPTXLINE;
1641   } | NEED_IDENT
1642   {
1643 <  if (ypass == 2)
1644 <  {
1969 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
1970 <    else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
1971 <  }
1643 >  if (conf_parser_ctx.pass == 2)
1644 >    block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
1645   } | CAN_FLOOD
1646   {
1647 <  if (ypass == 2)
1648 <  {
1976 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
1977 <    else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
1978 <  }
1979 < } | CAN_IDLE
1980 < {
1981 <  if (ypass == 2)
1982 <  {
1983 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_IDLE_LINED;
1984 <    else yy_aconf->flags |= CONF_FLAGS_IDLE_LINED;
1985 <  }
1647 >  if (conf_parser_ctx.pass == 2)
1648 >    block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
1649   } | NO_TILDE
1650   {
1651 <  if (ypass == 2)
1652 <  {
1990 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
1991 <    else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1992 <  }
1993 < } | GLINE_EXEMPT
1994 < {
1995 <  if (ypass == 2)
1996 <  {
1997 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
1998 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
1999 <  }
1651 >  if (conf_parser_ctx.pass == 2)
1652 >    block_state.flags.value |= CONF_FLAGS_NO_TILDE;
1653   } | RESV_EXEMPT
1654   {
1655 <  if (ypass == 2)
1656 <  {
1657 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
1658 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
1659 <  }
1655 >  if (conf_parser_ctx.pass == 2)
1656 >    block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
1657 > } | T_WEBIRC
1658 > {
1659 >  if (conf_parser_ctx.pass == 2)
1660 >    block_state.flags.value |= CONF_FLAGS_WEBIRC;
1661   } | NEED_PASSWORD
1662   {
1663 <  if (ypass == 2)
1664 <  {
2011 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2012 <    else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2013 <  }
1663 >  if (conf_parser_ctx.pass == 2)
1664 >    block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
1665   };
1666  
1667 < auth_kline_exempt: KLINE_EXEMPT '=' TBOOL ';'
1667 > auth_spoof: SPOOF '=' QSTRING ';'
1668   {
1669 <  if (ypass == 2)
1670 <  {
2020 <    if (yylval.number)
2021 <      yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
2022 <    else
2023 <      yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
2024 <  }
2025 < };
1669 >  if (conf_parser_ctx.pass != 2)
1670 >    break;
1671  
1672 < auth_need_ident: NEED_IDENT '=' TBOOL ';'
2028 < {
2029 <  if (ypass == 2)
1672 >  if (valid_hostname(yylval.string))
1673    {
1674 <    if (yylval.number)
1675 <      yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
2033 <    else
2034 <      yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
1674 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1675 >    block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
1676    }
1677 +  else
1678 +    ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
1679   };
1680  
1681 < auth_exceed_limit: EXCEED_LIMIT '=' TBOOL ';'
1681 > auth_redir_serv: REDIRSERV '=' QSTRING ';'
1682   {
1683 <  if (ypass == 2)
1684 <  {
2042 <    if (yylval.number)
2043 <      yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
2044 <    else
2045 <      yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
2046 <  }
2047 < };
1683 >  if (conf_parser_ctx.pass != 2)
1684 >    break;
1685  
1686 < auth_can_flood: CAN_FLOOD '=' TBOOL ';'
1687 < {
2051 <  if (ypass == 2)
2052 <  {
2053 <    if (yylval.number)
2054 <      yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
2055 <    else
2056 <      yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
2057 <  }
1686 >  strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1687 >  block_state.flags.value |= CONF_FLAGS_REDIR;
1688   };
1689  
1690 < auth_no_tilde: NO_TILDE '=' TBOOL ';'
1690 > auth_redir_port: REDIRPORT '=' NUMBER ';'
1691   {
1692 <  if (ypass == 2)
1693 <  {
1694 <    if (yylval.number)
1695 <      yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
1696 <    else
2067 <      yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
2068 <  }
1692 >  if (conf_parser_ctx.pass != 2)
1693 >    break;
1694 >
1695 >  block_state.flags.value |= CONF_FLAGS_REDIR;
1696 >  block_state.port.value = $3;
1697   };
1698  
1699 < auth_gline_exempt: GLINE_EXEMPT '=' TBOOL ';'
1699 >
1700 > /***************************************************************************
1701 > * resv {} section
1702 > ***************************************************************************/
1703 > resv_entry: RESV
1704   {
1705 <  if (ypass == 2)
1706 <  {
2075 <    if (yylval.number)
2076 <      yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
2077 <    else
2078 <      yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
2079 <  }
2080 < };
1705 >  if (conf_parser_ctx.pass != 2)
1706 >    break;
1707  
1708 < /* XXX - need check for illegal hostnames here */
1709 < auth_spoof: SPOOF '=' QSTRING ';'
1708 >  reset_block_state();
1709 >  strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
1710 > } '{' resv_items '}' ';'
1711   {
1712 <  if (ypass == 2)
1713 <  {
2087 <    MyFree(yy_conf->name);
1712 >  if (conf_parser_ctx.pass != 2)
1713 >    break;
1714  
1715 <    if (strlen(yylval.string) < HOSTLEN)
2090 <    {    
2091 <      DupString(yy_conf->name, yylval.string);
2092 <      yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
2093 <    }
2094 <    else
2095 <    {
2096 <      ilog(L_ERROR, "Spoofs must be less than %d..ignoring it", HOSTLEN);
2097 <      yy_conf->name = NULL;
2098 <    }
2099 <  }
1715 >  resv_make(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
1716   };
1717  
1718 < auth_redir_serv: REDIRSERV '=' QSTRING ';'
1718 > resv_items:     resv_items resv_item | resv_item;
1719 > resv_item:      resv_mask | resv_reason | resv_exempt | error ';' ;
1720 >
1721 > resv_mask: MASK '=' QSTRING ';'
1722   {
1723 <  if (ypass == 2)
1724 <  {
2106 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
2107 <    MyFree(yy_conf->name);
2108 <    DupString(yy_conf->name, yylval.string);
2109 <  }
1723 >  if (conf_parser_ctx.pass == 2)
1724 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1725   };
1726  
1727 < auth_redir_port: REDIRPORT '=' NUMBER ';'
1727 > resv_reason: REASON '=' QSTRING ';'
1728   {
1729 <  if (ypass == 2)
1730 <  {
2116 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
2117 <    yy_aconf->port = $3;
2118 <  }
1729 >  if (conf_parser_ctx.pass == 2)
1730 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
1731   };
1732  
1733 < auth_need_password: NEED_PASSWORD '=' TBOOL ';'
1733 > resv_exempt: EXEMPT '=' QSTRING ';'
1734   {
1735 <  if (ypass == 2)
1736 <  {
2125 <    if (yylval.number)
2126 <      yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
2127 <    else
2128 <      yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
2129 <  }
1735 >  if (conf_parser_ctx.pass == 2)
1736 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
1737   };
1738  
1739  
1740   /***************************************************************************
1741 < *  section resv
1741 > * service {} section
1742   ***************************************************************************/
1743 < resv_entry: RESV
2137 < {
2138 <  if (ypass == 2)
2139 <  {
2140 <    MyFree(resv_reason);
2141 <    resv_reason = NULL;
2142 <  }
2143 < } '{' resv_items '}' ';'
2144 < {
2145 <  if (ypass == 2)
2146 <  {
2147 <    MyFree(resv_reason);
2148 <    resv_reason = NULL;
2149 <  }
2150 < };
1743 > service_entry: T_SERVICE '{' service_items '}' ';';
1744  
1745 < resv_items:     resv_items resv_item | resv_item;
1746 < resv_item:      resv_creason | resv_channel | resv_nick | error ';' ;
1745 > service_items:     service_items service_item | service_item;
1746 > service_item:      service_name | error;
1747  
1748 < resv_creason: REASON '=' QSTRING ';'
1748 > service_name: NAME '=' QSTRING ';'
1749   {
1750 <  if (ypass == 2)
1751 <  {
2159 <    MyFree(resv_reason);
2160 <    DupString(resv_reason, yylval.string);
2161 <  }
2162 < };
1750 >  if (conf_parser_ctx.pass != 2)
1751 >    break;
1752  
1753 < resv_channel: CHANNEL '=' QSTRING ';'
2165 < {
2166 <  if (ypass == 2)
1753 >  if (server_valid_name(yylval.string) == true)
1754    {
1755 <    if (IsChanPrefix(*yylval.string))
1756 <    {
2170 <      char def_reason[] = "No reason";
2171 <
2172 <      create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
2173 <    }
1755 >    struct ServiceItem *service = service_make();
1756 >    service->name = xstrdup(yylval.string);
1757    }
2175  /* ignore it for now.. but we really should make a warning if
2176   * its an erroneous name --fl_ */
1758   };
1759  
2179 resv_nick: NICK '=' QSTRING ';'
2180 {
2181  if (ypass == 2)
2182  {
2183    char def_reason[] = "No reason";
2184
2185    create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
2186  }
2187 };
1760  
1761   /***************************************************************************
1762 < *  section shared, for sharing remote klines etc.
1762 > * shared {} section, for sharing remote klines etc.
1763   ***************************************************************************/
1764   shared_entry: T_SHARED
1765   {
1766 <  if (ypass == 2)
1767 <  {
1768 <    yy_conf = make_conf_item(ULINE_TYPE);
1769 <    yy_match_item = map_to_conf(yy_conf);
1770 <    yy_match_item->action = SHARED_ALL;
1771 <  }
1766 >  if (conf_parser_ctx.pass != 2)
1767 >    break;
1768 >
1769 >  reset_block_state();
1770 >
1771 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1772 >  strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
1773 >  strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
1774 >  block_state.flags.value = SHARED_ALL;
1775   } '{' shared_items '}' ';'
1776   {
1777 <  if (ypass == 2)
1778 <  {
1779 <    yy_conf = NULL;
1780 <  }
1777 >  if (conf_parser_ctx.pass != 2)
1778 >    break;
1779 >
1780 >  struct SharedItem *shared = shared_make();
1781 >  shared->type = block_state.flags.value;
1782 >  shared->server = xstrdup(block_state.name.buf);
1783 >  shared->user = xstrdup(block_state.user.buf);
1784 >  shared->host = xstrdup(block_state.host.buf);
1785   };
1786  
1787   shared_items: shared_items shared_item | shared_item;
# Line 2210 | Line 1789 | shared_item:  shared_name | shared_user
1789  
1790   shared_name: NAME '=' QSTRING ';'
1791   {
1792 <  if (ypass == 2)
1793 <  {
2215 <    MyFree(yy_conf->name);
2216 <    DupString(yy_conf->name, yylval.string);
2217 <  }
1792 >  if (conf_parser_ctx.pass == 2)
1793 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1794   };
1795  
1796   shared_user: USER '=' QSTRING ';'
1797   {
1798 <  if (ypass == 2)
1798 >  if (conf_parser_ctx.pass == 2)
1799    {
1800      struct split_nuh_item nuh;
1801  
1802      nuh.nuhmask  = yylval.string;
1803      nuh.nickptr  = NULL;
1804 <    nuh.userptr  = userbuf;
1805 <    nuh.hostptr  = hostbuf;
1804 >    nuh.userptr  = block_state.user.buf;
1805 >    nuh.hostptr  = block_state.host.buf;
1806  
1807      nuh.nicksize = 0;
1808 <    nuh.usersize = sizeof(userbuf);
1809 <    nuh.hostsize = sizeof(hostbuf);
1808 >    nuh.usersize = sizeof(block_state.user.buf);
1809 >    nuh.hostsize = sizeof(block_state.host.buf);
1810  
1811      split_nuh(&nuh);
2236
2237    DupString(yy_match_item->user, userbuf);
2238    DupString(yy_match_item->host, hostbuf);
1812    }
1813   };
1814  
1815   shared_type: TYPE
1816   {
1817 <  if (ypass == 2)
1818 <    yy_match_item->action = 0;
1817 >  if (conf_parser_ctx.pass == 2)
1818 >    block_state.flags.value = 0;
1819   } '=' shared_types ';' ;
1820  
1821   shared_types: shared_types ',' shared_type_item | shared_type_item;
1822   shared_type_item: KLINE
1823   {
1824 <  if (ypass == 2)
1825 <    yy_match_item->action |= SHARED_KLINE;
2253 < } | TKLINE
2254 < {
2255 <  if (ypass == 2)
2256 <    yy_match_item->action |= SHARED_TKLINE;
1824 >  if (conf_parser_ctx.pass == 2)
1825 >    block_state.flags.value |= SHARED_KLINE;
1826   } | UNKLINE
1827   {
1828 <  if (ypass == 2)
1829 <    yy_match_item->action |= SHARED_UNKLINE;
1830 < } | XLINE
1828 >  if (conf_parser_ctx.pass == 2)
1829 >    block_state.flags.value |= SHARED_UNKLINE;
1830 > } | T_DLINE
1831 > {
1832 >  if (conf_parser_ctx.pass == 2)
1833 >    block_state.flags.value |= SHARED_DLINE;
1834 > } | T_UNDLINE
1835   {
1836 <  if (ypass == 2)
1837 <    yy_match_item->action |= SHARED_XLINE;
1838 < } | TXLINE
1836 >  if (conf_parser_ctx.pass == 2)
1837 >    block_state.flags.value |= SHARED_UNDLINE;
1838 > } | XLINE
1839   {
1840 <  if (ypass == 2)
1841 <    yy_match_item->action |= SHARED_TXLINE;
1840 >  if (conf_parser_ctx.pass == 2)
1841 >    block_state.flags.value |= SHARED_XLINE;
1842   } | T_UNXLINE
1843   {
1844 <  if (ypass == 2)
1845 <    yy_match_item->action |= SHARED_UNXLINE;
1844 >  if (conf_parser_ctx.pass == 2)
1845 >    block_state.flags.value |= SHARED_UNXLINE;
1846   } | RESV
1847   {
1848 <  if (ypass == 2)
1849 <    yy_match_item->action |= SHARED_RESV;
2277 < } | TRESV
2278 < {
2279 <  if (ypass == 2)
2280 <    yy_match_item->action |= SHARED_TRESV;
1848 >  if (conf_parser_ctx.pass == 2)
1849 >    block_state.flags.value |= SHARED_RESV;
1850   } | T_UNRESV
1851   {
1852 <  if (ypass == 2)
1853 <    yy_match_item->action |= SHARED_UNRESV;
1852 >  if (conf_parser_ctx.pass == 2)
1853 >    block_state.flags.value |= SHARED_UNRESV;
1854   } | T_LOCOPS
1855   {
1856 <  if (ypass == 2)
1857 <    yy_match_item->action |= SHARED_LOCOPS;
1856 >  if (conf_parser_ctx.pass == 2)
1857 >    block_state.flags.value |= SHARED_LOCOPS;
1858   } | T_ALL
1859   {
1860 <  if (ypass == 2)
1861 <    yy_match_item->action = SHARED_ALL;
1860 >  if (conf_parser_ctx.pass == 2)
1861 >    block_state.flags.value = SHARED_ALL;
1862   };
1863  
1864 +
1865   /***************************************************************************
1866 < *  section cluster
1866 > * cluster {} section
1867   ***************************************************************************/
1868   cluster_entry: T_CLUSTER
1869   {
1870 <  if (ypass == 2)
1871 <  {
1872 <    yy_conf = make_conf_item(CLUSTER_TYPE);
1873 <    yy_conf->flags = SHARED_ALL;
1874 <  }
1870 >  if (conf_parser_ctx.pass != 2)
1871 >    break;
1872 >
1873 >  reset_block_state();
1874 >
1875 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
1876 >  block_state.flags.value = CLUSTER_ALL;
1877   } '{' cluster_items '}' ';'
1878   {
1879 <  if (ypass == 2)
1880 <  {
1881 <    if (yy_conf->name == NULL)
1882 <      DupString(yy_conf->name, "*");
1883 <    yy_conf = NULL;
1884 <  }
1879 >  if (conf_parser_ctx.pass != 2)
1880 >    break;
1881 >
1882 >  struct ClusterItem *cluster = cluster_make();
1883 >  cluster->type = block_state.flags.value;
1884 >  cluster->server = xstrdup(block_state.name.buf);
1885   };
1886  
1887 < cluster_items:  cluster_items cluster_item | cluster_item;
1888 < cluster_item:   cluster_name | cluster_type | error ';' ;
1887 > cluster_items:  cluster_items cluster_item | cluster_item;
1888 > cluster_item:   cluster_name | cluster_type | error ';' ;
1889  
1890   cluster_name: NAME '=' QSTRING ';'
1891   {
1892 <  if (ypass == 2)
1893 <    DupString(yy_conf->name, yylval.string);
1892 >  if (conf_parser_ctx.pass == 2)
1893 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
1894   };
1895  
1896   cluster_type: TYPE
1897   {
1898 <  if (ypass == 2)
1899 <    yy_conf->flags = 0;
1898 >  if (conf_parser_ctx.pass == 2)
1899 >    block_state.flags.value = 0;
1900   } '=' cluster_types ';' ;
1901  
1902 < cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1902 > cluster_types:  cluster_types ',' cluster_type_item | cluster_type_item;
1903   cluster_type_item: KLINE
1904   {
1905 <  if (ypass == 2)
1906 <    yy_conf->flags |= SHARED_KLINE;
2335 < } | TKLINE
2336 < {
2337 <  if (ypass == 2)
2338 <    yy_conf->flags |= SHARED_TKLINE;
1905 >  if (conf_parser_ctx.pass == 2)
1906 >    block_state.flags.value |= CLUSTER_KLINE;
1907   } | UNKLINE
1908   {
1909 <  if (ypass == 2)
1910 <    yy_conf->flags |= SHARED_UNKLINE;
1911 < } | XLINE
1909 >  if (conf_parser_ctx.pass == 2)
1910 >    block_state.flags.value |= CLUSTER_UNKLINE;
1911 > } | T_DLINE
1912 > {
1913 >  if (conf_parser_ctx.pass == 2)
1914 >    block_state.flags.value |= CLUSTER_DLINE;
1915 > } | T_UNDLINE
1916   {
1917 <  if (ypass == 2)
1918 <    yy_conf->flags |= SHARED_XLINE;
1919 < } | TXLINE
1917 >  if (conf_parser_ctx.pass == 2)
1918 >    block_state.flags.value |= CLUSTER_UNDLINE;
1919 > } | XLINE
1920   {
1921 <  if (ypass == 2)
1922 <    yy_conf->flags |= SHARED_TXLINE;
1921 >  if (conf_parser_ctx.pass == 2)
1922 >    block_state.flags.value |= CLUSTER_XLINE;
1923   } | T_UNXLINE
1924   {
1925 <  if (ypass == 2)
1926 <    yy_conf->flags |= SHARED_UNXLINE;
1925 >  if (conf_parser_ctx.pass == 2)
1926 >    block_state.flags.value |= CLUSTER_UNXLINE;
1927   } | RESV
1928   {
1929 <  if (ypass == 2)
1930 <    yy_conf->flags |= SHARED_RESV;
2359 < } | TRESV
2360 < {
2361 <  if (ypass == 2)
2362 <    yy_conf->flags |= SHARED_TRESV;
1929 >  if (conf_parser_ctx.pass == 2)
1930 >    block_state.flags.value |= CLUSTER_RESV;
1931   } | T_UNRESV
1932   {
1933 <  if (ypass == 2)
1934 <    yy_conf->flags |= SHARED_UNRESV;
1933 >  if (conf_parser_ctx.pass == 2)
1934 >    block_state.flags.value |= CLUSTER_UNRESV;
1935   } | T_LOCOPS
1936   {
1937 <  if (ypass == 2)
1938 <    yy_conf->flags |= SHARED_LOCOPS;
1937 >  if (conf_parser_ctx.pass == 2)
1938 >    block_state.flags.value |= CLUSTER_LOCOPS;
1939   } | T_ALL
1940   {
1941 <  if (ypass == 2)
1942 <    yy_conf->flags = SHARED_ALL;
1941 >  if (conf_parser_ctx.pass == 2)
1942 >    block_state.flags.value = CLUSTER_ALL;
1943   };
1944  
1945 +
1946   /***************************************************************************
1947 < *  section connect
1947 > * connect {}  section
1948   ***************************************************************************/
1949 < connect_entry: CONNECT  
1949 > connect_entry: CONNECT
1950   {
2382  if (ypass == 2)
2383  {
2384    yy_conf = make_conf_item(SERVER_TYPE);
2385    yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
2386    yy_aconf->passwd = NULL;
2387    /* defaults */
2388    yy_aconf->port = PORTNUM;
1951  
1952 <    if (ConfigFileEntry.burst_away)
1953 <      yy_aconf->flags = CONF_FLAGS_BURST_AWAY;
1954 <  }
1955 <  else
1956 <  {
1957 <    MyFree(class_name);
1958 <    class_name = NULL;
1959 <  }
2398 < } connect_name_b '{' connect_items '}' ';'
1952 >  if (conf_parser_ctx.pass != 2)
1953 >    break;
1954 >
1955 >  reset_block_state();
1956 >  block_state.aftype.value = AF_INET;
1957 >  block_state.port.value = PORTNUM;
1958 >  block_state.timeout.value = CONNECTTIMEOUT;
1959 > } '{' connect_items '}' ';'
1960   {
1961 <  if (ypass == 2)
2401 <  {
2402 <    struct CollectItem *yy_hconf=NULL;
2403 <    struct CollectItem *yy_lconf=NULL;
2404 <    dlink_node *ptr;
2405 <    dlink_node *next_ptr;
2406 < #ifdef HAVE_LIBCRYPTO
2407 <    if (yy_aconf->host &&
2408 <        ((yy_aconf->passwd && yy_aconf->spasswd) ||
2409 <         (yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
2410 < #else /* !HAVE_LIBCRYPTO */
2411 <      if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
2412 <          yy_aconf->passwd && yy_aconf->spasswd)
2413 < #endif /* !HAVE_LIBCRYPTO */
2414 <        {
2415 <          if (conf_add_server(yy_conf, class_name) == -1)
2416 <          {
2417 <            delete_conf_item(yy_conf);
2418 <            yy_conf = NULL;
2419 <            yy_aconf = NULL;
2420 <          }
2421 <        }
2422 <        else
2423 <        {
2424 <          /* Even if yy_conf ->name is NULL
2425 <           * should still unhook any hub/leaf confs still pending
2426 <           */
2427 <          unhook_hub_leaf_confs();
2428 <
2429 <          if (yy_conf->name != NULL)
2430 <          {
2431 < #ifndef HAVE_LIBCRYPTO
2432 <            if (IsConfCryptLink(yy_aconf))
2433 <              yyerror("Ignoring connect block -- no OpenSSL support");
2434 < #else
2435 <            if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
2436 <              yyerror("Ignoring connect block -- missing key");
2437 < #endif
2438 <            if (yy_aconf->host == NULL)
2439 <              yyerror("Ignoring connect block -- missing host");
2440 <            else if (!IsConfCryptLink(yy_aconf) &&
2441 <                    (!yy_aconf->passwd || !yy_aconf->spasswd))
2442 <              yyerror("Ignoring connect block -- missing password");
2443 <          }
2444 <
2445 <
2446 <          /* XXX
2447 <           * This fixes a try_connections() core (caused by invalid class_ptr
2448 <           * pointers) reported by metalrock. That's an ugly fix, but there
2449 <           * is currently no better way. The entire config subsystem needs an
2450 <           * rewrite ASAP. make_conf_item() shouldn't really add things onto
2451 <           * a doubly linked list immediately without any sanity checks!  -Michael
2452 <           */
2453 <          delete_conf_item(yy_conf);
2454 <
2455 <          yy_aconf = NULL;
2456 <          yy_conf = NULL;
2457 <        }
2458 <
2459 <      /*
2460 <       * yy_conf is still pointing at the server that is having
2461 <       * a connect block built for it. This means, y_aconf->name
2462 <       * points to the actual irc name this server will be known as.
2463 <       * Now this new server has a set or even just one hub_mask (or leaf_mask)
2464 <       * given in the link list at yy_hconf. Fill in the HUB confs
2465 <       * from this link list now.
2466 <       */        
2467 <      DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
2468 <      {
2469 <        struct ConfItem *new_hub_conf;
2470 <        struct MatchItem *match_item;
2471 <
2472 <        yy_hconf = ptr->data;
2473 <
2474 <        /* yy_conf == NULL is a fatal error for this connect block! */
2475 <        if ((yy_conf != NULL) && (yy_conf->name != NULL))
2476 <        {
2477 <          new_hub_conf = make_conf_item(HUB_TYPE);
2478 <          match_item = (struct MatchItem *)map_to_conf(new_hub_conf);
2479 <          DupString(new_hub_conf->name, yy_conf->name);
2480 <          if (yy_hconf->user != NULL)
2481 <            DupString(match_item->user, yy_hconf->user);
2482 <          else
2483 <            DupString(match_item->user, "*");
2484 <          if (yy_hconf->host != NULL)
2485 <            DupString(match_item->host, yy_hconf->host);
2486 <          else
2487 <            DupString(match_item->host, "*");
2488 <        }
2489 <        dlinkDelete(&yy_hconf->node, &hub_conf_list);
2490 <        free_collect_item(yy_hconf);
2491 <      }
2492 <
2493 <      /* Ditto for the LEAF confs */
2494 <
2495 <      DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
2496 <      {
2497 <        struct ConfItem *new_leaf_conf;
2498 <        struct MatchItem *match_item;
2499 <
2500 <        yy_lconf = ptr->data;
2501 <
2502 <        if ((yy_conf != NULL) && (yy_conf->name != NULL))
2503 <        {
2504 <          new_leaf_conf = make_conf_item(LEAF_TYPE);
2505 <          match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
2506 <          DupString(new_leaf_conf->name, yy_conf->name);
2507 <          if (yy_lconf->user != NULL)
2508 <            DupString(match_item->user, yy_lconf->user);
2509 <          else
2510 <            DupString(match_item->user, "*");
2511 <          if (yy_lconf->host != NULL)
2512 <            DupString(match_item->host, yy_lconf->host);
2513 <          else
2514 <            DupString(match_item->host, "*");
2515 <        }
2516 <        dlinkDelete(&yy_lconf->node, &leaf_conf_list);
2517 <        free_collect_item(yy_lconf);
2518 <      }
2519 <      MyFree(class_name);
2520 <      class_name = NULL;
2521 <      yy_conf = NULL;
2522 <      yy_aconf = NULL;
2523 <  }
2524 < };
1961 >  struct addrinfo hints, *res;
1962  
1963 < connect_name_b: | connect_name_t;
1964 < connect_items:  connect_items connect_item | connect_item;
2528 < connect_item:   connect_name | connect_host | connect_vhost |
2529 <                connect_send_password | connect_accept_password |
2530 <                connect_aftype | connect_port |
2531 <                connect_fakename | connect_flags | connect_hub_mask |
2532 <                connect_leaf_mask | connect_class | connect_auto |
2533 <                connect_encrypted | connect_compressed | connect_cryptlink |
2534 <                connect_rsa_public_key_file | connect_cipher_preference |
2535 <                connect_topicburst | error ';' ;
1963 >  if (conf_parser_ctx.pass != 2)
1964 >    break;
1965  
1966 < connect_name: NAME '=' QSTRING ';'
1967 < {
1968 <  if (ypass == 2)
2540 <  {
2541 <    if (yy_conf->name != NULL)
2542 <      yyerror("Multiple connect name entry");
1966 >  if (!block_state.name.buf[0] ||
1967 >      !block_state.host.buf[0])
1968 >    break;
1969  
1970 <    MyFree(yy_conf->name);
1971 <    DupString(yy_conf->name, yylval.string);
1972 <  }
2547 < };
1970 >  if (!block_state.rpass.buf[0] ||
1971 >      !block_state.spass.buf[0])
1972 >    break;
1973  
1974 < connect_name_t: QSTRING
1975 < {
2551 <  if (ypass == 2)
2552 <  {
2553 <    if (yy_conf->name != NULL)
2554 <      yyerror("Multiple connect name entry");
1974 >  if (server_valid_name(block_state.name.buf) == false)
1975 >    break;
1976  
1977 <    MyFree(yy_conf->name);
1978 <    DupString(yy_conf->name, yylval.string);
1979 <  }
2559 < };
1977 >  if (has_wildcards(block_state.name.buf) ||
1978 >      has_wildcards(block_state.host.buf))
1979 >    break;
1980  
1981 < connect_host: HOST '=' QSTRING ';'
1982 < {
1983 <  if (ypass == 2)
1984 <  {
1985 <    MyFree(yy_aconf->host);
1986 <    DupString(yy_aconf->host, yylval.string);
1987 <  }
1988 < };
1981 >  struct MaskItem *conf = conf_make(CONF_SERVER);
1982 >  conf->addr = xcalloc(sizeof(*conf->addr));
1983 >  conf->port = block_state.port.value;
1984 >  conf->timeout = block_state.timeout.value;
1985 >  conf->flags = block_state.flags.value;
1986 >  conf->aftype = block_state.aftype.value;
1987 >  conf->host = xstrdup(block_state.host.buf);
1988 >  conf->name = xstrdup(block_state.name.buf);
1989 >  conf->passwd = xstrdup(block_state.rpass.buf);
1990 >  conf->spasswd = xstrdup(block_state.spass.buf);
1991  
1992 < connect_vhost: VHOST '=' QSTRING ';'
1993 < {
1994 <  if (ypass == 2)
1995 <  {
1996 <    struct addrinfo hints, *res;
1992 >  if (block_state.cert.buf[0])
1993 >    conf->certfp = xstrdup(block_state.cert.buf);
1994 >
1995 >  if (block_state.ciph.buf[0])
1996 >    conf->cipher_list = xstrdup(block_state.ciph.buf);
1997  
1998 +  dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
1999 +  dlinkMoveList(&block_state.hub.list, &conf->hub_list);
2000 +
2001 +  if (block_state.bind.buf[0])
2002 +  {
2003      memset(&hints, 0, sizeof(hints));
2004  
2005      hints.ai_family   = AF_UNSPEC;
2006      hints.ai_socktype = SOCK_STREAM;
2007      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
2008  
2009 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
2010 <      ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
2009 >    if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
2010 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server bind(%s)", block_state.bind.buf);
2011      else
2012      {
2013 <      assert(res != NULL);
2013 >      assert(res);
2014  
2015 <      memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
2589 <      yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
2590 <      yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
2591 <      irc_freeaddrinfo(res);
2592 <    }
2593 <  }
2594 < };
2595 <
2596 < connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2597 < {
2598 <  if (ypass == 2)
2599 <  {
2600 <    if ($3[0] == ':')
2601 <      yyerror("Server passwords cannot begin with a colon");
2602 <    else if (strchr($3, ' ') != NULL)
2603 <      yyerror("Server passwords cannot contain spaces");
2604 <    else {
2605 <      if (yy_aconf->spasswd != NULL)
2606 <        memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
2015 >      conf->bind = xcalloc(sizeof(*conf->bind));
2016  
2017 <      MyFree(yy_aconf->spasswd);
2018 <      DupString(yy_aconf->spasswd, yylval.string);
2017 >      memcpy(conf->bind, res->ai_addr, res->ai_addrlen);
2018 >      conf->bind->ss_len = res->ai_addrlen;
2019 >      freeaddrinfo(res);
2020      }
2021    }
2022 +
2023 +  conf_add_class_to_conf(conf, block_state.class.buf);
2024 +  conf_dns_lookup(conf);
2025   };
2026  
2027 < connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2028 < {
2029 <  if (ypass == 2)
2030 <  {
2031 <    if ($3[0] == ':')
2032 <      yyerror("Server passwords cannot begin with a colon");
2033 <    else if (strchr($3, ' ') != NULL)
2034 <      yyerror("Server passwords cannot contain spaces");
2035 <    else {
2036 <      if (yy_aconf->passwd != NULL)
2037 <        memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
2027 > connect_items:  connect_items connect_item | connect_item;
2028 > connect_item:   connect_name |
2029 >                connect_host |
2030 >                connect_timeout |
2031 >                connect_bind |
2032 >                connect_send_password |
2033 >                connect_accept_password |
2034 >                connect_tls_certificate_fingerprint |
2035 >                connect_aftype |
2036 >                connect_port |
2037 >                connect_tls_cipher_list |
2038 >                connect_flags |
2039 >                connect_hub_mask |
2040 >                connect_leaf_mask |
2041 >                connect_class |
2042 >                connect_encrypted |
2043 >                error ';' ;
2044  
2045 <      MyFree(yy_aconf->passwd);
2046 <      DupString(yy_aconf->passwd, yylval.string);
2047 <    }
2048 <  }
2045 > connect_name: NAME '=' QSTRING ';'
2046 > {
2047 >  if (conf_parser_ctx.pass == 2)
2048 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2049   };
2050  
2051 < connect_port: PORT '=' NUMBER ';'
2051 > connect_host: HOST '=' QSTRING ';'
2052   {
2053 <  if (ypass == 2)
2054 <    yy_aconf->port = $3;
2053 >  if (conf_parser_ctx.pass == 2)
2054 >    strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
2055   };
2056  
2057 < connect_aftype: AFTYPE '=' T_IPV4 ';'
2639 < {
2640 <  if (ypass == 2)
2641 <    yy_aconf->aftype = AF_INET;
2642 < } | AFTYPE '=' T_IPV6 ';'
2057 > connect_timeout: TIMEOUT '=' timespec ';'
2058   {
2059 < #ifdef IPV6
2060 <  if (ypass == 2)
2646 <    yy_aconf->aftype = AF_INET6;
2647 < #endif
2059 >  if (conf_parser_ctx.pass == 2)
2060 >    block_state.timeout.value = $3;
2061   };
2062  
2063 < connect_fakename: FAKENAME '=' QSTRING ';'
2063 > connect_bind: T_BIND '=' QSTRING ';'
2064   {
2065 <  if (ypass == 2)
2066 <  {
2654 <    MyFree(yy_aconf->fakename);
2655 <    DupString(yy_aconf->fakename, yylval.string);
2656 <  }
2065 >  if (conf_parser_ctx.pass == 2)
2066 >    strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
2067   };
2068  
2069 < connect_flags: IRCD_FLAGS
2069 > connect_send_password: SEND_PASSWORD '=' QSTRING ';'
2070   {
2071 < } '='  connect_flags_items ';';
2072 <
2663 < connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2664 < connect_flags_item: NOT  { not_atom = 1; } connect_flags_item_atom
2665 <                        |  { not_atom = 0; } connect_flags_item_atom;
2071 >  if (conf_parser_ctx.pass != 2)
2072 >    break;
2073  
2074 < connect_flags_item_atom: COMPRESSED
2075 < {
2076 <  if (ypass == 2)
2077 < #ifndef HAVE_LIBZ
2078 <    yyerror("Ignoring flags = compressed; -- no zlib support");
2079 < #else
2080 < {
2674 <   if (not_atom)ClearConfCompressed(yy_aconf);
2675 <   else SetConfCompressed(yy_aconf);
2676 < }
2677 < #endif
2678 < } | CRYPTLINK
2679 < {
2680 <  if (ypass == 2)
2681 <  {
2682 <    if (not_atom)ClearConfCryptLink(yy_aconf);
2683 <    else SetConfCryptLink(yy_aconf);
2684 <  }
2685 < } | AUTOCONN
2686 < {
2687 <  if (ypass == 2)
2688 <  {
2689 <    if (not_atom)ClearConfAllowAutoConn(yy_aconf);
2690 <    else SetConfAllowAutoConn(yy_aconf);
2691 <  }
2692 < } | BURST_AWAY
2693 < {
2694 <  if (ypass == 2)
2695 <  {
2696 <    if (not_atom)ClearConfAwayBurst(yy_aconf);
2697 <    else SetConfAwayBurst(yy_aconf);
2698 <  }
2699 < } | TOPICBURST
2700 < {
2701 <  if (ypass == 2)
2702 <  {
2703 <    if (not_atom)ClearConfTopicBurst(yy_aconf);
2704 <    else SetConfTopicBurst(yy_aconf);
2705 <  }
2706 < }
2707 < ;
2074 >  if (*yylval.string == ':')
2075 >    conf_error_report("Server passwords cannot begin with a colon");
2076 >  else if (strchr(yylval.string, ' '))
2077 >    conf_error_report("Server passwords cannot contain spaces");
2078 >  else
2079 >    strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
2080 > };
2081  
2082 < connect_rsa_public_key_file: RSA_PUBLIC_KEY_FILE '=' QSTRING ';'
2082 > connect_accept_password: ACCEPT_PASSWORD '=' QSTRING ';'
2083   {
2084 < #ifdef HAVE_LIBCRYPTO
2085 <  if (ypass == 2)
2713 <  {
2714 <    BIO *file;
2084 >  if (conf_parser_ctx.pass != 2)
2085 >    break;
2086  
2087 <    if (yy_aconf->rsa_public_key != NULL)
2088 <    {
2089 <      RSA_free(yy_aconf->rsa_public_key);
2090 <      yy_aconf->rsa_public_key = NULL;
2091 <    }
2092 <
2722 <    if (yy_aconf->rsa_public_key_file != NULL)
2723 <    {
2724 <      MyFree(yy_aconf->rsa_public_key_file);
2725 <      yy_aconf->rsa_public_key_file = NULL;
2726 <    }
2727 <
2728 <    DupString(yy_aconf->rsa_public_key_file, yylval.string);
2729 <
2730 <    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
2731 <    {
2732 <      yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
2733 <      break;
2734 <    }
2735 <
2736 <    yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
2737 <
2738 <    if (yy_aconf->rsa_public_key == NULL)
2739 <    {
2740 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
2741 <      break;
2742 <    }
2743 <      
2744 <    BIO_set_close(file, BIO_CLOSE);
2745 <    BIO_free(file);
2746 <  }
2747 < #endif /* HAVE_LIBCRYPTO */
2087 >  if (*yylval.string == ':')
2088 >    conf_error_report("Server passwords cannot begin with a colon");
2089 >  else if (strchr(yylval.string, ' '))
2090 >    conf_error_report("Server passwords cannot contain spaces");
2091 >  else
2092 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2093   };
2094  
2095 < connect_encrypted: ENCRYPTED '=' TBOOL ';'
2095 > connect_tls_certificate_fingerprint: TLS_CERTIFICATE_FINGERPRINT '=' QSTRING ';'
2096   {
2097 <  if (ypass == 2)
2098 <  {
2754 <    if (yylval.number)
2755 <      yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
2756 <    else
2757 <      yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
2758 <  }
2097 >  if (conf_parser_ctx.pass == 2)
2098 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
2099   };
2100  
2101 < connect_cryptlink: CRYPTLINK '=' TBOOL ';'
2101 > connect_port: PORT '=' NUMBER ';'
2102   {
2103 <  if (ypass == 2)
2104 <  {
2765 <    if (yylval.number)
2766 <      yy_aconf->flags |= CONF_FLAGS_CRYPTLINK;
2767 <    else
2768 <      yy_aconf->flags &= ~CONF_FLAGS_CRYPTLINK;
2769 <  }
2103 >  if (conf_parser_ctx.pass == 2)
2104 >    block_state.port.value = $3;
2105   };
2106  
2107 < connect_compressed: COMPRESSED '=' TBOOL ';'
2107 > connect_aftype: AFTYPE '=' T_IPV4 ';'
2108   {
2109 <  if (ypass == 2)
2110 <  {
2111 <    if (yylval.number)
2112 < #ifndef HAVE_LIBZ
2113 <      yyerror("Ignoring compressed=yes; -- no zlib support");
2114 < #else
2780 <      yy_aconf->flags |= CONF_FLAGS_COMPRESSED;
2781 < #endif
2782 <    else
2783 <      yy_aconf->flags &= ~CONF_FLAGS_COMPRESSED;
2784 <  }
2109 >  if (conf_parser_ctx.pass == 2)
2110 >    block_state.aftype.value = AF_INET;
2111 > } | AFTYPE '=' T_IPV6 ';'
2112 > {
2113 >  if (conf_parser_ctx.pass == 2)
2114 >    block_state.aftype.value = AF_INET6;
2115   };
2116  
2117 < connect_auto: AUTOCONN '=' TBOOL ';'
2117 > connect_flags: IRCD_FLAGS
2118   {
2119 <  if (ypass == 2)
2120 <  {
2121 <    if (yylval.number)
2122 <      yy_aconf->flags |= CONF_FLAGS_ALLOW_AUTO_CONN;
2123 <    else
2124 <      yy_aconf->flags &= ~CONF_FLAGS_ALLOW_AUTO_CONN;
2125 <  }
2119 >  block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
2120 > } '=' connect_flags_items ';';
2121 >
2122 > connect_flags_items: connect_flags_items ',' connect_flags_item | connect_flags_item;
2123 > connect_flags_item: AUTOCONN
2124 > {
2125 >  if (conf_parser_ctx.pass == 2)
2126 >    block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
2127 > } | T_TLS
2128 > {
2129 >  if (conf_parser_ctx.pass == 2)
2130 >    block_state.flags.value |= CONF_FLAGS_TLS;
2131   };
2132  
2133 < connect_topicburst: TOPICBURST '=' TBOOL ';'
2133 > connect_encrypted: ENCRYPTED '=' TBOOL ';'
2134   {
2135 <  if (ypass == 2)
2135 >  if (conf_parser_ctx.pass == 2)
2136    {
2137      if (yylval.number)
2138 <      SetConfTopicBurst(yy_aconf);
2138 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
2139      else
2140 <      ClearConfTopicBurst(yy_aconf);
2140 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
2141    }
2142   };
2143  
2144 < connect_hub_mask: HUB_MASK '=' QSTRING ';'
2144 > connect_hub_mask: HUB_MASK '=' QSTRING ';'
2145   {
2146 <  if (ypass == 2)
2147 <  {
2813 <    struct CollectItem *yy_tmp;
2814 <
2815 <    yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2816 <    DupString(yy_tmp->host, yylval.string);
2817 <    DupString(yy_tmp->user, "*");
2818 <    dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
2819 <  }
2146 >  if (conf_parser_ctx.pass == 2)
2147 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
2148   };
2149  
2150 < connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2150 > connect_leaf_mask: LEAF_MASK '=' QSTRING ';'
2151   {
2152 <  if (ypass == 2)
2153 <  {
2826 <    struct CollectItem *yy_tmp;
2827 <
2828 <    yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
2829 <    DupString(yy_tmp->host, yylval.string);
2830 <    DupString(yy_tmp->user, "*");
2831 <    dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
2832 <  }
2152 >  if (conf_parser_ctx.pass == 2)
2153 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
2154   };
2155  
2156   connect_class: CLASS '=' QSTRING ';'
2157   {
2158 <  if (ypass == 2)
2159 <  {
2839 <    MyFree(class_name);
2840 <    DupString(class_name, yylval.string);
2841 <  }
2158 >  if (conf_parser_ctx.pass == 2)
2159 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
2160   };
2161  
2162 < connect_cipher_preference: CIPHER_PREFERENCE '=' QSTRING ';'
2162 > connect_tls_cipher_list: TLS_CIPHER_LIST '=' QSTRING ';'
2163   {
2164 < #ifdef HAVE_LIBCRYPTO
2165 <  if (ypass == 2)
2166 <  {
2849 <    struct EncCapability *ecap;
2850 <    const char *cipher_name;
2851 <    int found = 0;
2852 <
2853 <    yy_aconf->cipher_preference = NULL;
2854 <    cipher_name = yylval.string;
2855 <
2856 <    for (ecap = CipherTable; ecap->name; ecap++)
2857 <    {
2858 <      if ((irccmp(ecap->name, cipher_name) == 0) &&
2859 <          (ecap->cap & CAP_ENC_MASK))
2860 <      {
2861 <        yy_aconf->cipher_preference = ecap;
2862 <        found = 1;
2863 <        break;
2864 <      }
2865 <    }
2866 <
2867 <    if (!found)
2868 <      yyerror("Invalid cipher");
2869 <  }
2164 > #ifdef HAVE_TLS
2165 >  if (conf_parser_ctx.pass == 2)
2166 >    strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
2167   #else
2168 <  if (ypass == 2)
2169 <    yyerror("Ignoring cipher_preference -- no OpenSSL support");
2168 >  if (conf_parser_ctx.pass == 2)
2169 >    conf_error_report("Ignoring connect::tls_cipher_list -- no TLS support");
2170   #endif
2171   };
2172  
2173 +
2174   /***************************************************************************
2175 < *  section kill
2175 > * kill {} section
2176   ***************************************************************************/
2177   kill_entry: KILL
2178   {
2179 <  if (ypass == 2)
2180 <  {
2883 <    userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
2884 <    regex_ban = 0;
2885 <  }
2179 >  if (conf_parser_ctx.pass == 2)
2180 >    reset_block_state();
2181   } '{' kill_items '}' ';'
2182   {
2183 <  if (ypass == 2)
2184 <  {
2890 <    if (userbuf[0] && hostbuf[0])
2891 <    {
2892 <      if (regex_ban)
2893 <      {
2894 <        pcre *exp_user = NULL;
2895 <        pcre *exp_host = NULL;
2896 <        const char *errptr = NULL;
2897 <
2898 <        if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
2899 <            !(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
2900 <        {
2901 <          ilog(L_ERROR, "Failed to add regular expression based K-Line: %s",
2902 <               errptr);
2903 <          break;
2904 <        }
2905 <
2906 <        yy_conf = make_conf_item(RKLINE_TYPE);
2907 <        yy_aconf = map_to_conf(yy_conf);
2908 <
2909 <        yy_aconf->regexuser = exp_user;
2910 <        yy_aconf->regexhost = exp_host;
2911 <
2912 <        DupString(yy_aconf->user, userbuf);
2913 <        DupString(yy_aconf->host, hostbuf);
2914 <
2915 <        if (reasonbuf[0])
2916 <          DupString(yy_aconf->reason, reasonbuf);
2917 <        else
2918 <          DupString(yy_aconf->reason, "No reason");
2919 <      }
2920 <      else
2921 <      {
2922 <        yy_conf = make_conf_item(KLINE_TYPE);
2923 <        yy_aconf = map_to_conf(yy_conf);
2924 <
2925 <        DupString(yy_aconf->user, userbuf);
2926 <        DupString(yy_aconf->host, hostbuf);
2927 <
2928 <        if (reasonbuf[0])
2929 <          DupString(yy_aconf->reason, reasonbuf);
2930 <        else
2931 <          DupString(yy_aconf->reason, "No reason");
2932 <        add_conf_by_address(CONF_KILL, yy_aconf);
2933 <      }
2934 <    }
2935 <    else
2936 <      delete_conf_item(yy_conf);
2937 <
2938 <    yy_conf = NULL;
2939 <    yy_aconf = NULL;
2940 <  }
2941 < };
2183 >  if (conf_parser_ctx.pass != 2)
2184 >    break;
2185  
2186 < kill_type: TYPE
2187 < {
2188 < } '='  kill_type_items ';';
2186 >  if (!block_state.user.buf[0] ||
2187 >      !block_state.host.buf[0])
2188 >    break;
2189 >
2190 >  struct MaskItem *conf = conf_make(CONF_KLINE);
2191 >  conf->user = xstrdup(block_state.user.buf);
2192 >  conf->host = xstrdup(block_state.host.buf);
2193  
2194 < kill_type_items: kill_type_items ',' kill_type_item | kill_type_item;
2195 < kill_type_item: REGEX_T
2196 < {
2197 <  if (ypass == 2)
2198 <    regex_ban = 1;
2194 >  if (block_state.rpass.buf[0])
2195 >    conf->reason = xstrdup(block_state.rpass.buf);
2196 >  else
2197 >    conf->reason = xstrdup(CONF_NOREASON);
2198 >  add_conf_by_address(CONF_KLINE, conf);
2199   };
2200  
2201   kill_items:     kill_items kill_item | kill_item;
2202 < kill_item:      kill_user | kill_reason | kill_type | error;
2202 > kill_item:      kill_user | kill_reason | error;
2203  
2204   kill_user: USER '=' QSTRING ';'
2205   {
2206 <  if (ypass == 2)
2206 >
2207 >  if (conf_parser_ctx.pass == 2)
2208    {
2209      struct split_nuh_item nuh;
2210  
2211      nuh.nuhmask  = yylval.string;
2212      nuh.nickptr  = NULL;
2213 <    nuh.userptr  = userbuf;
2214 <    nuh.hostptr  = hostbuf;
2213 >    nuh.userptr  = block_state.user.buf;
2214 >    nuh.hostptr  = block_state.host.buf;
2215  
2216      nuh.nicksize = 0;
2217 <    nuh.usersize = sizeof(userbuf);
2218 <    nuh.hostsize = sizeof(hostbuf);
2217 >    nuh.usersize = sizeof(block_state.user.buf);
2218 >    nuh.hostsize = sizeof(block_state.host.buf);
2219  
2220      split_nuh(&nuh);
2221    }
2222   };
2223  
2224 < kill_reason: REASON '=' QSTRING ';'
2224 > kill_reason: REASON '=' QSTRING ';'
2225   {
2226 <  if (ypass == 2)
2227 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2226 >  if (conf_parser_ctx.pass == 2)
2227 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2228   };
2229  
2230 +
2231   /***************************************************************************
2232 < *  section deny
2232 > * deny {} section
2233   ***************************************************************************/
2234 < deny_entry: DENY
2234 > deny_entry: DENY
2235   {
2236 <  if (ypass == 2)
2237 <  {
2989 <    yy_conf = make_conf_item(DLINE_TYPE);
2990 <    yy_aconf = map_to_conf(yy_conf);
2991 <    /* default reason */
2992 <    DupString(yy_aconf->reason, "No reason");
2993 <  }
2236 >  if (conf_parser_ctx.pass == 2)
2237 >    reset_block_state();
2238   } '{' deny_items '}' ';'
2239   {
2240 <  if (ypass == 2)
2240 >  if (conf_parser_ctx.pass != 2)
2241 >    break;
2242 >
2243 >  if (!block_state.addr.buf[0])
2244 >    break;
2245 >
2246 >  if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
2247    {
2248 <    if (yy_aconf->host && parse_netmask(yy_aconf->host, NULL, NULL) != HM_HOST)
2249 <      add_conf_by_address(CONF_DLINE, yy_aconf);
2248 >    struct MaskItem *conf = conf_make(CONF_DLINE);
2249 >    conf->host = xstrdup(block_state.addr.buf);
2250 >
2251 >    if (block_state.rpass.buf[0])
2252 >      conf->reason = xstrdup(block_state.rpass.buf);
2253      else
2254 <      delete_conf_item(yy_conf);
2255 <    yy_conf = NULL;
3003 <    yy_aconf = NULL;
2254 >      conf->reason = xstrdup(CONF_NOREASON);
2255 >    add_conf_by_address(CONF_DLINE, conf);
2256    }
2257 < };
2257 > };
2258  
2259   deny_items:     deny_items deny_item | deny_item;
2260   deny_item:      deny_ip | deny_reason | error;
2261  
2262   deny_ip: IP '=' QSTRING ';'
2263   {
2264 <  if (ypass == 2)
2265 <  {
3014 <    MyFree(yy_aconf->host);
3015 <    DupString(yy_aconf->host, yylval.string);
3016 <  }
2264 >  if (conf_parser_ctx.pass == 2)
2265 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
2266   };
2267  
2268 < deny_reason: REASON '=' QSTRING ';'
2268 > deny_reason: REASON '=' QSTRING ';'
2269   {
2270 <  if (ypass == 2)
2271 <  {
3023 <    MyFree(yy_aconf->reason);
3024 <    DupString(yy_aconf->reason, yylval.string);
3025 <  }
2270 >  if (conf_parser_ctx.pass == 2)
2271 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2272   };
2273  
2274 +
2275   /***************************************************************************
2276 < *  section exempt
2276 > * exempt {} section
2277   ***************************************************************************/
2278   exempt_entry: EXEMPT '{' exempt_items '}' ';';
2279  
2280 < exempt_items:     exempt_items exempt_item | exempt_item;
2281 < exempt_item:      exempt_ip | error;
2280 > exempt_items: exempt_items exempt_item | exempt_item;
2281 > exempt_item:  exempt_ip | error;
2282  
2283   exempt_ip: IP '=' QSTRING ';'
2284   {
2285 <  if (ypass == 2)
2285 >  if (conf_parser_ctx.pass == 2)
2286    {
2287 <    if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2287 >    if (*yylval.string && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
2288      {
2289 <      yy_conf = make_conf_item(EXEMPTDLINE_TYPE);
2290 <      yy_aconf = map_to_conf(yy_conf);
3044 <      DupString(yy_aconf->host, yylval.string);
2289 >      struct MaskItem *conf = conf_make(CONF_EXEMPT);
2290 >      conf->host = xstrdup(yylval.string);
2291  
2292 <      add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
3047 <
3048 <      yy_conf = NULL;
3049 <      yy_aconf = NULL;
2292 >      add_conf_by_address(CONF_EXEMPT, conf);
2293      }
2294    }
2295   };
2296  
2297   /***************************************************************************
2298 < *  section gecos
2298 > * gecos {} section
2299   ***************************************************************************/
2300   gecos_entry: GECOS
2301   {
2302 <  if (ypass == 2)
2303 <  {
3061 <    regex_ban = 0;
3062 <    reasonbuf[0] = gecos_name[0] = '\0';
3063 <  }
2302 >  if (conf_parser_ctx.pass == 2)
2303 >    reset_block_state();
2304   } '{' gecos_items '}' ';'
2305   {
2306 <  if (ypass == 2)
2307 <  {
3068 <    if (gecos_name[0])
3069 <    {
3070 <      if (regex_ban)
3071 <      {
3072 <        pcre *exp_p = NULL;
3073 <        const char *errptr = NULL;
3074 <
3075 <        if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
3076 <        {
3077 <          ilog(L_ERROR, "Failed to add regular expression based X-Line: %s",
3078 <               errptr);
3079 <          break;
3080 <        }
3081 <
3082 <        yy_conf = make_conf_item(RXLINE_TYPE);
3083 <        yy_conf->regexpname = exp_p;
3084 <      }
3085 <      else
3086 <        yy_conf = make_conf_item(XLINE_TYPE);
3087 <
3088 <      yy_match_item = map_to_conf(yy_conf);
3089 <      DupString(yy_conf->name, gecos_name);
3090 <
3091 <      if (reasonbuf[0])
3092 <        DupString(yy_match_item->reason, reasonbuf);
3093 <      else
3094 <        DupString(yy_match_item->reason, "No reason");
3095 <    }
3096 <  }
3097 < };
2306 >  if (conf_parser_ctx.pass != 2)
2307 >    break;
2308  
2309 < gecos_flags: TYPE
2310 < {
3101 < } '='  gecos_flags_items ';';
2309 >  if (!block_state.name.buf[0])
2310 >    break;
2311  
2312 < gecos_flags_items: gecos_flags_items ',' gecos_flags_item | gecos_flags_item;
2313 < gecos_flags_item: REGEX_T
2314 < {
2315 <  if (ypass == 2)
2316 <    regex_ban = 1;
2312 >  struct GecosItem *gecos = gecos_make();
2313 >  gecos->mask = xstrdup(block_state.name.buf);
2314 >
2315 >  if (block_state.rpass.buf[0])
2316 >    gecos->reason = xstrdup(block_state.rpass.buf);
2317 >  else
2318 >    gecos->reason = xstrdup(CONF_NOREASON);
2319   };
2320  
2321   gecos_items: gecos_items gecos_item | gecos_item;
2322 < gecos_item:  gecos_name | gecos_reason | gecos_flags | error;
2322 > gecos_item:  gecos_name | gecos_reason | error;
2323  
2324 < gecos_name: NAME '=' QSTRING ';'
2324 > gecos_name: NAME '=' QSTRING ';'
2325   {
2326 <  if (ypass == 2)
2327 <    strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
2326 >  if (conf_parser_ctx.pass == 2)
2327 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
2328   };
2329  
2330 < gecos_reason: REASON '=' QSTRING ';'
2330 > gecos_reason: REASON '=' QSTRING ';'
2331   {
2332 <  if (ypass == 2)
2333 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
2332 >  if (conf_parser_ctx.pass == 2)
2333 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
2334   };
2335  
2336 +
2337   /***************************************************************************
2338 < *  section general
2338 > * general {} section
2339   ***************************************************************************/
2340 < general_entry: GENERAL
3129 <  '{' general_items '}' ';';
2340 > general_entry: GENERAL '{' general_items '}' ';';
2341  
2342   general_items:      general_items general_item | general_item;
2343 < general_item:       general_hide_spoof_ips | general_ignore_bogus_ts |
2344 <                    general_failed_oper_notice | general_anti_nick_flood |
2345 <                    general_max_nick_time | general_max_nick_changes |
2346 <                    general_max_accept | general_anti_spam_exit_message_time |
2347 <                    general_ts_warn_delta | general_ts_max_delta |
2348 <                    general_kill_chase_time_limit | general_kline_with_reason |
2349 <                    general_kline_reason | general_invisible_on_connect |
2350 <                    general_warn_no_nline | general_dots_in_ident |
2351 <                    general_stats_o_oper_only | general_stats_k_oper_only |
2352 <                    general_pace_wait | general_stats_i_oper_only |
2353 <                    general_pace_wait_simple | general_stats_P_oper_only |
2354 <                    general_short_motd | general_no_oper_flood |
2355 <                    general_true_no_oper_flood | general_oper_pass_resv |
2356 <                    general_idletime | general_message_locale |
2357 <                    general_oper_only_umodes | general_max_targets |
2358 <                    general_use_egd | general_egdpool_path |
2359 <                    general_oper_umodes | general_caller_id_wait |
2360 <                    general_opers_bypass_callerid | general_default_floodcount |
2361 <                    general_min_nonwildcard | general_min_nonwildcard_simple |
2362 <                    general_servlink_path | general_disable_remote_commands |
2363 <                    general_default_cipher_preference |
2364 <                    general_compression_level | general_client_flood |
2365 <                    general_throttle_time | general_havent_read_conf |
2366 <                    general_dot_in_ip6_addr | general_ping_cookie |
2367 <                    general_disable_auth | general_burst_away |
2368 <                    general_tkline_expire_notices | general_gline_min_cidr |
2369 <                    general_gline_min_cidr6 | general_use_whois_actually |
2370 <                    general_reject_hold_time | general_stats_e_disabled |
2371 <                    general_max_watch |
2372 <                    error;
2343 > general_item:       general_away_count |
2344 >                    general_away_time |
2345 >                    general_failed_oper_notice |
2346 >                    general_anti_nick_flood |
2347 >                    general_max_nick_time |
2348 >                    general_max_nick_changes |
2349 >                    general_max_accept |
2350 >                    general_whowas_history_length |
2351 >                    general_anti_spam_exit_message_time |
2352 >                    general_ts_warn_delta |
2353 >                    general_ts_max_delta |
2354 >                    general_kill_chase_time_limit |
2355 >                    general_invisible_on_connect |
2356 >                    general_warn_no_connect_block |
2357 >                    general_dots_in_ident |
2358 >                    general_stats_i_oper_only |
2359 >                    general_stats_k_oper_only |
2360 >                    general_stats_m_oper_only |
2361 >                    general_stats_o_oper_only |
2362 >                    general_stats_P_oper_only |
2363 >                    general_stats_u_oper_only |
2364 >                    general_pace_wait |
2365 >                    general_pace_wait_simple |
2366 >                    general_short_motd |
2367 >                    general_no_oper_flood |
2368 >                    general_oper_only_umodes |
2369 >                    general_max_targets |
2370 >                    general_oper_umodes |
2371 >                    general_caller_id_wait |
2372 >                    general_opers_bypass_callerid |
2373 >                    general_default_floodcount |
2374 >                    general_default_floodtime |
2375 >                    general_min_nonwildcard |
2376 >                    general_min_nonwildcard_simple |
2377 >                    general_throttle_count |
2378 >                    general_throttle_time |
2379 >                    general_ping_cookie |
2380 >                    general_disable_auth |
2381 >                    general_dline_min_cidr |
2382 >                    general_dline_min_cidr6 |
2383 >                    general_kline_min_cidr |
2384 >                    general_kline_min_cidr6 |
2385 >                    general_stats_e_disabled |
2386 >                    general_max_watch |
2387 >                    general_cycle_on_host_change |
2388 >                    error;
2389  
2390  
2391 < general_max_watch: MAX_WATCH '=' NUMBER ';'
2391 > general_away_count: AWAY_COUNT '=' NUMBER ';'
2392   {
2393 <  ConfigFileEntry.max_watch = $3;
2393 >  ConfigGeneral.away_count = $3;
2394   };
2395  
2396 < general_gline_min_cidr: GLINE_MIN_CIDR '=' NUMBER ';'
2396 > general_away_time: AWAY_TIME '=' timespec ';'
2397   {
2398 <  ConfigFileEntry.gline_min_cidr = $3;
2398 >  ConfigGeneral.away_time = $3;
2399   };
2400  
2401 < general_gline_min_cidr6: GLINE_MIN_CIDR6 '=' NUMBER ';'
3175 < {
3176 <  ConfigFileEntry.gline_min_cidr6 = $3;
3177 < };
3178 <
3179 < general_burst_away: BURST_AWAY '=' TBOOL ';'
2401 > general_max_watch: MAX_WATCH '=' NUMBER ';'
2402   {
2403 <  ConfigFileEntry.burst_away = yylval.number;
2403 >  ConfigGeneral.max_watch = $3;
2404   };
2405  
2406 < general_use_whois_actually: USE_WHOIS_ACTUALLY '=' TBOOL ';'
2406 > general_whowas_history_length: WHOWAS_HISTORY_LENGTH '=' NUMBER ';'
2407   {
2408 <  ConfigFileEntry.use_whois_actually = yylval.number;
2408 >  ConfigGeneral.whowas_history_length = $3;
2409   };
2410  
2411 < general_reject_hold_time: TREJECT_HOLD_TIME '=' timespec ';'
2411 > general_cycle_on_host_change: CYCLE_ON_HOST_CHANGE '=' TBOOL ';'
2412   {
2413 <  GlobalSetOptions.rejecttime = yylval.number;
2413 >  ConfigGeneral.cycle_on_host_change = yylval.number;
2414   };
2415  
2416 < general_tkline_expire_notices: TKLINE_EXPIRE_NOTICES '=' TBOOL ';'
2416 > general_dline_min_cidr: DLINE_MIN_CIDR '=' NUMBER ';'
2417   {
2418 <  ConfigFileEntry.tkline_expire_notices = yylval.number;
2418 >  ConfigGeneral.dline_min_cidr = $3;
2419   };
2420  
2421 < general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' NUMBER ';'
2421 > general_dline_min_cidr6: DLINE_MIN_CIDR6 '=' NUMBER ';'
2422   {
2423 <  ConfigFileEntry.kill_chase_time_limit = $3;
2423 >  ConfigGeneral.dline_min_cidr6 = $3;
2424   };
2425  
2426 < general_hide_spoof_ips: HIDE_SPOOF_IPS '=' TBOOL ';'
2426 > general_kline_min_cidr: KLINE_MIN_CIDR '=' NUMBER ';'
2427   {
2428 <  ConfigFileEntry.hide_spoof_ips = yylval.number;
2428 >  ConfigGeneral.kline_min_cidr = $3;
2429   };
2430  
2431 < general_ignore_bogus_ts: IGNORE_BOGUS_TS '=' TBOOL ';'
2431 > general_kline_min_cidr6: KLINE_MIN_CIDR6 '=' NUMBER ';'
2432   {
2433 <  ConfigFileEntry.ignore_bogus_ts = yylval.number;
2433 >  ConfigGeneral.kline_min_cidr6 = $3;
2434   };
2435  
2436 < general_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2436 > general_kill_chase_time_limit: KILL_CHASE_TIME_LIMIT '=' timespec ';'
2437   {
2438 <  ConfigFileEntry.disable_remote = yylval.number;
2438 >  ConfigGeneral.kill_chase_time_limit = $3;
2439   };
2440  
2441   general_failed_oper_notice: FAILED_OPER_NOTICE '=' TBOOL ';'
2442   {
2443 <  ConfigFileEntry.failed_oper_notice = yylval.number;
2443 >  ConfigGeneral.failed_oper_notice = yylval.number;
2444   };
2445  
2446   general_anti_nick_flood: ANTI_NICK_FLOOD '=' TBOOL ';'
2447   {
2448 <  ConfigFileEntry.anti_nick_flood = yylval.number;
2448 >  ConfigGeneral.anti_nick_flood = yylval.number;
2449   };
2450  
2451   general_max_nick_time: MAX_NICK_TIME '=' timespec ';'
2452   {
2453 <  ConfigFileEntry.max_nick_time = $3;
2453 >  ConfigGeneral.max_nick_time = $3;
2454   };
2455  
2456   general_max_nick_changes: MAX_NICK_CHANGES '=' NUMBER ';'
2457   {
2458 <  ConfigFileEntry.max_nick_changes = $3;
2458 >  ConfigGeneral.max_nick_changes = $3;
2459   };
2460  
2461   general_max_accept: MAX_ACCEPT '=' NUMBER ';'
2462   {
2463 <  ConfigFileEntry.max_accept = $3;
2463 >  ConfigGeneral.max_accept = $3;
2464   };
2465  
2466   general_anti_spam_exit_message_time: ANTI_SPAM_EXIT_MESSAGE_TIME '=' timespec ';'
2467   {
2468 <  ConfigFileEntry.anti_spam_exit_message_time = $3;
2468 >  ConfigGeneral.anti_spam_exit_message_time = $3;
2469   };
2470  
2471   general_ts_warn_delta: TS_WARN_DELTA '=' timespec ';'
2472   {
2473 <  ConfigFileEntry.ts_warn_delta = $3;
2473 >  ConfigGeneral.ts_warn_delta = $3;
2474   };
2475  
2476   general_ts_max_delta: TS_MAX_DELTA '=' timespec ';'
2477   {
2478 <  if (ypass == 2)
3257 <    ConfigFileEntry.ts_max_delta = $3;
2478 >  ConfigGeneral.ts_max_delta = $3;
2479   };
2480  
2481 < general_havent_read_conf: HAVENT_READ_CONF '=' NUMBER ';'
3261 < {
3262 <  if (($3 > 0) && ypass == 1)
3263 <  {
3264 <    ilog(L_CRIT, "You haven't read your config file properly.");
3265 <    ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
3266 <    ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
3267 <    exit(0);
3268 <  }
3269 < };
3270 <
3271 < general_kline_with_reason: KLINE_WITH_REASON '=' TBOOL ';'
2481 > general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2482   {
2483 <  ConfigFileEntry.kline_with_reason = yylval.number;
2483 >  ConfigGeneral.invisible_on_connect = yylval.number;
2484   };
2485  
2486 < general_kline_reason: KLINE_REASON '=' QSTRING ';'
2486 > general_warn_no_connect_block: WARN_NO_CONNECT_BLOCK '=' TBOOL ';'
2487   {
2488 <  if (ypass == 2)
3279 <  {
3280 <    MyFree(ConfigFileEntry.kline_reason);
3281 <    DupString(ConfigFileEntry.kline_reason, yylval.string);
3282 <  }
2488 >  ConfigGeneral.warn_no_connect_block = yylval.number;
2489   };
2490  
2491 < general_invisible_on_connect: INVISIBLE_ON_CONNECT '=' TBOOL ';'
2491 > general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2492   {
2493 <  ConfigFileEntry.invisible_on_connect = yylval.number;
2493 >  ConfigGeneral.stats_e_disabled = yylval.number;
2494   };
2495  
2496 < general_warn_no_nline: WARN_NO_NLINE '=' TBOOL ';'
2496 > general_stats_m_oper_only: STATS_M_OPER_ONLY '=' TBOOL ';'
2497   {
2498 <  ConfigFileEntry.warn_no_nline = yylval.number;
2498 >  ConfigGeneral.stats_m_oper_only = yylval.number;
2499   };
2500  
2501 < general_stats_e_disabled: STATS_E_DISABLED '=' TBOOL ';'
2501 > general_stats_o_oper_only: STATS_O_OPER_ONLY '=' TBOOL ';'
2502   {
2503 <  ConfigFileEntry.stats_e_disabled = yylval.number;
2503 >  ConfigGeneral.stats_o_oper_only = yylval.number;
2504   };
2505  
2506 < general_stats_o_oper_only: STATS_O_OPER_ONLY '=' TBOOL ';'
2506 > general_stats_P_oper_only: STATS_P_OPER_ONLY '=' TBOOL ';'
2507   {
2508 <  ConfigFileEntry.stats_o_oper_only = yylval.number;
2508 >  ConfigGeneral.stats_P_oper_only = yylval.number;
2509   };
2510  
2511 < general_stats_P_oper_only: STATS_P_OPER_ONLY '=' TBOOL ';'
2511 > general_stats_u_oper_only: STATS_U_OPER_ONLY '=' TBOOL ';'
2512   {
2513 <  ConfigFileEntry.stats_P_oper_only = yylval.number;
2513 >  ConfigGeneral.stats_u_oper_only = yylval.number;
2514   };
2515  
2516   general_stats_k_oper_only: STATS_K_OPER_ONLY '=' TBOOL ';'
2517   {
2518 <  ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
2518 >  ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
2519   } | STATS_K_OPER_ONLY '=' TMASKED ';'
2520   {
2521 <  ConfigFileEntry.stats_k_oper_only = 1;
2521 >  ConfigGeneral.stats_k_oper_only = 1;
2522   };
2523  
2524   general_stats_i_oper_only: STATS_I_OPER_ONLY '=' TBOOL ';'
2525   {
2526 <  ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
2526 >  ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
2527   } | STATS_I_OPER_ONLY '=' TMASKED ';'
2528   {
2529 <  ConfigFileEntry.stats_i_oper_only = 1;
2529 >  ConfigGeneral.stats_i_oper_only = 1;
2530   };
2531  
2532   general_pace_wait: PACE_WAIT '=' timespec ';'
2533   {
2534 <  ConfigFileEntry.pace_wait = $3;
2534 >  ConfigGeneral.pace_wait = $3;
2535   };
2536  
2537   general_caller_id_wait: CALLER_ID_WAIT '=' timespec ';'
2538   {
2539 <  ConfigFileEntry.caller_id_wait = $3;
2539 >  ConfigGeneral.caller_id_wait = $3;
2540   };
2541  
2542   general_opers_bypass_callerid: OPERS_BYPASS_CALLERID '=' TBOOL ';'
2543   {
2544 <  ConfigFileEntry.opers_bypass_callerid = yylval.number;
2544 >  ConfigGeneral.opers_bypass_callerid = yylval.number;
2545   };
2546  
2547   general_pace_wait_simple: PACE_WAIT_SIMPLE '=' timespec ';'
2548   {
2549 <  ConfigFileEntry.pace_wait_simple = $3;
2549 >  ConfigGeneral.pace_wait_simple = $3;
2550   };
2551  
2552   general_short_motd: SHORT_MOTD '=' TBOOL ';'
2553   {
2554 <  ConfigFileEntry.short_motd = yylval.number;
3349 < };
3350 <  
3351 < general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
3352 < {
3353 <  ConfigFileEntry.no_oper_flood = yylval.number;
2554 >  ConfigGeneral.short_motd = yylval.number;
2555   };
2556  
2557 < general_true_no_oper_flood: TRUE_NO_OPER_FLOOD '=' TBOOL ';'
3357 < {
3358 <  ConfigFileEntry.true_no_oper_flood = yylval.number;
3359 < };
3360 <
3361 < general_oper_pass_resv: OPER_PASS_RESV '=' TBOOL ';'
3362 < {
3363 <  ConfigFileEntry.oper_pass_resv = yylval.number;
3364 < };
3365 <
3366 < general_message_locale: MESSAGE_LOCALE '=' QSTRING ';'
3367 < {
3368 <  if (ypass == 2)
3369 <  {
3370 <    if (strlen(yylval.string) > LOCALE_LENGTH-2)
3371 <      yylval.string[LOCALE_LENGTH-1] = '\0';
3372 <
3373 <    set_locale(yylval.string);
3374 <  }
3375 < };
3376 <
3377 < general_idletime: IDLETIME '=' timespec ';'
2557 > general_no_oper_flood: NO_OPER_FLOOD '=' TBOOL ';'
2558   {
2559 <  ConfigFileEntry.idletime = $3;
2559 >  ConfigGeneral.no_oper_flood = yylval.number;
2560   };
2561  
2562   general_dots_in_ident: DOTS_IN_IDENT '=' NUMBER ';'
2563   {
2564 <  ConfigFileEntry.dots_in_ident = $3;
2564 >  ConfigGeneral.dots_in_ident = $3;
2565   };
2566  
2567   general_max_targets: MAX_TARGETS '=' NUMBER ';'
2568   {
2569 <  ConfigFileEntry.max_targets = $3;
3390 < };
3391 <
3392 < general_servlink_path: SERVLINK_PATH '=' QSTRING ';'
3393 < {
3394 <  if (ypass == 2)
3395 <  {
3396 <    MyFree(ConfigFileEntry.servlink_path);
3397 <    DupString(ConfigFileEntry.servlink_path, yylval.string);
3398 <  }
3399 < };
3400 <
3401 < general_default_cipher_preference: DEFAULT_CIPHER_PREFERENCE '=' QSTRING ';'
3402 < {
3403 < #ifdef HAVE_LIBCRYPTO
3404 <  if (ypass == 2)
3405 <  {
3406 <    struct EncCapability *ecap;
3407 <    const char *cipher_name;
3408 <    int found = 0;
3409 <
3410 <    ConfigFileEntry.default_cipher_preference = NULL;
3411 <    cipher_name = yylval.string;
3412 <
3413 <    for (ecap = CipherTable; ecap->name; ecap++)
3414 <    {
3415 <      if ((irccmp(ecap->name, cipher_name) == 0) &&
3416 <          (ecap->cap & CAP_ENC_MASK))
3417 <      {
3418 <        ConfigFileEntry.default_cipher_preference = ecap;
3419 <        found = 1;
3420 <        break;
3421 <      }
3422 <    }
3423 <
3424 <    if (!found)
3425 <      yyerror("Invalid cipher");
3426 <  }
3427 < #else
3428 <  if (ypass == 2)
3429 <    yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
3430 < #endif
3431 < };
3432 <
3433 < general_compression_level: COMPRESSION_LEVEL '=' NUMBER ';'
3434 < {
3435 <  if (ypass == 2)
3436 <  {
3437 <    ConfigFileEntry.compression_level = $3;
3438 < #ifndef HAVE_LIBZ
3439 <    yyerror("Ignoring compression_level -- no zlib support");
3440 < #else
3441 <    if ((ConfigFileEntry.compression_level < 1) ||
3442 <        (ConfigFileEntry.compression_level > 9))
3443 <    {
3444 <      yyerror("Ignoring invalid compression_level, using default");
3445 <      ConfigFileEntry.compression_level = 0;
3446 <    }
3447 < #endif
3448 <  }
3449 < };
3450 <
3451 < general_use_egd: USE_EGD '=' TBOOL ';'
3452 < {
3453 <  ConfigFileEntry.use_egd = yylval.number;
2569 >  ConfigGeneral.max_targets = $3;
2570   };
2571  
2572 < general_egdpool_path: EGDPOOL_PATH '=' QSTRING ';'
2572 > general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2573   {
2574 <  if (ypass == 2)
3459 <  {
3460 <    MyFree(ConfigFileEntry.egdpool_path);
3461 <    DupString(ConfigFileEntry.egdpool_path, yylval.string);
3462 <  }
2574 >  ConfigGeneral.ping_cookie = yylval.number;
2575   };
2576  
2577 < general_ping_cookie: PING_COOKIE '=' TBOOL ';'
2577 > general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2578   {
2579 <  ConfigFileEntry.ping_cookie = yylval.number;
2579 >  ConfigGeneral.disable_auth = yylval.number;
2580   };
2581  
2582 < general_disable_auth: DISABLE_AUTH '=' TBOOL ';'
2582 > general_throttle_count: THROTTLE_COUNT '=' NUMBER ';'
2583   {
2584 <  ConfigFileEntry.disable_auth = yylval.number;
2584 >  ConfigGeneral.throttle_count = $3;
2585   };
2586  
2587   general_throttle_time: THROTTLE_TIME '=' timespec ';'
2588   {
2589 <  ConfigFileEntry.throttle_time = yylval.number;
2589 >  ConfigGeneral.throttle_time = $3;
2590   };
2591  
2592   general_oper_umodes: OPER_UMODES
2593   {
2594 <  ConfigFileEntry.oper_umodes = 0;
2595 < } '='  umode_oitems ';' ;
2594 >  ConfigGeneral.oper_umodes = 0;
2595 > } '=' umode_oitems ';' ;
2596  
2597   umode_oitems:    umode_oitems ',' umode_oitem | umode_oitem;
2598   umode_oitem:     T_BOTS
2599   {
2600 <  ConfigFileEntry.oper_umodes |= UMODE_BOTS;
2600 >  ConfigGeneral.oper_umodes |= UMODE_BOTS;
2601   } | T_CCONN
2602   {
2603 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN;
3492 < } | T_CCONN_FULL
3493 < {
3494 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
2603 >  ConfigGeneral.oper_umodes |= UMODE_CCONN;
2604   } | T_DEAF
2605   {
2606 <  ConfigFileEntry.oper_umodes |= UMODE_DEAF;
2606 >  ConfigGeneral.oper_umodes |= UMODE_DEAF;
2607   } | T_DEBUG
2608   {
2609 <  ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
2609 >  ConfigGeneral.oper_umodes |= UMODE_DEBUG;
2610   } | T_FULL
2611   {
2612 <  ConfigFileEntry.oper_umodes |= UMODE_FULL;
2612 >  ConfigGeneral.oper_umodes |= UMODE_FULL;
2613 > } | HIDDEN
2614 > {
2615 >  ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
2616 > } | HIDE_CHANS
2617 > {
2618 >  ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
2619 > } | HIDE_IDLE
2620 > {
2621 >  ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
2622   } | T_SKILL
2623   {
2624 <  ConfigFileEntry.oper_umodes |= UMODE_SKILL;
2624 >  ConfigGeneral.oper_umodes |= UMODE_SKILL;
2625   } | T_NCHANGE
2626   {
2627 <  ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
2627 >  ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
2628   } | T_REJ
2629   {
2630 <  ConfigFileEntry.oper_umodes |= UMODE_REJ;
2630 >  ConfigGeneral.oper_umodes |= UMODE_REJ;
2631   } | T_UNAUTH
2632   {
2633 <  ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
2633 >  ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
2634   } | T_SPY
2635   {
2636 <  ConfigFileEntry.oper_umodes |= UMODE_SPY;
2636 >  ConfigGeneral.oper_umodes |= UMODE_SPY;
2637   } | T_EXTERNAL
2638   {
2639 <  ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
3522 < } | T_OPERWALL
3523 < {
3524 <  ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
2639 >  ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
2640   } | T_SERVNOTICE
2641   {
2642 <  ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
2642 >  ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
2643   } | T_INVISIBLE
2644   {
2645 <  ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
2645 >  ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
2646   } | T_WALLOP
2647   {
2648 <  ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
2648 >  ConfigGeneral.oper_umodes |= UMODE_WALLOP;
2649   } | T_SOFTCALLERID
2650   {
2651 <  ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
2651 >  ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
2652   } | T_CALLERID
2653   {
2654 <  ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
2654 >  ConfigGeneral.oper_umodes |= UMODE_CALLERID;
2655   } | T_LOCOPS
2656   {
2657 <  ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
2657 >  ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
2658 > } | T_NONONREG
2659 > {
2660 >  ConfigGeneral.oper_umodes |= UMODE_REGONLY;
2661 > } | T_FARCONNECT
2662 > {
2663 >  ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
2664 > } | EXPIRATION
2665 > {
2666 >  ConfigGeneral.oper_umodes |= UMODE_EXPIRATION;
2667   };
2668  
2669 < general_oper_only_umodes: OPER_ONLY_UMODES
2669 > general_oper_only_umodes: OPER_ONLY_UMODES
2670   {
2671 <  ConfigFileEntry.oper_only_umodes = 0;
2672 < } '='  umode_items ';' ;
2671 >  ConfigGeneral.oper_only_umodes = 0;
2672 > } '=' umode_items ';' ;
2673  
2674 < umode_items:    umode_items ',' umode_item | umode_item;
2675 < umode_item:     T_BOTS
2674 > umode_items:  umode_items ',' umode_item | umode_item;
2675 > umode_item:   T_BOTS
2676   {
2677 <  ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
2677 >  ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
2678   } | T_CCONN
2679   {
2680 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
3557 < } | T_CCONN_FULL
3558 < {
3559 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
2680 >  ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
2681   } | T_DEAF
2682   {
2683 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
2683 >  ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
2684   } | T_DEBUG
2685   {
2686 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
2686 >  ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
2687   } | T_FULL
2688 < {
2689 <  ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
2688 > {
2689 >  ConfigGeneral.oper_only_umodes |= UMODE_FULL;
2690   } | T_SKILL
2691   {
2692 <  ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
2692 >  ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
2693 > } | HIDDEN
2694 > {
2695 >  ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
2696   } | T_NCHANGE
2697   {
2698 <  ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
2698 >  ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
2699   } | T_REJ
2700   {
2701 <  ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
2701 >  ConfigGeneral.oper_only_umodes |= UMODE_REJ;
2702   } | T_UNAUTH
2703   {
2704 <  ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
2704 >  ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
2705   } | T_SPY
2706   {
2707 <  ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
2707 >  ConfigGeneral.oper_only_umodes |= UMODE_SPY;
2708   } | T_EXTERNAL
2709   {
2710 <  ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
3587 < } | T_OPERWALL
3588 < {
3589 <  ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
2710 >  ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
2711   } | T_SERVNOTICE
2712   {
2713 <  ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
2713 >  ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
2714   } | T_INVISIBLE
2715   {
2716 <  ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
2716 >  ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
2717   } | T_WALLOP
2718   {
2719 <  ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
2719 >  ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
2720   } | T_SOFTCALLERID
2721   {
2722 <  ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
2722 >  ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
2723   } | T_CALLERID
2724   {
2725 <  ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
2725 >  ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
2726   } | T_LOCOPS
2727   {
2728 <  ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
2728 >  ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
2729 > } | T_NONONREG
2730 > {
2731 >  ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
2732 > } | T_FARCONNECT
2733 > {
2734 >  ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
2735 > } | EXPIRATION
2736 > {
2737 >  ConfigGeneral.oper_only_umodes |= UMODE_EXPIRATION;
2738   };
2739  
2740   general_min_nonwildcard: MIN_NONWILDCARD '=' NUMBER ';'
2741   {
2742 <  ConfigFileEntry.min_nonwildcard = $3;
2742 >  ConfigGeneral.min_nonwildcard = $3;
2743   };
2744  
2745   general_min_nonwildcard_simple: MIN_NONWILDCARD_SIMPLE '=' NUMBER ';'
2746   {
2747 <  ConfigFileEntry.min_nonwildcard_simple = $3;
2747 >  ConfigGeneral.min_nonwildcard_simple = $3;
2748   };
2749  
2750   general_default_floodcount: DEFAULT_FLOODCOUNT '=' NUMBER ';'
2751   {
2752 <  ConfigFileEntry.default_floodcount = $3;
2752 >  ConfigGeneral.default_floodcount = $3;
2753   };
2754  
2755 < general_client_flood: T_CLIENT_FLOOD '=' sizespec ';'
2755 > general_default_floodtime: DEFAULT_FLOODTIME '=' timespec ';'
2756   {
2757 <  ConfigFileEntry.client_flood = $3;
2757 >  ConfigGeneral.default_floodtime = $3;
2758   };
2759  
3630 general_dot_in_ip6_addr: DOT_IN_IP6_ADDR '=' TBOOL ';'
3631 {
3632  ConfigFileEntry.dot_in_ip6_addr = yylval.number;
3633 };
2760  
2761 < /***************************************************************************
2762 < *  section glines
2761 > /***************************************************************************
2762 > * channel {} section
2763   ***************************************************************************/
2764 < gline_entry: GLINES
3639 < {
3640 <  if (ypass == 2)
3641 <  {
3642 <    yy_conf = make_conf_item(GDENY_TYPE);
3643 <    yy_aconf = map_to_conf(yy_conf);
3644 <  }
3645 < } '{' gline_items '}' ';'
3646 < {
3647 <  if (ypass == 2)
3648 <  {
3649 <    /*
3650 <     * since we re-allocate yy_conf/yy_aconf after the end of action=, at the
3651 <     * end we will have one extra, so we should free it.
3652 <     */
3653 <    if (yy_conf->name == NULL || yy_aconf->user == NULL)
3654 <    {
3655 <      delete_conf_item(yy_conf);
3656 <      yy_conf = NULL;
3657 <      yy_aconf = NULL;
3658 <    }
3659 <  }
3660 < };
2764 > channel_entry: CHANNEL '{' channel_items '}' ';';
2765  
2766 < gline_items:        gline_items gline_item | gline_item;
2767 < gline_item:         gline_enable |
2768 <                    gline_duration |
2769 <                    gline_logging |
2770 <                    gline_user |
2771 <                    gline_server |
2772 <                    gline_action |
2766 > channel_items:      channel_items channel_item | channel_item;
2767 > channel_item:       channel_max_bans |
2768 >                    channel_max_bans_large |
2769 >                    channel_invite_client_count |
2770 >                    channel_invite_client_time |
2771 >                    channel_invite_delay_channel |
2772 >                    channel_invite_expire_time |
2773 >                    channel_knock_client_count |
2774 >                    channel_knock_client_time |
2775 >                    channel_knock_delay_channel |
2776 >                    channel_max_channels |
2777 >                    channel_max_invites |
2778 >                    channel_default_join_flood_count |
2779 >                    channel_default_join_flood_time |
2780 >                    channel_disable_fake_channels |
2781 >                    channel_enable_extbans |
2782                      error;
2783  
2784 < gline_enable: ENABLE '=' TBOOL ';'
3672 < {
3673 <  if (ypass == 2)
3674 <    ConfigFileEntry.glines = yylval.number;
3675 < };
3676 <
3677 < gline_duration: DURATION '=' timespec ';'
3678 < {
3679 <  if (ypass == 2)
3680 <    ConfigFileEntry.gline_time = $3;
3681 < };
3682 <
3683 < gline_logging: LOGGING
3684 < {
3685 <  if (ypass == 2)
3686 <    ConfigFileEntry.gline_logging = 0;
3687 < } '=' gline_logging_types ';';
3688 < gline_logging_types:     gline_logging_types ',' gline_logging_type_item | gline_logging_type_item;
3689 < gline_logging_type_item: T_REJECT
3690 < {
3691 <  if (ypass == 2)
3692 <    ConfigFileEntry.gline_logging |= GDENY_REJECT;
3693 < } | T_BLOCK
3694 < {
3695 <  if (ypass == 2)
3696 <    ConfigFileEntry.gline_logging |= GDENY_BLOCK;
3697 < };
3698 <
3699 < gline_user: USER '=' QSTRING ';'
3700 < {
3701 <  if (ypass == 2)
3702 <  {
3703 <    struct split_nuh_item nuh;
3704 <
3705 <    nuh.nuhmask  = yylval.string;
3706 <    nuh.nickptr  = NULL;
3707 <    nuh.userptr  = userbuf;
3708 <    nuh.hostptr  = hostbuf;
3709 <
3710 <    nuh.nicksize = 0;
3711 <    nuh.usersize = sizeof(userbuf);
3712 <    nuh.hostsize = sizeof(hostbuf);
3713 <
3714 <    split_nuh(&nuh);
3715 <
3716 <    if (yy_aconf->user == NULL)
3717 <    {
3718 <      DupString(yy_aconf->user, userbuf);
3719 <      DupString(yy_aconf->host, hostbuf);
3720 <    }
3721 <    else
3722 <    {
3723 <      struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
3724 <
3725 <      DupString(yy_tmp->user, userbuf);
3726 <      DupString(yy_tmp->host, hostbuf);
3727 <
3728 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3729 <    }
3730 <  }
3731 < };
3732 <
3733 < gline_server: NAME '=' QSTRING ';'
2784 > channel_enable_extbans: ENABLE_EXTBANS '=' TBOOL ';'
2785   {
2786 <  if (ypass == 2)  
3736 <  {
3737 <    MyFree(yy_conf->name);
3738 <    DupString(yy_conf->name, yylval.string);
3739 <  }
2786 >  ConfigChannel.enable_extbans = yylval.number;
2787   };
2788  
3742 gline_action: ACTION
3743 {
3744  if (ypass == 2)
3745    yy_aconf->flags = 0;
3746 } '=' gdeny_types ';'
3747 {
3748  if (ypass == 2)
3749  {
3750    struct CollectItem *yy_tmp = NULL;
3751    dlink_node *ptr, *next_ptr;
3752
3753    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3754    {
3755      struct AccessItem *new_aconf;
3756      struct ConfItem *new_conf;
3757
3758      yy_tmp = ptr->data;
3759      new_conf = make_conf_item(GDENY_TYPE);
3760      new_aconf = map_to_conf(new_conf);
3761
3762      new_aconf->flags = yy_aconf->flags;
3763
3764      if (yy_conf->name != NULL)
3765        DupString(new_conf->name, yy_conf->name);
3766      else
3767        DupString(new_conf->name, "*");
3768      if (yy_aconf->user != NULL)
3769         DupString(new_aconf->user, yy_tmp->user);
3770      else  
3771        DupString(new_aconf->user, "*");
3772      if (yy_aconf->host != NULL)
3773        DupString(new_aconf->host, yy_tmp->host);
3774      else
3775        DupString(new_aconf->host, "*");
3776
3777      dlinkDelete(&yy_tmp->node, &col_conf_list);
3778    }
3779
3780    /*
3781     * In case someone has fed us with more than one action= after user/name
3782     * which would leak memory  -Michael
3783     */
3784    if (yy_conf->name == NULL || yy_aconf->user == NULL)
3785      delete_conf_item(yy_conf);
3786
3787    yy_conf = make_conf_item(GDENY_TYPE);
3788    yy_aconf = map_to_conf(yy_conf);
3789  }
3790 };
3791
3792 gdeny_types: gdeny_types ',' gdeny_type_item | gdeny_type_item;
3793 gdeny_type_item: T_REJECT
3794 {
3795  if (ypass == 2)
3796    yy_aconf->flags |= GDENY_REJECT;
3797 } | T_BLOCK
3798 {
3799  if (ypass == 2)
3800    yy_aconf->flags |= GDENY_BLOCK;
3801 };
3802
3803 /***************************************************************************
3804 *  section channel
3805 ***************************************************************************/
3806 channel_entry: CHANNEL
3807  '{' channel_items '}' ';';
3808
3809 channel_items:      channel_items channel_item | channel_item;
3810 channel_item:       channel_disable_local_channels | channel_use_except |
3811                    channel_use_invex | channel_use_knock |
3812                    channel_max_bans | channel_knock_delay |
3813                    channel_knock_delay_channel | channel_max_chans_per_user |
3814                    channel_quiet_on_ban | channel_default_split_user_count |
3815                    channel_default_split_server_count |
3816                    channel_no_create_on_split | channel_restrict_channels |
3817                    channel_no_join_on_split | channel_burst_topicwho |
3818                    channel_jflood_count | channel_jflood_time |
3819                    channel_disable_fake_channels | error;
3820
2789   channel_disable_fake_channels: DISABLE_FAKE_CHANNELS '=' TBOOL ';'
2790   {
2791    ConfigChannel.disable_fake_channels = yylval.number;
2792   };
2793  
2794 < channel_restrict_channels: RESTRICT_CHANNELS '=' TBOOL ';'
2794 > channel_invite_client_count: INVITE_CLIENT_COUNT '=' NUMBER ';'
2795   {
2796 <  ConfigChannel.restrict_channels = yylval.number;
2796 >  ConfigChannel.invite_client_count = $3;
2797   };
2798  
2799 < channel_disable_local_channels: DISABLE_LOCAL_CHANNELS '=' TBOOL ';'
2799 > channel_invite_client_time: INVITE_CLIENT_TIME '=' timespec ';'
2800   {
2801 <  ConfigChannel.disable_local_channels = yylval.number;
2801 >  ConfigChannel.invite_client_time = $3;
2802   };
2803  
2804 < channel_use_except: USE_EXCEPT '=' TBOOL ';'
2804 > channel_invite_delay_channel: INVITE_DELAY_CHANNEL '=' timespec ';'
2805   {
2806 <  ConfigChannel.use_except = yylval.number;
2806 >  ConfigChannel.invite_delay_channel = $3;
2807   };
2808  
2809 < channel_use_invex: USE_INVEX '=' TBOOL ';'
2809 > channel_invite_expire_time: INVITE_EXPIRE_TIME '=' timespec ';'
2810   {
2811 <  ConfigChannel.use_invex = yylval.number;
2811 >  ConfigChannel.invite_expire_time = $3;
2812   };
2813  
2814 < channel_use_knock: USE_KNOCK '=' TBOOL ';'
2814 > channel_knock_client_count: KNOCK_CLIENT_COUNT '=' NUMBER ';'
2815   {
2816 <  ConfigChannel.use_knock = yylval.number;
2816 >  ConfigChannel.knock_client_count = $3;
2817   };
2818  
2819 < channel_knock_delay: KNOCK_DELAY '=' timespec ';'
2819 > channel_knock_client_time: KNOCK_CLIENT_TIME '=' timespec ';'
2820   {
2821 <  ConfigChannel.knock_delay = $3;
2821 >  ConfigChannel.knock_client_time = $3;
2822   };
2823  
2824   channel_knock_delay_channel: KNOCK_DELAY_CHANNEL '=' timespec ';'
# Line 3858 | Line 2826 | channel_knock_delay_channel: KNOCK_DELAY
2826    ConfigChannel.knock_delay_channel = $3;
2827   };
2828  
2829 < channel_max_chans_per_user: MAX_CHANS_PER_USER '=' NUMBER ';'
2829 > channel_max_channels: MAX_CHANNELS '=' NUMBER ';'
2830   {
2831 <  ConfigChannel.max_chans_per_user = $3;
2831 >  ConfigChannel.max_channels = $3;
2832   };
2833  
2834 < channel_quiet_on_ban: QUIET_ON_BAN '=' TBOOL ';'
2834 > channel_max_invites: MAX_INVITES '=' NUMBER ';'
2835   {
2836 <  ConfigChannel.quiet_on_ban = yylval.number;
2836 >  ConfigChannel.max_invites = $3;
2837   };
2838  
2839   channel_max_bans: MAX_BANS '=' NUMBER ';'
# Line 3873 | Line 2841 | channel_max_bans: MAX_BANS '=' NUMBER ';
2841    ConfigChannel.max_bans = $3;
2842   };
2843  
2844 < channel_default_split_user_count: DEFAULT_SPLIT_USER_COUNT '=' NUMBER ';'
2844 > channel_max_bans_large: MAX_BANS_LARGE '=' NUMBER ';'
2845   {
2846 <  ConfigChannel.default_split_user_count = $3;
2846 >  ConfigChannel.max_bans_large = $3;
2847   };
2848  
2849 < channel_default_split_server_count: DEFAULT_SPLIT_SERVER_COUNT '=' NUMBER ';'
2849 > channel_default_join_flood_count: DEFAULT_JOIN_FLOOD_COUNT '=' NUMBER ';'
2850   {
2851 <  ConfigChannel.default_split_server_count = $3;
2851 >  ConfigChannel.default_join_flood_count = yylval.number;
2852   };
2853  
2854 < channel_no_create_on_split: NO_CREATE_ON_SPLIT '=' TBOOL ';'
2854 > channel_default_join_flood_time: DEFAULT_JOIN_FLOOD_TIME '=' timespec ';'
2855   {
2856 <  ConfigChannel.no_create_on_split = yylval.number;
2856 >  ConfigChannel.default_join_flood_time = $3;
2857   };
2858  
3891 channel_no_join_on_split: NO_JOIN_ON_SPLIT '=' TBOOL ';'
3892 {
3893  ConfigChannel.no_join_on_split = yylval.number;
3894 };
2859  
2860 < channel_burst_topicwho: BURST_TOPICWHO '=' TBOOL ';'
2860 > /***************************************************************************
2861 > * serverhide {} section
2862 > ***************************************************************************/
2863 > serverhide_entry: SERVERHIDE '{' serverhide_items '}' ';';
2864 >
2865 > serverhide_items:   serverhide_items serverhide_item | serverhide_item;
2866 > serverhide_item:    serverhide_flatten_links |
2867 >                    serverhide_flatten_links_delay |
2868 >                    serverhide_flatten_links_file |
2869 >                    serverhide_disable_remote_commands |
2870 >                    serverhide_hide_servers |
2871 >                    serverhide_hide_services |
2872 >                    serverhide_hidden |
2873 >                    serverhide_hidden_name |
2874 >                    serverhide_hide_server_ips |
2875 >                    error;
2876 >
2877 > serverhide_flatten_links: FLATTEN_LINKS '=' TBOOL ';'
2878   {
2879 <  ConfigChannel.burst_topicwho = yylval.number;
2879 >  if (conf_parser_ctx.pass == 2)
2880 >    ConfigServerHide.flatten_links = yylval.number;
2881   };
2882  
2883 < channel_jflood_count: JOIN_FLOOD_COUNT '=' NUMBER ';'
2883 > serverhide_flatten_links_delay: FLATTEN_LINKS_DELAY '=' timespec ';'
2884   {
2885 <  GlobalSetOptions.joinfloodcount = yylval.number;
2885 >  if (conf_parser_ctx.pass == 2)
2886 >  {
2887 >    if ($3 > 0)
2888 >    {
2889 >      event_write_links_file.when = $3;
2890 >      event_add(&event_write_links_file, NULL);
2891 >    }
2892 >    else
2893 >     event_delete(&event_write_links_file);
2894 >
2895 >    ConfigServerHide.flatten_links_delay = $3;
2896 >  }
2897   };
2898  
2899 < channel_jflood_time: JOIN_FLOOD_TIME '=' timespec ';'
2899 > serverhide_flatten_links_file: FLATTEN_LINKS_FILE '=' QSTRING ';'
2900   {
2901 <  GlobalSetOptions.joinfloodtime = yylval.number;
2901 >  if (conf_parser_ctx.pass == 2)
2902 >  {
2903 >    xfree(ConfigServerHide.flatten_links_file);
2904 >    ConfigServerHide.flatten_links_file = xstrdup(yylval.string);
2905 >  }
2906   };
2907  
2908 < /***************************************************************************
3912 < *  section serverhide
3913 < ***************************************************************************/
3914 < serverhide_entry: SERVERHIDE
3915 <  '{' serverhide_items '}' ';';
3916 <
3917 < serverhide_items:   serverhide_items serverhide_item | serverhide_item;
3918 < serverhide_item:    serverhide_flatten_links | serverhide_hide_servers |
3919 <                    serverhide_links_delay |
3920 <                    serverhide_disable_hidden |
3921 <                    serverhide_hidden | serverhide_hidden_name |
3922 <                    serverhide_hide_server_ips |
3923 <                    error;
3924 <
3925 < serverhide_flatten_links: FLATTEN_LINKS '=' TBOOL ';'
2908 > serverhide_disable_remote_commands: DISABLE_REMOTE_COMMANDS '=' TBOOL ';'
2909   {
2910 <  if (ypass == 2)
2911 <    ConfigServerHide.flatten_links = yylval.number;
2910 >  if (conf_parser_ctx.pass == 2)
2911 >    ConfigServerHide.disable_remote_commands = yylval.number;
2912   };
2913  
2914   serverhide_hide_servers: HIDE_SERVERS '=' TBOOL ';'
2915   {
2916 <  if (ypass == 2)
2916 >  if (conf_parser_ctx.pass == 2)
2917      ConfigServerHide.hide_servers = yylval.number;
2918   };
2919  
2920 < serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2920 > serverhide_hide_services: HIDE_SERVICES '=' TBOOL ';'
2921   {
2922 <  if (ypass == 2)
2923 <  {
3941 <    MyFree(ConfigServerHide.hidden_name);
3942 <    DupString(ConfigServerHide.hidden_name, yylval.string);
3943 <  }
2922 >  if (conf_parser_ctx.pass == 2)
2923 >    ConfigServerHide.hide_services = yylval.number;
2924   };
2925  
2926 < serverhide_links_delay: LINKS_DELAY '=' timespec ';'
2926 > serverhide_hidden_name: HIDDEN_NAME '=' QSTRING ';'
2927   {
2928 <  if (ypass == 2)
2928 >  if (conf_parser_ctx.pass == 2)
2929    {
2930 <    if (($3 > 0) && ConfigServerHide.links_disabled == 1)
2931 <    {
3952 <      eventAddIsh("write_links_file", write_links_file, NULL, $3);
3953 <      ConfigServerHide.links_disabled = 0;
3954 <    }
3955 <
3956 <    ConfigServerHide.links_delay = $3;
2930 >    xfree(ConfigServerHide.hidden_name);
2931 >    ConfigServerHide.hidden_name = xstrdup(yylval.string);
2932    }
2933   };
2934  
2935   serverhide_hidden: HIDDEN '=' TBOOL ';'
2936   {
2937 <  if (ypass == 2)
2937 >  if (conf_parser_ctx.pass == 2)
2938      ConfigServerHide.hidden = yylval.number;
2939   };
2940  
3966 serverhide_disable_hidden: DISABLE_HIDDEN '=' TBOOL ';'
3967 {
3968  if (ypass == 2)
3969    ConfigServerHide.disable_hidden = yylval.number;
3970 };
3971
2941   serverhide_hide_server_ips: HIDE_SERVER_IPS '=' TBOOL ';'
2942   {
2943 <  if (ypass == 2)
2943 >  if (conf_parser_ctx.pass == 2)
2944      ConfigServerHide.hide_server_ips = yylval.number;
2945   };

Comparing:
ircd-hybrid-7.2/src/ircd_parser.y (property svn:keywords), Revision 885 by michael, Wed Oct 31 18:09:24 2007 UTC vs.
ircd-hybrid/trunk/src/conf_parser.y (property svn:keywords), Revision 9234 by michael, Fri Jan 31 17:38:34 2020 UTC

# Line 1 | Line 1
1 < Id Revision
1 > Id

Diff Legend

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