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

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 9692 by michael, Sat Oct 31 19:05:15 2020 UTC

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

Diff Legend

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