ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/conf.c

Comparing ircd-hybrid/trunk/src/conf.c (file contents):
Revision 4815 by michael, Sat Nov 1 15:28:42 2014 UTC vs.
Revision 7159 by michael, Thu Jan 28 11:26:51 2016 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2016 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 55 | Line 55
55		#include "conf_class.h"
56		#include "motd.h"
57		#include "ipcache.h"
58	+	#include "isupport.h"
59
60
61	+	struct config_channel_entry ConfigChannel;
62	+	struct config_serverhide_entry ConfigServerHide;
63	+	struct config_general_entry ConfigGeneral;
64	+	struct config_log_entry ConfigLog = { .use_logging = 1 };
65	+	struct config_serverinfo_entry ConfigServerInfo;
66	+	struct config_admin_entry ConfigAdminInfo;
67	+	struct conf_parser_context conf_parser_ctx;
68	+
69		/* general conf items link list root, other than k lines etc. */
70	<	dlink_list service_items = { NULL, NULL, 0 };
71	<	dlink_list server_items  = { NULL, NULL, 0 };
72	<	dlink_list cluster_items = { NULL, NULL, 0 };
73	<	dlink_list oconf_items   = { NULL, NULL, 0 };
74	<	dlink_list uconf_items   = { NULL, NULL, 0 };
75	<	dlink_list xconf_items   = { NULL, NULL, 0 };
76	<	dlink_list nresv_items   = { NULL, NULL, 0 };
77	<	dlink_list cresv_items   = { NULL, NULL, 0 };
70	>	dlink_list service_items;
71	>	dlink_list server_items;
72	>	dlink_list cluster_items;
73	>	dlink_list operator_items;
74	>	dlink_list shared_items;
75	>	dlink_list gecos_items;
76	>	dlink_list nresv_items;
77	>	dlink_list cresv_items;
78
79		extern unsigned int lineno;
80		extern char linebuf[];
81		extern char conffilebuf[IRCD_BUFSIZE];
82		extern int yyparse(); /* defined in y.tab.c */
83
75	–	/* internally defined functions */
76	–	static void read_conf(FILE *);
77	–	static void clear_out_old_conf(void);
78	–	static void expire_tklines(dlink_list *);
79	–	static int verify_access(struct Client *);
80	–	static int attach_iline(struct Client *, struct MaskItem *);
81	–	static dlink_list *map_to_list(enum maskitem_type);
82	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
83	–
84
85		/* conf_dns_callback()
86		*
#	Line 95 | Line 95 | static int find_user_host(struct Client
95		static void
96		conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
97		{
98	<	struct MaskItem *conf = vptr;
98	>	struct MaskItem *const conf = vptr;
99
100		conf->dns_pending = 0;
101
#	Line 114 | Line 114 | conf_dns_callback(void *vptr, const stru
114		static void
115		conf_dns_lookup(struct MaskItem *conf)
116		{
117	<	if (!conf->dns_pending)
118	<	{
119	<	conf->dns_pending = 1;
117	>	if (conf->dns_pending)
118	>	return;
119
120	<	if (conf->aftype == AF_INET)
121	<	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
122	<	else
123	<	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
120	>	conf->dns_pending = 1;
121	>
122	>	if (conf->aftype == AF_INET)
123	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
124	>	else
125	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
126	>	}
127	>
128	>	/* map_to_list()
129	>	*
130	>	* inputs       - ConfType conf
131	>	* output       - pointer to dlink_list to use
132	>	* side effects - none
133	>	*/
134	>	static dlink_list *
135	>	map_to_list(enum maskitem_type type)
136	>	{
137	>	switch (type)
138	>	{
139	>	case CONF_XLINE:
140	>	return &gecos_items;
141	>	break;
142	>	case CONF_SHARED:
143	>	return &shared_items;
144	>	break;
145	>	case CONF_NRESV:
146	>	return &nresv_items;
147	>	break;
148	>	case CONF_CRESV:
149	>	return &cresv_items;
150	>	break;
151	>	case CONF_OPER:
152	>	return &operator_items;
153	>	break;
154	>	case CONF_SERVER:
155	>	return &server_items;
156	>	break;
157	>	case CONF_SERVICE:
158	>	return &service_items;
159	>	break;
160	>	case CONF_CLUSTER:
161	>	return &cluster_items;
162	>	break;
163	>	default:
164	>	return NULL;
165		}
166		}
167
168		struct MaskItem *
169		conf_make(enum maskitem_type type)
170		{
171	<	struct MaskItem *conf = MyCalloc(sizeof(*conf));
171	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
172		dlink_list *list = NULL;
173
174		conf->type   = type;
#	Line 149 | Line 189 | conf_free(struct MaskItem *conf)
189		if ((list = map_to_list(conf->type)))
190		dlinkFindDelete(list, conf);
191
192	<	MyFree(conf->name);
192	>	xfree(conf->name);
193
194		if (conf->dns_pending)
195		delete_resolver_queries(conf);
#	Line 160 | Line 200 | conf_free(struct MaskItem *conf)
200
201		conf->class = NULL;
202
203	<	MyFree(conf->passwd);
204	<	MyFree(conf->spasswd);
205	<	MyFree(conf->reason);
206	<	MyFree(conf->certfp);
207	<	MyFree(conf->user);
208	<	MyFree(conf->host);
209	<	#ifdef HAVE_LIBCRYPTO
210	<	MyFree(conf->cipher_list);
211	<
172	<	if (conf->rsa_public_key)
173	<	RSA_free(conf->rsa_public_key);
174	<	#endif
203	>	xfree(conf->passwd);
204	>	xfree(conf->spasswd);
205	>	xfree(conf->reason);
206	>	xfree(conf->certfp);
207	>	xfree(conf->whois);
208	>	xfree(conf->user);
209	>	xfree(conf->host);
210	>	xfree(conf->cipher_list);
211	>
212		DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
213		{
214	<	MyFree(node->data);
214	>	xfree(node->data);
215		dlinkDelete(node, &conf->hub_list);
216		free_dlink_node(node);
217		}
218
219		DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
220		{
221	<	MyFree(node->data);
221	>	xfree(node->data);
222		dlinkDelete(node, &conf->leaf_list);
223		free_dlink_node(node);
224		}
#	Line 191 | Line 228 | conf_free(struct MaskItem *conf)
228		struct exempt *exptr = node->data;
229
230		dlinkDelete(node, &conf->exempt_list);
231	<	MyFree(exptr->name);
232	<	MyFree(exptr->user);
233	<	MyFree(exptr->host);
234	<	MyFree(exptr);
231	>	xfree(exptr->name);
232	>	xfree(exptr->user);
233	>	xfree(exptr->host);
234	>	xfree(exptr);
235	>	}
236	>
237	>	xfree(conf);
238	>	}
239	>
240	>	/* attach_iline()
241	>	*
242	>	* inputs       - client pointer
243	>	*              - conf pointer
244	>	* output       -
245	>	* side effects - do actual attach
246	>	*/
247	>	static int
248	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
249	>	{
250	>	const struct ClassItem *const class = conf->class;
251	>	struct ip_entry *ip_found;
252	>	int a_limit_reached = 0;
253	>	unsigned int local = 0, global = 0, ident = 0;
254	>
255	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
256	>	ip_found->count++;
257	>	AddFlag(client_p, FLAGS_IPHASH);
258	>
259	>	userhost_count(client_p->username, client_p->host,
260	>	&global, &local, &ident);
261	>
262	>	/* XXX blah. go down checking the various silly limits
263	>	* setting a_limit_reached if any limit is reached.
264	>	* - Dianora
265	>	*/
266	>	if (class->max_total && class->ref_count >= class->max_total)
267	>	a_limit_reached = 1;
268	>	else if (class->max_perip && ip_found->count > class->max_perip)
269	>	a_limit_reached = 1;
270	>	else if (class->max_local && local >= class->max_local)
271	>	a_limit_reached = 1;
272	>	else if (class->max_global && global >= class->max_global)
273	>	a_limit_reached = 1;
274	>	else if (class->max_ident && ident >= class->max_ident &&
275	>	client_p->username[0] != '~')
276	>	a_limit_reached = 1;
277	>
278	>	if (a_limit_reached)
279	>	{
280	>	if (!IsConfExemptLimits(conf))
281	>	return TOO_MANY;   /* Already at maximum allowed */
282	>
283	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
284	>	"but you have exceed_limit = yes;");
285		}
286
287	<	MyFree(conf);
287	>	return attach_conf(client_p, conf);
288	>	}
289	>
290	>	/* verify_access()
291	>	*
292	>	* inputs       - pointer to client to verify
293	>	* output       - 0 if success -'ve if not
294	>	* side effect  - find the first (best) I line to attach.
295	>	*/
296	>	static int
297	>	verify_access(struct Client *client_p)
298	>	{
299	>	struct MaskItem *conf = NULL;
300	>
301	>	if (HasFlag(client_p, FLAGS_GOTID))
302	>	{
303	>	conf = find_address_conf(client_p->host, client_p->username,
304	>	&client_p->connection->ip,
305	>	client_p->connection->aftype,
306	>	client_p->connection->password);
307	>	}
308	>	else
309	>	{
310	>	char non_ident[USERLEN + 1] = "~";
311	>
312	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
313	>	conf = find_address_conf(client_p->host, non_ident,
314	>	&client_p->connection->ip,
315	>	client_p->connection->aftype,
316	>	client_p->connection->password);
317	>	}
318	>
319	>	if (!conf)
320	>	return NOT_AUTHORIZED;
321	>
322	>	assert(IsConfClient(conf) || IsConfKill(conf));
323	>
324	>	if (IsConfClient(conf))
325	>	{
326	>	if (IsConfRedir(conf))
327	>	{
328	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
329	>	conf->name ? conf->name : "",
330	>	conf->port);
331	>	return NOT_AUTHORIZED;
332	>	}
333	>
334	>	if (IsConfDoSpoofIp(conf))
335	>	{
336	>	if (IsConfSpoofNotice(conf))
337	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
338	>	client_p->name, client_p->host, conf->name);
339	>
340	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
341	>	}
342	>
343	>	return attach_iline(client_p, conf);
344	>	}
345	>
346	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
347	>	return BANNED_CLIENT;
348		}
349
350		/* check_client()
#	Line 237 | Line 384 | check_client(struct Client *source_p)
384
385		case I_LINE_FULL:
386		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
387	<	"auth{} block is full for %s (%s).",
387	>	"auth {} block is full for %s (%s).",
388		get_client_name(source_p, SHOW_IP),
389		source_p->sockhost);
390		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
#	Line 247 | Line 394 | check_client(struct Client *source_p)
394		break;
395
396		case NOT_AUTHORIZED:
250	–	++ServerStats.is_ref;
397		/* jdc - lists server name & port connections are on */
398		/*       a purely cosmetical change */
399		sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
#	Line 256 | Line 402 | check_client(struct Client *source_p)
402		source_p->sockhost,
403		source_p->connection->listener->name,
404		source_p->connection->listener->port);
405	<	ilog(LOG_TYPE_IRCD,
260	<	"Unauthorized client connection from %s on [%s/%u].",
405	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
406		get_client_name(source_p, SHOW_IP),
407		source_p->connection->listener->name,
408		source_p->connection->listener->port);
409
410	+	++ServerStats.is_ref;
411		exit_client(source_p, "You are not authorized to use this server");
412		break;
413
414	<	case BANNED_CLIENT:
415	<	exit_client(source_p, "Banned");
416	<	++ServerStats.is_ref;
417	<	break;
272	<
273	<	case 0:
274	<	default:
275	<	break;
276	<	}
277	<
278	<	return (i < 0 ? 0 : 1);
279	<	}
280	<
281	<	/* verify_access()
282	<	*
283	<	* inputs       - pointer to client to verify
284	<	* output       - 0 if success -'ve if not
285	<	* side effect  - find the first (best) I line to attach.
286	<	*/
287	<	static int
288	<	verify_access(struct Client *client_p)
289	<	{
290	<	struct MaskItem *conf = NULL;
291	<	char non_ident[USERLEN + 1] = "~";
292	<
293	<	if (IsGotId(client_p))
294	<	{
295	<	conf = find_address_conf(client_p->host, client_p->username,
296	<	&client_p->connection->ip,
297	<	client_p->connection->aftype,
298	<	client_p->connection->password);
299	<	}
300	<	else
301	<	{
302	<	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
303	<	conf = find_address_conf(client_p->host,non_ident,
304	<	&client_p->connection->ip,
305	<	client_p->connection->aftype,
306	<	client_p->connection->password);
307	<	}
308	<
309	<	if (conf)
310	<	{
311	<	if (IsConfClient(conf))
312	<	{
313	<	if (IsConfRedir(conf))
314	<	{
315	<	sendto_one_numeric(client_p, &me, RPL_REDIR,
316	<	conf->name ? conf->name : "",
317	<	conf->port);
318	<	return NOT_AUTHORIZED;
319	<	}
320	<
321	<	/* Thanks for spoof idea amm */
322	<	if (IsConfDoSpoofIp(conf))
323	<	{
324	<	if (!ConfigGeneral.hide_spoof_ips && IsConfSpoofNotice(conf))
325	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
326	<	"%s spoofing: %s as %s",
327	<	client_p->name, client_p->host, conf->name);
328	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
329	<	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
330	<	}
331	<
332	<	return attach_iline(client_p, conf);
333	<	}
334	<	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
335	<	{
336	<	if (IsConfGline(conf))
337	<	sendto_one_notice(client_p, &me, ":*** G-lined");
338	<	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
339	<	return BANNED_CLIENT;
340	<	}
341	<	}
342	<
343	<	return NOT_AUTHORIZED;
344	<	}
345	<
346	<	/* attach_iline()
347	<	*
348	<	* inputs       - client pointer
349	<	*              - conf pointer
350	<	* output       -
351	<	* side effects - do actual attach
352	<	*/
353	<	static int
354	<	attach_iline(struct Client *client_p, struct MaskItem *conf)
355	<	{
356	<	const struct ClassItem *class = conf->class;
357	<	struct ip_entry *ip_found;
358	<	int a_limit_reached = 0;
359	<	unsigned int local = 0, global = 0, ident = 0;
360	<
361	<	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
362	<	ip_found->count++;
363	<	AddFlag(client_p, FLAGS_IPHASH);
364	<
365	<	count_user_host(client_p->username, client_p->host,
366	<	&global, &local, &ident);
367	<
368	<	/* XXX blah. go down checking the various silly limits
369	<	* setting a_limit_reached if any limit is reached.
370	<	* - Dianora
371	<	*/
372	<	if (class->max_total && class->ref_count >= class->max_total)
373	<	a_limit_reached = 1;
374	<	else if (class->max_perip && ip_found->count > class->max_perip)
375	<	a_limit_reached = 1;
376	<	else if (class->max_local && local >= class->max_local)
377	<	a_limit_reached = 1;
378	<	else if (class->max_global && global >= class->max_global)
379	<	a_limit_reached = 1;
380	<	else if (class->max_ident && ident >= class->max_ident &&
381	<	client_p->username[0] != '~')
382	<	a_limit_reached = 1;
383	<
384	<	if (a_limit_reached)
385	<	{
386	<	if (!IsConfExemptLimits(conf))
387	<	return TOO_MANY;   /* Already at maximum allowed */
414	>	case BANNED_CLIENT:
415	>	++ServerStats.is_ref;
416	>	exit_client(source_p, "Banned");
417	>	break;
418
419	<	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
420	<	"but you have exceed_limit = yes;");
419	>	case 0:
420	>	default:
421	>	break;
422		}
423
424	<	return attach_conf(client_p, conf);
424	>	return !(i < 0);
425		}
426
427		/* detach_conf()
#	Line 477 | Line 508 | attach_connect_block(struct Client *clie
508		{
509		dlink_node *node = NULL;
510
511	<	assert(client_p != NULL);
481	<	assert(host != NULL);
482	<
483	<	if (client_p == NULL || host == NULL)
484	<	return 0;
511	>	assert(host);
512
513		DLINK_FOREACH(node, server_items.head)
514		{
#	Line 491 | Line 518 | attach_connect_block(struct Client *clie
518		continue;
519
520		attach_conf(client_p, conf);
521	<	return -1;
521	>	return 1;
522		}
523
524		return 0;
#	Line 525 | Line 552 | find_conf_name(dlink_list *list, const c
552		return NULL;
553		}
554
528	–	/* map_to_list()
529	–	*
530	–	* inputs       - ConfType conf
531	–	* output       - pointer to dlink_list to use
532	–	* side effects - none
533	–	*/
534	–	static dlink_list *
535	–	map_to_list(enum maskitem_type type)
536	–	{
537	–	switch(type)
538	–	{
539	–	case CONF_XLINE:
540	–	return(&xconf_items);
541	–	break;
542	–	case CONF_ULINE:
543	–	return(&uconf_items);
544	–	break;
545	–	case CONF_NRESV:
546	–	return(&nresv_items);
547	–	break;
548	–	case CONF_CRESV:
549	–	return(&cresv_items);
550	–	case CONF_OPER:
551	–	return(&oconf_items);
552	–	break;
553	–	case CONF_SERVER:
554	–	return(&server_items);
555	–	break;
556	–	case CONF_SERVICE:
557	–	return(&service_items);
558	–	break;
559	–	case CONF_CLUSTER:
560	–	return(&cluster_items);
561	–	break;
562	–	default:
563	–	return NULL;
564	–	}
565	–	}
566	–
555		/* find_matching_name_conf()
556		*
557		* inputs       - type of link list to look in
#	Line 591 | Line 579 | find_matching_name_conf(enum maskitem_ty
579
580		if (EmptyString(conf->name))
581		continue;
582	<	if ((name != NULL) && !irccmp(name, conf->name))
582	>	if (name && !irccmp(name, conf->name))
583		return conf;
584		}
585		break;
586
587		case CONF_XLINE:
588	<	case CONF_ULINE:
588	>	case CONF_SHARED:
589		case CONF_NRESV:
590		case CONF_CRESV:
591		DLINK_FOREACH(node, list->head)
#	Line 606 | Line 594 | find_matching_name_conf(enum maskitem_ty
594
595		if (EmptyString(conf->name))
596		continue;
597	<	if ((name != NULL) && !match(conf->name, name))
597	>	if (name && !match(conf->name, name))
598		{
599		if ((user == NULL && (host == NULL)))
600		return conf;
601	<	if ((conf->flags & flags) != flags)
601	>	if ((conf->modes & flags) != flags)
602		continue;
603		if (EmptyString(conf->user) || EmptyString(conf->host))
604		return conf;
#	Line 625 | Line 613 | find_matching_name_conf(enum maskitem_ty
613		{
614		conf = node->data;
615
616	<	if ((name != NULL) && !match(name, conf->name))
616	>	if (name && !match(name, conf->name))
617		return conf;
618	<	else if ((host != NULL) && !match(host, conf->host))
618	>	if (host && !match(host, conf->host))
619		return conf;
620		}
621		break;
#	Line 658 | Line 646 | find_exact_name_conf(enum maskitem_type
646		switch(type)
647		{
648		case CONF_XLINE:
649	<	case CONF_ULINE:
649	>	case CONF_SHARED:
650		case CONF_NRESV:
651		case CONF_CRESV:
652
#	Line 753 | Line 741 | find_exact_name_conf(enum maskitem_type
741		return NULL;
742		}
743
756	–	/* rehash()
757	–	*
758	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
759	–	* as a result of an operator issuing this command, else assume it has been
760	–	* called as a result of the server receiving a HUP signal.
761	–	*/
762	–	int
763	–	rehash(int sig)
764	–	{
765	–	if (sig)
766	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
767	–	"Got signal SIGHUP, reloading configuration file(s)");
768	–
769	–	restart_resolver();
770	–
771	–	/* don't close listeners until we know we can go ahead with the rehash */
772	–
773	–	read_conf_files(0);
774	–
775	–	load_conf_modules();
776	–	check_conf_klines();
777	–
778	–	return 0;
779	–	}
780	–
744		/* set_default_conf()
745		*
746		* inputs       - NONE
#	Line 795 | Line 758 | set_default_conf(void)
758		*/
759		assert(class_default == class_get_list()->tail->data);
760
798	–	#ifdef HAVE_LIBCRYPTO
799	–	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
800	–	{
801	–	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
802	–
803	–	if (key)
804	–	{
805	–	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
806	–	EC_KEY_free(key);
807	–	}
808	–	}
809	–
810	–	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
811	–	#endif
812	–
813	–	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
814	–	ConfigServerInfo.rsa_private_key = NULL;
815	–	ConfigServerInfo.rsa_private_key_file = NULL;
816	–	#endif
817	–
818	–	/* ConfigServerInfo.name is not rehashable */
819	–	/* ConfigServerInfo.name = ConfigServerInfo.name; */
820	–	ConfigServerInfo.description = NULL;
761		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
762		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
763
#	Line 826 | Line 766 | set_default_conf(void)
766		memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
767		ConfigServerInfo.specific_ipv6_vhost = 0;
768
769	<	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
769	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
770		ConfigServerInfo.max_nick_length = 9;
771		ConfigServerInfo.max_topic_length = 80;
772		ConfigServerInfo.hub = 0;
773
834	–	ConfigAdminInfo.name = NULL;
835	–	ConfigAdminInfo.email = NULL;
836	–	ConfigAdminInfo.description = NULL;
837	–
774		log_del_all();
775
776		ConfigLog.use_logging = 1;
#	Line 842 | Line 778 | set_default_conf(void)
778		ConfigChannel.disable_fake_channels = 0;
779		ConfigChannel.invite_client_count = 10;
780		ConfigChannel.invite_client_time = 300;
781	+	ConfigChannel.invite_delay_channel = 5;
782		ConfigChannel.knock_client_count = 1;
783		ConfigChannel.knock_client_time = 300;
784		ConfigChannel.knock_delay_channel = 60;
785		ConfigChannel.max_channels = 25;
786		ConfigChannel.max_bans = 25;
787	<	ConfigChannel.default_split_user_count = 0;
788	<	ConfigChannel.default_split_server_count = 0;
852	<	ConfigChannel.no_join_on_split = 0;
853	<	ConfigChannel.no_create_on_split = 0;
787	>	ConfigChannel.default_join_flood_count = 18;
788	>	ConfigChannel.default_join_flood_time = 6;
789
790		ConfigServerHide.flatten_links = 0;
791	<	ConfigServerHide.links_delay = 300;
791	>	ConfigServerHide.flatten_links_delay = 300;
792		ConfigServerHide.hidden = 0;
793		ConfigServerHide.hide_servers = 0;
794		ConfigServerHide.hide_services = 0;
#	Line 863 | Line 798 | set_default_conf(void)
798
799		ConfigGeneral.away_count = 2;
800		ConfigGeneral.away_time = 10;
801	<	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
801	>	ConfigGeneral.max_watch = 50;
802		ConfigGeneral.cycle_on_host_change = 1;
803	<	ConfigGeneral.glines = 0;
804	<	ConfigGeneral.gline_time = 12 * 3600;
805	<	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
806	<	ConfigGeneral.gline_min_cidr = 16;
872	<	ConfigGeneral.gline_min_cidr6 = 48;
803	>	ConfigGeneral.dline_min_cidr = 16;
804	>	ConfigGeneral.dline_min_cidr6 = 48;
805	>	ConfigGeneral.kline_min_cidr = 16;
806	>	ConfigGeneral.kline_min_cidr6 = 48;
807		ConfigGeneral.invisible_on_connect = 1;
808		ConfigGeneral.tkline_expire_notices = 1;
875	–	ConfigGeneral.hide_spoof_ips = 1;
809		ConfigGeneral.ignore_bogus_ts = 0;
810		ConfigGeneral.disable_auth = 0;
811		ConfigGeneral.kill_chase_time_limit = 90;
#	Line 881 | Line 814 | set_default_conf(void)
814		ConfigGeneral.dots_in_ident = 0;
815		ConfigGeneral.min_nonwildcard = 4;
816		ConfigGeneral.min_nonwildcard_simple = 3;
817	<	ConfigGeneral.max_accept = 20;
817	>	ConfigGeneral.max_accept = 50;
818		ConfigGeneral.anti_nick_flood = 0;
819		ConfigGeneral.max_nick_time = 20;
820		ConfigGeneral.max_nick_changes = 5;
821		ConfigGeneral.anti_spam_exit_message_time = 0;
822	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
823	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
822	>	ConfigGeneral.ts_warn_delta = 30;
823	>	ConfigGeneral.ts_max_delta = 600;
824		ConfigGeneral.warn_no_connect_block = 1;
825		ConfigGeneral.stats_e_disabled = 0;
893	–	ConfigGeneral.stats_o_oper_only = 0;
894	–	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
826		ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
827	+	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
828	+	ConfigGeneral.stats_o_oper_only = 1;
829	+	ConfigGeneral.stats_m_oper_only = 1;
830		ConfigGeneral.stats_P_oper_only = 0;
831		ConfigGeneral.stats_u_oper_only = 0;
832		ConfigGeneral.caller_id_wait = 60;
#	Line 902 | Line 836 | set_default_conf(void)
836		ConfigGeneral.short_motd = 0;
837		ConfigGeneral.ping_cookie = 0;
838		ConfigGeneral.no_oper_flood = 0;
905	–	ConfigGeneral.true_no_oper_flood = 0;
906	–	ConfigGeneral.oper_pass_resv = 1;
839		ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
840	<	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
840	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
841	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
842	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
843		ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
844		ConfigGeneral.throttle_count = 1;
845		ConfigGeneral.throttle_time = 1;
#	Line 914 | Line 848 | set_default_conf(void)
848		static void
849		validate_conf(void)
850		{
851	<	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
918	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
919	<
920	<	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
921	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
922	<
923	<	if (ConfigServerInfo.network_name == NULL)
851	>	if (EmptyString(ConfigServerInfo.network_name))
852		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
853
854	<	if (ConfigServerInfo.network_desc == NULL)
854	>	if (EmptyString(ConfigServerInfo.network_desc))
855		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
928	–
929	–	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
856		}
857
858		/* read_conf()
#	Line 953 | Line 879 | read_conf(FILE *file)
879		class_delete_marked();  /* Delete unused classes that are marked for deletion */
880		}
881
882	+	/* conf_rehash()
883	+	*
884	+	* Actual REHASH service routine. Called with sig == 0 if it has been called
885	+	* as a result of an operator issuing this command, else assume it has been
886	+	* called as a result of the server receiving a HUP signal.
887	+	*/
888	+	void
889	+	conf_rehash(int sig)
890	+	{
891	+	if (sig)
892	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
893	+	"Got signal SIGHUP, reloading configuration file(s)");
894	+
895	+	restart_resolver();
896	+
897	+	/* don't close listeners until we know we can go ahead with the rehash */
898	+
899	+	read_conf_files(0);
900	+
901	+	load_conf_modules();
902	+	check_conf_klines();
903	+	}
904	+
905		/* lookup_confhost()
906		*
907		* start DNS lookups of all hostnames in the conf
#	Line 1001 | Line 950 | int
950		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
951		{
952		struct ip_entry *ip_found = NULL;
953	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
1005	<
1006	<	/* DLINE exempt also gets you out of static limits/pacing... */
1007	<	if (conf && (conf->type == CONF_EXEMPT))
1008	<	return 0;
953	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
954
955		if (conf)
956	+	{
957	+	/* DLINE exempt also gets you out of static limits/pacing... */
958	+	if (conf->type == CONF_EXEMPT)
959	+	return 0;
960		return BANNED_CLIENT;
961	+	}
962
963		ip_found = ipcache_find_or_add_address(addr);
964
#	Line 1026 | Line 976 | conf_connect_allowed(struct irc_ssaddr *
976		return 0;
977		}
978
1029	–	/* cleanup_tklines()
1030	–	*
1031	–	* inputs       - NONE
1032	–	* output       - NONE
1033	–	* side effects - call function to expire temporary k/d lines
1034	–	*                This is an event started off in ircd.c
1035	–	*/
1036	–	void
1037	–	cleanup_tklines(void *unused)
1038	–	{
1039	–	hostmask_expire_temporary();
1040	–	expire_tklines(&xconf_items);
1041	–	expire_tklines(&nresv_items);
1042	–	expire_tklines(&cresv_items);
1043	–	}
1044	–
979		/* expire_tklines()
980		*
981		* inputs       - tkline list pointer
#	Line 1060 | Line 994 | expire_tklines(dlink_list *list)
994		if (!conf->until || conf->until > CurrentTime)
995		continue;
996
997	<	if (conf->type == CONF_XLINE)
998	<	{
999	<	if (ConfigGeneral.tkline_expire_notices)
1000	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1067	<	"Temporary X-line for [%s] expired", conf->name);
1068	<	conf_free(conf);
1069	<	}
1070	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1071	<	{
1072	<	if (ConfigGeneral.tkline_expire_notices)
1073	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1074	<	"Temporary RESV for [%s] expired", conf->name);
1075	<	conf_free(conf);
1076	<	}
997	>	if (ConfigGeneral.tkline_expire_notices)
998	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
999	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1000	>	conf_free(conf);
1001		}
1002		}
1003
1004	+	/* cleanup_tklines()
1005	+	*
1006	+	* inputs       - NONE
1007	+	* output       - NONE
1008	+	* side effects - call function to expire temporary k/d lines
1009	+	*                This is an event started off in ircd.c
1010	+	*/
1011	+	void
1012	+	cleanup_tklines(void *unused)
1013	+	{
1014	+	hostmask_expire_temporary();
1015	+	expire_tklines(&gecos_items);
1016	+	expire_tklines(&nresv_items);
1017	+	expire_tklines(&cresv_items);
1018	+	}
1019	+
1020		/* oper_privs_as_string()
1021		*
1022		* inputs        - pointer to client_p
#	Line 1089 | Line 1029 | static const struct oper_privs
1029		const unsigned char c;
1030		} flag_list[] = {
1031		{ OPER_FLAG_ADMIN,          'A' },
1032	<	{ OPER_FLAG_REMOTEBAN,      'B' },
1033	<	{ OPER_FLAG_DIE,            'D' },
1034	<	{ OPER_FLAG_GLINE,          'G' },
1035	<	{ OPER_FLAG_REHASH,         'H' },
1032	>	{ OPER_FLAG_CLOSE,          'B' },
1033	>	{ OPER_FLAG_CONNECT,        'C' },
1034	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
1035	>	{ OPER_FLAG_DIE,            'E' },
1036	>	{ OPER_FLAG_DLINE,          'F' },
1037	>	{ OPER_FLAG_GLOBOPS,        'G' },
1038	>	{ OPER_FLAG_JOIN_RESV,      'H' },
1039	>	{ OPER_FLAG_KILL,           'I' },
1040	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
1041		{ OPER_FLAG_KLINE,          'K' },
1042	<	{ OPER_FLAG_KILL,           'N' },
1043	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
1044	<	{ OPER_FLAG_CONNECT,        'P' },
1045	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1046	<	{ OPER_FLAG_SQUIT,          'R' },
1047	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1048	<	{ OPER_FLAG_UNKLINE,        'U' },
1049	<	{ OPER_FLAG_XLINE,          'X' },
1042	>	{ OPER_FLAG_LOCOPS,         'L' },
1043	>	{ OPER_FLAG_MODULE,         'M' },
1044	>	{ OPER_FLAG_NICK_RESV,      'N' },
1045	>	{ OPER_FLAG_OPME,           'O' },
1046	>	{ OPER_FLAG_REHASH,         'P' },
1047	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
1048	>	{ OPER_FLAG_RESTART,        'R' },
1049	>	{ OPER_FLAG_RESV,           'S' },
1050	>	{ OPER_FLAG_SET,            'T' },
1051	>	{ OPER_FLAG_SQUIT,          'U' },
1052	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
1053	>	{ OPER_FLAG_UNDLINE,        'W' },
1054	>	{ OPER_FLAG_UNKLINE,        'X' },
1055	>	{ OPER_FLAG_UNRESV,         'Y' },
1056	>	{ OPER_FLAG_UNXLINE,        'Z' },
1057	>	{ OPER_FLAG_WALLOPS,        'a' },
1058	>	{ OPER_FLAG_XLINE,          'b' },
1059		{ 0, '\0' }
1060		};
1061
1062	<	char *
1062	>	const char *
1063		oper_privs_as_string(const unsigned int port)
1064		{
1065		static char privs_out[IRCD_BUFSIZE];
1066		char *privs_ptr = privs_out;
1067
1068		for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1115	–	{
1069		if (port & opriv->flag)
1070		*privs_ptr++ = opriv->c;
1071	<	else
1072	<	*privs_ptr++ = ToLower(opriv->c);
1073	<	}
1071	>
1072	>	if (privs_ptr == privs_out)
1073	>	*privs_ptr++ = '0';
1074
1075		*privs_ptr = '\0';
1076
#	Line 1133 | Line 1086 | oper_privs_as_string(const unsigned int
1086		const char *
1087		get_oper_name(const struct Client *client_p)
1088		{
1089	<	const dlink_node *cnode = NULL;
1137	<	/* +5 for !,@,{,} and null */
1138	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1089	>	static char buffer[IRCD_BUFSIZE];
1090
1091		if (IsServer(client_p))
1092		return client_p->name;
1093
1094		if (MyConnect(client_p))
1095		{
1096	<	if ((cnode = client_p->connection->confs.head))
1096	>	const dlink_node *const node = client_p->connection->confs.head;
1097	>
1098	>	if (node)
1099		{
1100	<	const struct MaskItem *conf = cnode->data;
1100	>	const struct MaskItem *const conf = node->data;
1101
1102	<	if (IsConfOperator(conf))
1102	>	if (conf->type == CONF_OPER)
1103		{
1104		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1105		client_p->username, client_p->host, conf->name);
#	Line 1166 | Line 1119 | get_oper_name(const struct Client *clien
1119		return buffer;
1120		}
1121
1169	–	/* read_conf_files()
1170	–	*
1171	–	* inputs       - cold start YES or NO
1172	–	* output       - none
1173	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1174	–	*/
1175	–	void
1176	–	read_conf_files(int cold)
1177	–	{
1178	–	const char *filename = NULL;
1179	–	char chanmodes[IRCD_BUFSIZE] = "";
1180	–	char chanlimit[IRCD_BUFSIZE] = "";
1181	–
1182	–	conf_parser_ctx.boot = cold;
1183	–	filename = ConfigGeneral.configfile;
1184	–
1185	–	/* We need to know the initial filename for the yyerror() to report
1186	–	FIXME: The full path is in conffilenamebuf first time since we
1187	–	don't know anything else
1188	–
1189	–	- Gozem 2002-07-21
1190	–	*/
1191	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1192	–
1193	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1194	–	{
1195	–	if (cold)
1196	–	{
1197	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1198	–	filename, strerror(errno));
1199	–	exit(-1);
1200	–	}
1201	–	else
1202	–	{
1203	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1204	–	"Unable to read configuration file '%s': %s",
1205	–	filename, strerror(errno));
1206	–	return;
1207	–	}
1208	–	}
1209	–
1210	–	if (!cold)
1211	–	clear_out_old_conf();
1212	–
1213	–	read_conf(conf_parser_ctx.conf_file);
1214	–	fclose(conf_parser_ctx.conf_file);
1215	–
1216	–	log_reopen_all();
1217	–
1218	–	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1219	–	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1220	–
1221	–	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1222	–	add_isupport("MAXLIST", chanmodes, -1);
1223	–	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1224	–	add_isupport("CHANTYPES", "#", -1);
1225	–
1226	–	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1227	–	ConfigChannel.max_channels);
1228	–	add_isupport("CHANLIMIT", chanlimit, -1);
1229	–	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1230	–	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1231	–	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1232	–	add_isupport("CHANMODES", chanmodes, -1);
1233	–
1234	–	/*
1235	–	* message_locale may have changed.  rebuild isupport since it relies
1236	–	* on strlen(form_str(RPL_ISUPPORT))
1237	–	*/
1238	–	rebuild_isupport_message_line();
1239	–	}
1240	–
1122		/* clear_out_old_conf()
1123		*
1124		* inputs       - none
#	Line 1249 | Line 1130 | clear_out_old_conf(void)
1130		{
1131		dlink_node *node = NULL, *node_next = NULL;
1132		dlink_list *free_items [] = {
1133	<	&server_items,   &oconf_items,
1134	<	&uconf_items,   &xconf_items,
1133	>	&server_items,   &operator_items,
1134	>	&shared_items,   &gecos_items,
1135		&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1136		};
1137
#	Line 1260 | Line 1141 | clear_out_old_conf(void)
1141		* Resetting structs, etc, is taken care of by set_default_conf().
1142		*/
1143
1144	<	for (; *iterator != NULL; iterator++)
1144	>	for (; *iterator; iterator++)
1145		{
1146		DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1147		{
1148		struct MaskItem *conf = node->data;
1149
1150		conf->active = 0;
1270	–	dlinkDelete(&conf->node, *iterator);
1151
1152	<	/* XXX This is less than pretty */
1273	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1152	>	if (!IsConfDatabase(conf))
1153		{
1154	+	dlinkDelete(&conf->node, *iterator);
1155	+
1156		if (!conf->ref_count)
1157		conf_free(conf);
1158		}
1278	–	else if (conf->type == CONF_XLINE)
1279	–	{
1280	–	if (!conf->until)
1281	–	conf_free(conf);
1282	–	}
1283	–	else
1284	–	conf_free(conf);
1159		}
1160		}
1161
1162		motd_clear();
1163
1164		/*
1165	<	* don't delete the class table, rather mark all entries
1166	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1165	>	* Don't delete the class table, rather mark all entries for deletion.
1166	>	* The table is cleaned up by class_delete_marked. - avalon
1167		*/
1168		class_mark_for_deletion();
1169
1170		clear_out_address_conf();
1171
1172	<	/* clean out module paths */
1172	>	/* Clean out module paths */
1173		mod_clear_paths();
1174
1175		pseudo_clear();
1176
1177	<	/* clean out ConfigServerInfo */
1178	<	MyFree(ConfigServerInfo.description);
1177	>	/* Clean out ConfigServerInfo */
1178	>	xfree(ConfigServerInfo.description);
1179		ConfigServerInfo.description = NULL;
1180	<	MyFree(ConfigServerInfo.network_name);
1180	>	xfree(ConfigServerInfo.network_name);
1181		ConfigServerInfo.network_name = NULL;
1182	<	MyFree(ConfigServerInfo.network_desc);
1182	>	xfree(ConfigServerInfo.network_desc);
1183		ConfigServerInfo.network_desc = NULL;
1310	–	#ifdef HAVE_LIBCRYPTO
1311	–	if (ConfigServerInfo.rsa_private_key)
1312	–	{
1313	–	RSA_free(ConfigServerInfo.rsa_private_key);
1314	–	ConfigServerInfo.rsa_private_key = NULL;
1315	–	}
1184
1185	<	MyFree(ConfigServerInfo.rsa_private_key_file);
1185	>	xfree(ConfigServerInfo.rsa_private_key_file);
1186		ConfigServerInfo.rsa_private_key_file = NULL;
1187	<	#endif
1187	>	xfree(ConfigServerInfo.ssl_certificate_file);
1188	>	ConfigServerInfo.ssl_certificate_file = NULL;
1189	>	xfree(ConfigServerInfo.ssl_dh_param_file);
1190	>	ConfigServerInfo.ssl_dh_param_file = NULL;
1191	>	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
1192	>	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
1193	>	xfree(ConfigServerInfo.ssl_cipher_list);
1194	>	ConfigServerInfo.ssl_cipher_list = NULL;
1195	>	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
1196	>	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
1197
1198	<	/* clean out ConfigAdminInfo */
1199	<	MyFree(ConfigAdminInfo.name);
1198	>	/* Clean out ConfigAdminInfo */
1199	>	xfree(ConfigAdminInfo.name);
1200		ConfigAdminInfo.name = NULL;
1201	<	MyFree(ConfigAdminInfo.email);
1201	>	xfree(ConfigAdminInfo.email);
1202		ConfigAdminInfo.email = NULL;
1203	<	MyFree(ConfigAdminInfo.description);
1203	>	xfree(ConfigAdminInfo.description);
1204		ConfigAdminInfo.description = NULL;
1205
1206	<	/* clean out listeners */
1207	<	close_listeners();
1206	>	xfree(ConfigServerHide.flatten_links_file);
1207	>	ConfigServerHide.flatten_links_file = NULL;
1208	>
1209	>	/* Clean out listeners */
1210	>	listener_close_marked();
1211	>	}
1212	>
1213	>	static void
1214	>	conf_handle_tls(int cold)
1215	>	{
1216	>	if (!tls_new_cred())
1217	>	{
1218	>	if (cold)
1219	>	{
1220	>	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1221	>	exit(-1);
1222	>	}
1223	>	else
1224	>	{
1225	>	/* Failed to load new settings/certs, old ones remain active */
1226	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1227	>	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1228	>	}
1229	>	}
1230	>	}
1231	>
1232	>	/* read_conf_files()
1233	>	*
1234	>	* inputs       - cold start YES or NO
1235	>	* output       - none
1236	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1237	>	*/
1238	>	void
1239	>	read_conf_files(int cold)
1240	>	{
1241	>	const char *filename = NULL;
1242	>	char chanmodes[IRCD_BUFSIZE] = "";
1243	>	char chanlimit[IRCD_BUFSIZE] = "";
1244	>
1245	>	conf_parser_ctx.boot = cold;
1246	>	filename = ConfigGeneral.configfile;
1247	>
1248	>	/* We need to know the initial filename for the yyerror() to report
1249	>	FIXME: The full path is in conffilenamebuf first time since we
1250	>	don't know anything else
1251	>
1252	>	- Gozem 2002-07-21
1253	>	*/
1254	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1255	>
1256	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1257	>	{
1258	>	if (cold)
1259	>	{
1260	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1261	>	filename, strerror(errno));
1262	>	exit(EXIT_FAILURE);
1263	>	}
1264	>	else
1265	>	{
1266	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1267	>	"Unable to read configuration file '%s': %s",
1268	>	filename, strerror(errno));
1269	>	return;
1270	>	}
1271	>	}
1272	>
1273	>	if (!cold)
1274	>	clear_out_old_conf();
1275	>
1276	>	read_conf(conf_parser_ctx.conf_file);
1277	>	fclose(conf_parser_ctx.conf_file);
1278	>
1279	>	log_reopen_all();
1280	>	conf_handle_tls(cold);
1281	>
1282	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1283	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1284	>
1285	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1286	>	isupport_add("MAXLIST", chanmodes, -1);
1287	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1288	>	isupport_add("CHANTYPES", "#", -1);
1289	>
1290	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1291	>	ConfigChannel.max_channels);
1292	>	isupport_add("CHANLIMIT", chanlimit, -1);
1293	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1294	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1295	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1296	>	isupport_add("CHANMODES", chanmodes, -1);
1297	>
1298	>	/*
1299	>	* message_locale may have changed.  rebuild isupport since it relies
1300	>	* on strlen(form_str(RPL_ISUPPORT))
1301	>	*/
1302	>	isupport_rebuild();
1303		}
1304
1305		/* conf_add_class_to_conf()
#	Line 1337 | Line 1309 | clear_out_old_conf(void)
1309		* side effects - Add a class pointer to a conf
1310		*/
1311		void
1312	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1312	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1313		{
1314	<	if (class_name == NULL)
1314	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1315		{
1316		conf->class = class_default;
1317
1318	<	if (conf->type == CONF_CLIENT)
1319	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1348	<	"Warning *** Defaulting to default class for %s@%s",
1349	<	conf->user, conf->host);
1350	<	else
1351	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1352	<	"Warning *** Defaulting to default class for %s",
1353	<	conf->name);
1354	<	}
1355	<	else
1356	<	conf->class = class_find(class_name, 1);
1357	<
1358	<	if (conf->class == NULL)
1359	<	{
1360	<	if (conf->type == CONF_CLIENT)
1361	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1318	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1319	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1320		"Warning *** Defaulting to default class for %s@%s",
1321		conf->user, conf->host);
1322		else
1323	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1323	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1324		"Warning *** Defaulting to default class for %s",
1325		conf->name);
1368	–	conf->class = class_default;
1326		}
1327		}
1328
#	Line 1384 | Line 1341 | yyerror(const char *msg)
1341		return;
1342
1343		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1344	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1344	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1345		"\"%s\", line %u: %s: %s",
1346		conffilebuf, lineno + 1, msg, newlinebuf);
1347		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1397 | Line 1354 | conf_error_report(const char *msg)
1354		char newlinebuf[IRCD_BUFSIZE];
1355
1356		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1357	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1357	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1358		"\"%s\", line %u: %s: %s",
1359		conffilebuf, lineno + 1, msg, newlinebuf);
1360		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1432 | Line 1389 | valid_tkline(const char *data, const int
1389
1390		/*
1391		* In the degenerate case where oper does a /quote kline 0 user@host :reason
1392	<	* i.e. they specifically use 0, I am going to return 1 instead
1393	<	* as a return value of non-zero is used to flag it as a temporary kline
1392	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1393	>	* value of non-zero is used to flag it as a temporary kline
1394		*/
1395		if (result == 0)
1396		result = 1;
#	Line 1448 | Line 1405 | valid_tkline(const char *data, const int
1405		if (result > MAX_TDKLINE_TIME)
1406		result = MAX_TDKLINE_TIME;
1407
1408	<	result = result * 60;  /* turn it into seconds */
1408	>	result = result * 60;  /* Turn it into seconds */
1409
1410		return result;
1411		}
#	Line 1464 | Line 1421 | valid_wild_card_simple(const char *data)
1421		{
1422		const unsigned char *p = (const unsigned char *)data;
1423		unsigned char tmpch = '\0';
1424	<	unsigned int nonwild = 0;
1424	>	unsigned int nonwild = 0, wild = 0;
1425
1426		while ((tmpch = *p++))
1427		{
#	Line 1479 | Line 1436 | valid_wild_card_simple(const char *data)
1436		if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1437		return 1;
1438		}
1439	+	else
1440	+	++wild;
1441		}
1442
1443	<	return 0;
1443	>	return !wild;
1444		}
1445
1446		/* valid_wild_card()
#	Line 1493 | Line 1452 | valid_wild_card_simple(const char *data)
1452		* side effects - NOTICE is given to source_p if warn is 1
1453		*/
1454		int
1455	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1455	>	valid_wild_card(struct Client *source_p, int count, ...)
1456		{
1457		unsigned char tmpch = '\0';
1458		unsigned int nonwild = 0;
#	Line 1536 | Line 1495 | valid_wild_card(struct Client *source_p,
1495		}
1496		}
1497
1498	<	if (warn)
1498	>	if (IsClient(source_p))
1499		sendto_one_notice(source_p, &me,
1500		":Please include at least %u non-wildcard characters with the mask",
1501		ConfigGeneral.min_nonwildcard);
#	Line 1544 | Line 1503 | valid_wild_card(struct Client *source_p,
1503		return 0;
1504		}
1505
1506	+	/* find_user_host()
1507	+	*
1508	+	* inputs       - pointer to client placing kline
1509	+	*              - pointer to user_host_or_nick
1510	+	*              - pointer to user buffer
1511	+	*              - pointer to host buffer
1512	+	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1513	+	* side effects -
1514	+	*/
1515	+	static int
1516	+	find_user_host(struct Client *source_p, char *user_host_or_nick,
1517	+	char *luser, char *lhost)
1518	+	{
1519	+	struct Client *target_p = NULL;
1520	+	char *hostp = NULL;
1521	+
1522	+	if (lhost == NULL)
1523	+	{
1524	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1525	+	return 1;
1526	+	}
1527	+
1528	+	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1529	+	{
1530	+	/* Explicit user@host mask given */
1531	+	if (hostp)                            /* I'm a little user@host */
1532	+	{
1533	+	*(hostp++) = '\0';                       /* short and squat */
1534	+
1535	+	if (*user_host_or_nick)
1536	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1537	+	else
1538	+	strcpy(luser, "*");
1539	+
1540	+	if (*hostp)
1541	+	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1542	+	else
1543	+	strcpy(lhost, "*");
1544	+	}
1545	+	else
1546	+	{
1547	+	luser[0] = '*';             /* no @ found, assume its *@somehost */
1548	+	luser[1] = '\0';
1549	+	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1550	+	}
1551	+
1552	+	return 1;
1553	+	}
1554	+	else
1555	+	{
1556	+	/* Try to find user@host mask from nick */
1557	+	/* Okay to use source_p as the first param, because source_p == client_p */
1558	+	if ((target_p =
1559	+	find_chasing(source_p, user_host_or_nick)) == NULL)
1560	+	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1561	+
1562	+	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1563	+	{
1564	+	if (IsClient(source_p))
1565	+	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1566	+	return 0;
1567	+	}
1568	+
1569	+	/*
1570	+	* Turn the "user" bit into "*user", blow away '~'
1571	+	* if found in original user name (non-idented)
1572	+	*/
1573	+	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1574	+
1575	+	if (target_p->username[0] == '~')
1576	+	luser[0] = '*';
1577	+
1578	+	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1579	+	return 1;
1580	+	}
1581	+
1582	+	return 0;
1583	+	}
1584	+
1585		/* XXX should this go into a separate file ? -Dianora */
1586		/* parse_aline
1587		*
#	Line 1558 | Line 1596 | valid_wild_card(struct Client *source_p,
1596		*              - pointer to target_server to parse into if non NULL
1597		*              - pointer to reason to parse into
1598		*
1599	<	* output       - 1 if valid, -1 if not valid
1599	>	* output       - 1 if valid, 0 if not valid
1600		* side effects - A generalised k/d/x etc. line parser,
1601		*               "ALINE [time] user@host|string [ON] target :reason"
1602		*                will parse returning a parsed user, host if
#	Line 1581 | Line 1619 | parse_aline(const char *cmd, struct Clie
1619		char **target_server, char **reason)
1620		{
1621		int found_tkline_time=0;
1622	<	static char def_reason[] = CONF_NOREASON;
1622	>	static char default_reason[] = CONF_NOREASON;
1623		static char user[USERLEN*4+1];
1624		static char host[HOSTLEN*4+1];
1625
#	Line 1590 | Line 1628 | parse_aline(const char *cmd, struct Clie
1628
1629		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1630
1631	<	if (found_tkline_time != 0)
1631	>	if (found_tkline_time)
1632		{
1633		parv++;
1634		parc--;
1635
1636	<	if (tkline_time != NULL)
1636	>	if (tkline_time)
1637		*tkline_time = found_tkline_time;
1638		else
1639		{
1640		sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1641	<	return -1;
1641	>	return 0;
1642		}
1643		}
1644
1645		if (parc == 0)
1646		{
1647		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1648	<	return -1;
1648	>	return 0;
1649		}
1650
1651		if (h_p == NULL)
1652		*up_p = *parv;
1653		else
1654		{
1655	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1656	<	return -1;
1655	>	if (find_user_host(source_p, *parv, user, host) == 0)
1656	>	return 0;
1657
1658		*up_p = user;
1659		*h_p = host;
#	Line 1624 | Line 1662 | parse_aline(const char *cmd, struct Clie
1662		parc--;
1663		parv++;
1664
1665	<	if (parc != 0)
1665	>	if (parc)
1666		{
1667		if (irccmp(*parv, "ON") == 0)
1668		{
1669		parc--;
1670		parv++;
1671
1634	–	if (target_server == NULL)
1635	–	{
1636	–	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1637	–	return -1;
1638	–	}
1639	–
1672		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1673		{
1674		sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1675	<	return -1;
1675	>	return 0;
1676		}
1677
1678		if (parc == 0 || EmptyString(*parv))
1679		{
1680		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1681	<	return -1;
1681	>	return 0;
1682		}
1683
1684		*target_server = *parv;
#	Line 1658 | Line 1690 | parse_aline(const char *cmd, struct Clie
1690		/* Make sure target_server *is* NULL if no ON server found
1691		* caller probably NULL'd it first, but no harm to do it again -db
1692		*/
1693	<	if (target_server != NULL)
1693	>	if (target_server)
1694		*target_server = NULL;
1695		}
1696		}
1697
1698	<	if (h_p != NULL)
1698	>	if (h_p)
1699		{
1700	<	if (strchr(user, '!') != NULL)
1700	>	if (strchr(user, '!'))
1701		{
1702		sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1703	<	return -1;
1703	>	return 0;
1704		}
1705
1706	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1707	<	return -1;
1706	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1707	>	return 0;
1708		}
1709		else
1710	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1711	<	return -1;
1710	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1711	>	return 0;
1712
1713	<	if (reason != NULL)
1713	>	if (reason)
1714		{
1715	<	if (parc != 0 && !EmptyString(*parv))
1684	<	{
1715	>	if (parc && !EmptyString(*parv))
1716		*reason = *parv;
1686	–	if (!valid_comment(source_p, *reason, 1))
1687	–	return -1;
1688	–	}
1689	–	else
1690	–	*reason = def_reason;
1691	–	}
1692	–
1693	–	return 1;
1694	–	}
1695	–
1696	–	/* find_user_host()
1697	–	*
1698	–	* inputs       - pointer to client placing kline
1699	–	*              - pointer to user_host_or_nick
1700	–	*              - pointer to user buffer
1701	–	*              - pointer to host buffer
1702	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1703	–	* side effects -
1704	–	*/
1705	–	static int
1706	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
1707	–	char *luser, char *lhost, unsigned int flags)
1708	–	{
1709	–	struct Client *target_p = NULL;
1710	–	char *hostp = NULL;
1711	–
1712	–	if (lhost == NULL)
1713	–	{
1714	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1715	–	return 1;
1716	–	}
1717	–
1718	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1719	–	{
1720	–	/* Explicit user@host mask given */
1721	–
1722	–	if (hostp != NULL)                            /* I'm a little user@host */
1723	–	{
1724	–	*(hostp++) = '\0';                       /* short and squat */
1725	–	if (*user_host_or_nick)
1726	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1727	–	else
1728	–	strcpy(luser, "*");
1729	–
1730	–	if (*hostp)
1731	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1732	–	else
1733	–	strcpy(lhost, "*");
1734	–	}
1717		else
1718	<	{
1737	<	luser[0] = '*';             /* no @ found, assume its *@somehost */
1738	<	luser[1] = '\0';
1739	<	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1740	<	}
1741	<
1742	<	return 1;
1743	<	}
1744	<	else
1745	<	{
1746	<	/* Try to find user@host mask from nick */
1747	<	/* Okay to use source_p as the first param, because source_p == client_p */
1748	<	if ((target_p =
1749	<	find_chasing(source_p, user_host_or_nick)) == NULL)
1750	<	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1751	<
1752	<	if (IsExemptKline(target_p))
1753	<	{
1754	<	if (IsClient(source_p))
1755	<	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1756	<	return 0;
1757	<	}
1758	<
1759	<	/*
1760	<	* turn the "user" bit into "*user", blow away '~'
1761	<	* if found in original user name (non-idented)
1762	<	*/
1763	<	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1764	<
1765	<	if (target_p->username[0] == '~')
1766	<	luser[0] = '*';
1767	<
1768	<	if (!strcmp(target_p->sockhost, "0"))
1769	<	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1770	<	else
1771	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1772	<	return 1;
1718	>	*reason = default_reason;
1719		}
1720
1775	–	return 0;
1776	–	}
1777	–
1778	–	/* valid_comment()
1779	–	*
1780	–	* inputs       - pointer to client
1781	–	*              - pointer to comment
1782	–	* output       - 0 if no valid comment,
1783	–	*              - 1 if valid
1784	–	* side effects - truncates reason where necessary
1785	–	*/
1786	–	int
1787	–	valid_comment(struct Client *source_p, char *comment, int warn)
1788	–	{
1789	–	if (strlen(comment) > REASONLEN)
1790	–	comment[REASONLEN-1] = '\0';
1791	–
1721		return 1;
1722		}
1723
#	Line 1820 | Line 1749 | match_conf_password(const char *password
1749		*
1750		* inputs       - client sending the cluster
1751		*              - command name "KLINE" "XLINE" etc.
1752	<	*              - capab -- CAP_KLN etc. from server.h
1752	>	*              - capab -- CAPAB_KLN etc. from server.h
1753		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1754		*              - pattern and args to send along
1755		* output       - none
#	Line 1828 | Line 1757 | match_conf_password(const char *password
1757		*                along to all servers that match capab and cluster type
1758		*/
1759		void
1760	<	cluster_a_line(struct Client *source_p, const char *command,
1761	<	int capab, int cluster_type, const char *pattern, ...)
1760	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1761	>	unsigned int cluster_type, const char *pattern, ...)
1762		{
1763		va_list args;
1764		char buffer[IRCD_BUFSIZE] = "";
#	Line 1844 | Line 1773 | cluster_a_line(struct Client *source_p,
1773		const struct MaskItem *conf = node->data;
1774
1775		if (conf->flags & cluster_type)
1776	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1776	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1777		"%s %s %s", command, conf->name, buffer);
1778		}
1779		}
#	Line 1884 | Line 1813 | split_nuh(struct split_nuh_item *const i
1813
1814		if (iptr->nickptr)
1815		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1816	+
1817		if (iptr->userptr)
1818		strlcpy(iptr->userptr, "*", iptr->usersize);
1819	+
1820		if (iptr->hostptr)
1821		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1822
#	Line 1928 | Line 1859 | split_nuh(struct split_nuh_item *const i
1859		}
1860		else
1861		{
1862	<	/* no @ found */
1862	>	/* No @ found */
1863		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1864		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1865		else

Diff Legend

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