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 4343 by michael, Sat Aug 2 16:58:33 2014 UTC vs.
Revision 6441 by michael, Thu Aug 27 17:04:15 2015 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-2015 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 15 | 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
20		*/
21
#	Line 28 | Line 28
28		#include "list.h"
29		#include "ircd_defs.h"
30		#include "conf.h"
31	+	#include "conf_pseudo.h"
32		#include "server.h"
33		#include "resv.h"
34		#include "channel.h"
#	Line 54 | 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 oconf_items;
74	>	dlink_list uconf_items;
75	>	dlink_list xconf_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
74	–	/* internally defined functions */
75	–	static void read_conf(FILE *);
76	–	static void clear_out_old_conf(void);
77	–	static void expire_tklines(dlink_list *);
78	–	static int verify_access(struct Client *);
79	–	static int attach_iline(struct Client *, struct MaskItem *);
80	–	static dlink_list *map_to_list(enum maskitem_type);
81	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
82	–
84
85		/* conf_dns_callback()
86		*
#	Line 92 | Line 93 | static int find_user_host(struct Client
93		* if successful save hp in the conf item it was called with
94		*/
95		static void
96	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
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 113 | 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)
117	>	if (conf->dns_pending)
118	>	return;
119	>
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	<	conf->dns_pending = 1;
140	<	gethost_byname(conf_dns_callback, conf, conf->host);
139	>	case CONF_XLINE:
140	>	return &xconf_items;
141	>	break;
142	>	case CONF_ULINE:
143	>	return &uconf_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 &oconf_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 = MyCalloc(sizeof(*conf));
172		dlink_list *list = NULL;
173
174		conf->type   = type;
#	Line 138 | Line 183 | conf_make(enum maskitem_type type)
183		void
184		conf_free(struct MaskItem *conf)
185		{
186	<	dlink_node *ptr = NULL, *ptr_next = NULL;
186	>	dlink_node *node = NULL, *node_next = NULL;
187		dlink_list *list = NULL;
188
189	<	if (conf->node.next)
190	<	if ((list = map_to_list(conf->type)))
146	<	dlinkDelete(&conf->node, list);
189	>	if ((list = map_to_list(conf->type)))
190	>	dlinkFindDelete(list, conf);
191
192		MyFree(conf->name);
193
#	Line 160 | Line 204 | conf_free(struct MaskItem *conf)
204		MyFree(conf->spasswd);
205		MyFree(conf->reason);
206		MyFree(conf->certfp);
207	+	MyFree(conf->whois);
208		MyFree(conf->user);
209		MyFree(conf->host);
210		#ifdef HAVE_LIBCRYPTO
#	Line 168 | Line 213 | conf_free(struct MaskItem *conf)
213		if (conf->rsa_public_key)
214		RSA_free(conf->rsa_public_key);
215		#endif
216	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
216	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
217		{
218	<	MyFree(ptr->data);
219	<	dlinkDelete(ptr, &conf->hub_list);
220	<	free_dlink_node(ptr);
218	>	MyFree(node->data);
219	>	dlinkDelete(node, &conf->hub_list);
220	>	free_dlink_node(node);
221		}
222
223	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
223	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
224		{
225	<	MyFree(ptr->data);
226	<	dlinkDelete(ptr, &conf->leaf_list);
227	<	free_dlink_node(ptr);
225	>	MyFree(node->data);
226	>	dlinkDelete(node, &conf->leaf_list);
227	>	free_dlink_node(node);
228		}
229
230	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
230	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
231		{
232	<	struct exempt *exptr = ptr->data;
232	>	struct exempt *exptr = node->data;
233
234	<	dlinkDelete(ptr, &conf->exempt_list);
234	>	dlinkDelete(node, &conf->exempt_list);
235		MyFree(exptr->name);
236		MyFree(exptr->user);
237		MyFree(exptr->host);
#	Line 196 | Line 241 | conf_free(struct MaskItem *conf)
241		MyFree(conf);
242		}
243
244	+	/* attach_iline()
245	+	*
246	+	* inputs       - client pointer
247	+	*              - conf pointer
248	+	* output       -
249	+	* side effects - do actual attach
250	+	*/
251	+	static int
252	+	attach_iline(struct Client *client_p, struct MaskItem *conf)
253	+	{
254	+	const struct ClassItem *const class = conf->class;
255	+	struct ip_entry *ip_found;
256	+	int a_limit_reached = 0;
257	+	unsigned int local = 0, global = 0, ident = 0;
258	+
259	+	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
260	+	ip_found->count++;
261	+	AddFlag(client_p, FLAGS_IPHASH);
262	+
263	+	userhost_count(client_p->username, client_p->host,
264	+	&global, &local, &ident);
265	+
266	+	/* XXX blah. go down checking the various silly limits
267	+	* setting a_limit_reached if any limit is reached.
268	+	* - Dianora
269	+	*/
270	+	if (class->max_total && class->ref_count >= class->max_total)
271	+	a_limit_reached = 1;
272	+	else if (class->max_perip && ip_found->count > class->max_perip)
273	+	a_limit_reached = 1;
274	+	else if (class->max_local && local >= class->max_local)
275	+	a_limit_reached = 1;
276	+	else if (class->max_global && global >= class->max_global)
277	+	a_limit_reached = 1;
278	+	else if (class->max_ident && ident >= class->max_ident &&
279	+	client_p->username[0] != '~')
280	+	a_limit_reached = 1;
281	+
282	+	if (a_limit_reached)
283	+	{
284	+	if (!IsConfExemptLimits(conf))
285	+	return TOO_MANY;   /* Already at maximum allowed */
286	+
287	+	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
288	+	"but you have exceed_limit = yes;");
289	+	}
290	+
291	+	return attach_conf(client_p, conf);
292	+	}
293	+
294	+	/* verify_access()
295	+	*
296	+	* inputs       - pointer to client to verify
297	+	* output       - 0 if success -'ve if not
298	+	* side effect  - find the first (best) I line to attach.
299	+	*/
300	+	static int
301	+	verify_access(struct Client *client_p)
302	+	{
303	+	struct MaskItem *conf = NULL;
304	+
305	+	if (HasFlag(client_p, FLAGS_GOTID))
306	+	{
307	+	conf = find_address_conf(client_p->host, client_p->username,
308	+	&client_p->connection->ip,
309	+	client_p->connection->aftype,
310	+	client_p->connection->password);
311	+	}
312	+	else
313	+	{
314	+	char non_ident[USERLEN + 1] = "~";
315	+
316	+	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
317	+	conf = find_address_conf(client_p->host, non_ident,
318	+	&client_p->connection->ip,
319	+	client_p->connection->aftype,
320	+	client_p->connection->password);
321	+	}
322	+
323	+	if (!conf)
324	+	return NOT_AUTHORIZED;
325	+
326	+	assert(IsConfClient(conf) || IsConfKill(conf));
327	+
328	+	if (IsConfClient(conf))
329	+	{
330	+	if (IsConfRedir(conf))
331	+	{
332	+	sendto_one_numeric(client_p, &me, RPL_REDIR,
333	+	conf->name ? conf->name : "",
334	+	conf->port);
335	+	return NOT_AUTHORIZED;
336	+	}
337	+
338	+	if (IsConfDoSpoofIp(conf))
339	+	{
340	+	if (IsConfSpoofNotice(conf))
341	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
342	+	client_p->name, client_p->host, conf->name);
343	+
344	+	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
345	+	}
346	+
347	+	return attach_iline(client_p, conf);
348	+	}
349	+
350	+	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
351	+	return BANNED_CLIENT;
352	+	}
353	+
354		/* check_client()
355		*
356		* inputs       - pointer to client
#	Line 233 | Line 388 | check_client(struct Client *source_p)
388
389		case I_LINE_FULL:
390		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
391	<	"auth{} block is full for %s (%s).",
391	>	"auth {} block is full for %s (%s).",
392		get_client_name(source_p, SHOW_IP),
393		source_p->sockhost);
394		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
#	Line 243 | Line 398 | check_client(struct Client *source_p)
398		break;
399
400		case NOT_AUTHORIZED:
246	–	++ServerStats.is_ref;
401		/* jdc - lists server name & port connections are on */
402		/*       a purely cosmetical change */
403		sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
404		"Unauthorized client connection from %s [%s] on [%s/%u].",
405		get_client_name(source_p, SHOW_IP),
406		source_p->sockhost,
407	<	source_p->localClient->listener->name,
408	<	source_p->localClient->listener->port);
409	<	ilog(LOG_TYPE_IRCD,
256	<	"Unauthorized client connection from %s on [%s/%u].",
407	>	source_p->connection->listener->name,
408	>	source_p->connection->listener->port);
409	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
410		get_client_name(source_p, SHOW_IP),
411	<	source_p->localClient->listener->name,
412	<	source_p->localClient->listener->port);
411	>	source_p->connection->listener->name,
412	>	source_p->connection->listener->port);
413
414	+	++ServerStats.is_ref;
415		exit_client(source_p, "You are not authorized to use this server");
416		break;
417
418	<	case BANNED_CLIENT:
419	<	exit_client(source_p, "Banned");
420	<	++ServerStats.is_ref;
421	<	break;
268	<
269	<	case 0:
270	<	default:
271	<	break;
272	<	}
273	<
274	<	return (i < 0 ? 0 : 1);
275	<	}
276	<
277	<	/* verify_access()
278	<	*
279	<	* inputs       - pointer to client to verify
280	<	* output       - 0 if success -'ve if not
281	<	* side effect  - find the first (best) I line to attach.
282	<	*/
283	<	static int
284	<	verify_access(struct Client *client_p)
285	<	{
286	<	struct MaskItem *conf = NULL;
287	<	char non_ident[USERLEN + 1] = "~";
288	<
289	<	if (IsGotId(client_p))
290	<	{
291	<	conf = find_address_conf(client_p->host, client_p->username,
292	<	&client_p->localClient->ip,
293	<	client_p->localClient->aftype,
294	<	client_p->localClient->passwd);
295	<	}
296	<	else
297	<	{
298	<	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
299	<	conf = find_address_conf(client_p->host,non_ident,
300	<	&client_p->localClient->ip,
301	<	client_p->localClient->aftype,
302	<	client_p->localClient->passwd);
303	<	}
304	<
305	<	if (conf)
306	<	{
307	<	if (IsConfClient(conf))
308	<	{
309	<	if (IsConfRedir(conf))
310	<	{
311	<	sendto_one_numeric(client_p, &me, RPL_REDIR,
312	<	conf->name ? conf->name : "",
313	<	conf->port);
314	<	return NOT_AUTHORIZED;
315	<	}
316	<
317	<	if (IsConfDoIdentd(conf))
318	<	SetNeedId(client_p);
319	<
320	<	/* Thanks for spoof idea amm */
321	<	if (IsConfDoSpoofIp(conf))
322	<	{
323	<	if (!ConfigGeneral.hide_spoof_ips && IsConfSpoofNotice(conf))
324	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
325	<	"%s spoofing: %s as %s",
326	<	client_p->name, client_p->host, conf->name);
327	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
328	<	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
329	<	}
330	<
331	<	return attach_iline(client_p, conf);
332	<	}
333	<	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
334	<	{
335	<	if (IsConfGline(conf))
336	<	sendto_one_notice(client_p, &me, ":*** G-lined");
337	<	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
338	<	return BANNED_CLIENT;
339	<	}
340	<	}
341	<
342	<	return NOT_AUTHORIZED;
343	<	}
344	<
345	<	/* attach_iline()
346	<	*
347	<	* inputs       - client pointer
348	<	*              - conf pointer
349	<	* output       -
350	<	* side effects - do actual attach
351	<	*/
352	<	static int
353	<	attach_iline(struct Client *client_p, struct MaskItem *conf)
354	<	{
355	<	const struct ClassItem *class = conf->class;
356	<	struct ip_entry *ip_found;
357	<	int a_limit_reached = 0;
358	<	unsigned int local = 0, global = 0, ident = 0;
359	<
360	<	ip_found = ipcache_find_or_add_address(&client_p->localClient->ip);
361	<	ip_found->count++;
362	<	SetIpHash(client_p);
363	<
364	<	count_user_host(client_p->username, client_p->host,
365	<	&global, &local, &ident);
366	<
367	<	/* XXX blah. go down checking the various silly limits
368	<	* setting a_limit_reached if any limit is reached.
369	<	* - Dianora
370	<	*/
371	<	if (class->max_total && class->ref_count >= class->max_total)
372	<	a_limit_reached = 1;
373	<	else if (class->max_perip && ip_found->count > class->max_perip)
374	<	a_limit_reached = 1;
375	<	else if (class->max_local && local >= class->max_local)
376	<	a_limit_reached = 1;
377	<	else if (class->max_global && global >= class->max_global)
378	<	a_limit_reached = 1;
379	<	else if (class->max_ident && ident >= class->max_ident &&
380	<	client_p->username[0] != '~')
381	<	a_limit_reached = 1;
382	<
383	<	if (a_limit_reached)
384	<	{
385	<	if (!IsConfExemptLimits(conf))
386	<	return TOO_MANY;   /* Already at maximum allowed */
418	>	case BANNED_CLIENT:
419	>	++ServerStats.is_ref;
420	>	exit_client(source_p, "Banned");
421	>	break;
422
423	<	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
424	<	"but you have exceed_limit = yes;");
423	>	case 0:
424	>	default:
425	>	break;
426		}
427
428	<	return attach_conf(client_p, conf);
428	>	return !(i < 0);
429		}
430
431		/* detach_conf()
#	Line 403 | Line 439 | attach_iline(struct Client *client_p, st
439		void
440		detach_conf(struct Client *client_p, enum maskitem_type type)
441		{
442	<	dlink_node *ptr = NULL, *ptr_next = NULL;
442	>	dlink_node *node = NULL, *node_next = NULL;
443
444	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->confs.head)
444	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
445		{
446	<	struct MaskItem *conf = ptr->data;
446	>	struct MaskItem *conf = node->data;
447
448		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
449		assert(conf->ref_count > 0);
#	Line 416 | Line 452 | detach_conf(struct Client *client_p, enu
452		if (!(conf->type & type))
453		continue;
454
455	<	dlinkDelete(ptr, &client_p->localClient->confs);
456	<	free_dlink_node(ptr);
455	>	dlinkDelete(node, &client_p->connection->confs);
456	>	free_dlink_node(node);
457
458		if (conf->type == CONF_CLIENT)
459	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
459	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
460
461		if (--conf->class->ref_count == 0 && conf->class->active == 0)
462		{
#	Line 446 | Line 482 | detach_conf(struct Client *client_p, enu
482		int
483		attach_conf(struct Client *client_p, struct MaskItem *conf)
484		{
485	<	if (dlinkFind(&client_p->localClient->confs, conf))
485	>	if (dlinkFind(&client_p->connection->confs, conf))
486		return 1;
487
488		if (conf->type == CONF_CLIENT)
489		if (cidr_limit_reached(IsConfExemptLimits(conf),
490	<	&client_p->localClient->ip, conf->class))
490	>	&client_p->connection->ip, conf->class))
491		return TOO_MANY;    /* Already at maximum allowed */
492
493		conf->class->ref_count++;
494		conf->ref_count++;
495
496	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
496	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
497
498		return 0;
499		}
#	Line 474 | Line 510 | int
510		attach_connect_block(struct Client *client_p, const char *name,
511		const char *host)
512		{
513	<	dlink_node *ptr;
478	<	struct MaskItem *conf = NULL;
479	<
480	<	assert(client_p != NULL);
481	<	assert(host != NULL);
513	>	dlink_node *node = NULL;
514
515	<	if (client_p == NULL || host == NULL)
484	<	return 0;
515	>	assert(host);
516
517	<	DLINK_FOREACH(ptr, server_items.head)
517	>	DLINK_FOREACH(node, server_items.head)
518		{
519	<	conf = ptr->data;
519	>	struct MaskItem *conf = node->data;
520
521		if (match(conf->name, name) || match(conf->host, host))
522		continue;
523
524		attach_conf(client_p, conf);
525	<	return -1;
525	>	return 1;
526		}
527
528		return 0;
#	Line 509 | Line 540 | attach_connect_block(struct Client *clie
540		struct MaskItem *
541		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
542		{
543	<	dlink_node *ptr;
513	<	struct MaskItem* conf;
543	>	dlink_node *node = NULL;
544
545	<	DLINK_FOREACH(ptr, list->head)
545	>	DLINK_FOREACH(node, list->head)
546		{
547	<	conf = ptr->data;
547	>	struct MaskItem *conf = node->data;
548
549		if (conf->type == type)
550		{
551	<	if (conf->name && (!irccmp(conf->name, name) ||
552	<	!match(conf->name, name)))
523	<	return conf;
551	>	if (conf->name && !irccmp(conf->name, name))
552	>	return conf;
553		}
554		}
555
556		return NULL;
557		}
558
530	–	/* map_to_list()
531	–	*
532	–	* inputs       - ConfType conf
533	–	* output       - pointer to dlink_list to use
534	–	* side effects - none
535	–	*/
536	–	static dlink_list *
537	–	map_to_list(enum maskitem_type type)
538	–	{
539	–	switch(type)
540	–	{
541	–	case CONF_XLINE:
542	–	return(&xconf_items);
543	–	break;
544	–	case CONF_ULINE:
545	–	return(&uconf_items);
546	–	break;
547	–	case CONF_NRESV:
548	–	return(&nresv_items);
549	–	break;
550	–	case CONF_CRESV:
551	–	return(&cresv_items);
552	–	case CONF_OPER:
553	–	return(&oconf_items);
554	–	break;
555	–	case CONF_SERVER:
556	–	return(&server_items);
557	–	break;
558	–	case CONF_SERVICE:
559	–	return(&service_items);
560	–	break;
561	–	case CONF_CLUSTER:
562	–	return(&cluster_items);
563	–	break;
564	–	default:
565	–	return NULL;
566	–	}
567	–	}
568	–
559		/* find_matching_name_conf()
560		*
561		* inputs       - type of link list to look in
#	Line 580 | Line 570 | struct MaskItem *
570		find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
571		const char *host, unsigned int flags)
572		{
573	<	dlink_node *ptr=NULL;
574	<	struct MaskItem *conf=NULL;
575	<	dlink_list *list_p = map_to_list(type);
573	>	dlink_node *node = NULL;
574	>	dlink_list *list = map_to_list(type);
575	>	struct MaskItem *conf = NULL;
576
577		switch (type)
578		{
579		case CONF_SERVICE:
580	<	DLINK_FOREACH(ptr, list_p->head)
580	>	DLINK_FOREACH(node, list->head)
581		{
582	<	conf = ptr->data;
582	>	conf = node->data;
583
584		if (EmptyString(conf->name))
585		continue;
586	<	if ((name != NULL) && !irccmp(name, conf->name))
586	>	if (name && !irccmp(name, conf->name))
587		return conf;
588		}
589		break;
#	Line 602 | Line 592 | find_matching_name_conf(enum maskitem_ty
592		case CONF_ULINE:
593		case CONF_NRESV:
594		case CONF_CRESV:
595	<	DLINK_FOREACH(ptr, list_p->head)
595	>	DLINK_FOREACH(node, list->head)
596		{
597	<	conf = ptr->data;
597	>	conf = node->data;
598
599		if (EmptyString(conf->name))
600		continue;
601	<	if ((name != NULL) && !match(conf->name, name))
601	>	if (name && !match(conf->name, name))
602		{
603		if ((user == NULL && (host == NULL)))
604		return conf;
#	Line 623 | Line 613 | find_matching_name_conf(enum maskitem_ty
613		break;
614
615		case CONF_SERVER:
616	<	DLINK_FOREACH(ptr, list_p->head)
616	>	DLINK_FOREACH(node, list->head)
617		{
618	<	conf = ptr->data;
618	>	conf = node->data;
619
620	<	if ((name != NULL) && !match(name, conf->name))
620	>	if (name && !match(name, conf->name))
621		return conf;
622	<	else if ((host != NULL) && !match(host, conf->host))
622	>	if (host && !match(host, conf->host))
623		return conf;
624		}
625		break;
#	Line 653 | Line 643 | struct MaskItem *
643		find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
644		const char *user, const char *host)
645		{
646	<	dlink_node *ptr = NULL;
647	<	struct MaskItem *conf;
648	<	dlink_list *list_p = map_to_list(type);
646	>	dlink_node *node = NULL;
647	>	dlink_list *list = map_to_list(type);
648	>	struct MaskItem *conf = NULL;
649
650		switch(type)
651		{
#	Line 664 | Line 654 | find_exact_name_conf(enum maskitem_type
654		case CONF_NRESV:
655		case CONF_CRESV:
656
657	<	DLINK_FOREACH(ptr, list_p->head)
657	>	DLINK_FOREACH(node, list->head)
658		{
659	<	conf = ptr->data;
659	>	conf = node->data;
660
661		if (EmptyString(conf->name))
662		continue;
#	Line 684 | Line 674 | find_exact_name_conf(enum maskitem_type
674		break;
675
676		case CONF_OPER:
677	<	DLINK_FOREACH(ptr, list_p->head)
677	>	DLINK_FOREACH(node, list->head)
678		{
679	<	conf = ptr->data;
679	>	conf = node->data;
680
681		if (EmptyString(conf->name))
682		continue;
#	Line 707 | Line 697 | find_exact_name_conf(enum maskitem_type
697		return conf;
698		break;
699		case HM_IPV4:
700	<	if (who->localClient->aftype == AF_INET)
701	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
700	>	if (who->connection->aftype == AF_INET)
701	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
702		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
703		return conf;
704		break;
715	–	#ifdef IPV6
705		case HM_IPV6:
706	<	if (who->localClient->aftype == AF_INET6)
707	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
706	>	if (who->connection->aftype == AF_INET6)
707	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
708		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
709		return conf;
710		break;
722	–	#endif
711		default:
712		assert(0);
713		}
#	Line 730 | Line 718 | find_exact_name_conf(enum maskitem_type
718		break;
719
720		case CONF_SERVER:
721	<	DLINK_FOREACH(ptr, list_p->head)
721	>	DLINK_FOREACH(node, list->head)
722		{
723	<	conf = ptr->data;
723	>	conf = node->data;
724
725		if (EmptyString(conf->name))
726		continue;
#	Line 757 | Line 745 | find_exact_name_conf(enum maskitem_type
745		return NULL;
746		}
747
760	–	/* rehash()
761	–	*
762	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
763	–	* as a result of an operator issuing this command, else assume it has been
764	–	* called as a result of the server receiving a HUP signal.
765	–	*/
766	–	int
767	–	rehash(int sig)
768	–	{
769	–	if (sig)
770	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
771	–	"Got signal SIGHUP, reloading configuration file(s)");
772	–
773	–	restart_resolver();
774	–
775	–	/* don't close listeners until we know we can go ahead with the rehash */
776	–
777	–	/* Check to see if we magically got(or lost) IPv6 support */
778	–	check_can_use_v6();
779	–
780	–	read_conf_files(0);
781	–
782	–	if (ConfigServerInfo.description)
783	–	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
784	–
785	–	load_conf_modules();
786	–	check_conf_klines();
787	–
788	–	return 0;
789	–	}
790	–
748		/* set_default_conf()
749		*
750		* inputs       - NONE
#	Line 806 | Line 763 | set_default_conf(void)
763		assert(class_default == class_get_list()->tail->data);
764
765		#ifdef HAVE_LIBCRYPTO
766	+	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
767	+	{
768	+	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
769	+
770	+	if (key)
771	+	{
772	+	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
773	+	EC_KEY_free(key);
774	+	}
775	+	}
776	+
777	+	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
778	+	#endif
779	+
780	+	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
781		ConfigServerInfo.message_digest_algorithm = EVP_sha256();
782		ConfigServerInfo.rsa_private_key = NULL;
783		ConfigServerInfo.rsa_private_key_file = NULL;
#	Line 822 | Line 794 | set_default_conf(void)
794		memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
795		ConfigServerInfo.specific_ipv6_vhost = 0;
796
797	<	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
797	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
798		ConfigServerInfo.max_nick_length = 9;
799		ConfigServerInfo.max_topic_length = 80;
800		ConfigServerInfo.hub = 0;
#	Line 843 | Line 815 | set_default_conf(void)
815		ConfigChannel.knock_delay_channel = 60;
816		ConfigChannel.max_channels = 25;
817		ConfigChannel.max_bans = 25;
818	<	ConfigChannel.default_split_user_count = 0;
819	<	ConfigChannel.default_split_server_count = 0;
848	<	ConfigChannel.no_join_on_split = 0;
849	<	ConfigChannel.no_create_on_split = 0;
818	>	ConfigChannel.default_join_flood_count = 18;
819	>	ConfigChannel.default_join_flood_time = 6;
820
821		ConfigServerHide.flatten_links = 0;
822		ConfigServerHide.links_delay = 300;
#	Line 859 | Line 829 | set_default_conf(void)
829
830		ConfigGeneral.away_count = 2;
831		ConfigGeneral.away_time = 10;
862	–	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
832		ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
833		ConfigGeneral.cycle_on_host_change = 1;
834	<	ConfigGeneral.glines = 0;
835	<	ConfigGeneral.gline_time = 12 * 3600;
836	<	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
837	<	ConfigGeneral.gline_min_cidr = 16;
869	<	ConfigGeneral.gline_min_cidr6 = 48;
834	>	ConfigGeneral.dline_min_cidr = 16;
835	>	ConfigGeneral.dline_min_cidr6 = 48;
836	>	ConfigGeneral.kline_min_cidr = 16;
837	>	ConfigGeneral.kline_min_cidr6 = 48;
838		ConfigGeneral.invisible_on_connect = 1;
839		ConfigGeneral.tkline_expire_notices = 1;
872	–	ConfigGeneral.hide_spoof_ips = 1;
840		ConfigGeneral.ignore_bogus_ts = 0;
841		ConfigGeneral.disable_auth = 0;
842		ConfigGeneral.kill_chase_time_limit = 90;
#	Line 887 | Line 854 | set_default_conf(void)
854		ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
855		ConfigGeneral.warn_no_connect_block = 1;
856		ConfigGeneral.stats_e_disabled = 0;
890	–	ConfigGeneral.stats_o_oper_only = 0;
891	–	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
857		ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
858	+	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
859	+	ConfigGeneral.stats_o_oper_only = 1;
860	+	ConfigGeneral.stats_m_oper_only = 1;
861		ConfigGeneral.stats_P_oper_only = 0;
862		ConfigGeneral.stats_u_oper_only = 0;
863		ConfigGeneral.caller_id_wait = 60;
#	Line 899 | Line 867 | set_default_conf(void)
867		ConfigGeneral.short_motd = 0;
868		ConfigGeneral.ping_cookie = 0;
869		ConfigGeneral.no_oper_flood = 0;
902	–	ConfigGeneral.true_no_oper_flood = 0;
870		ConfigGeneral.oper_pass_resv = 1;
871		ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
872	<	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
872	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
873	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
874	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
875		ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
876		ConfigGeneral.throttle_count = 1;
877		ConfigGeneral.throttle_time = 1;
#	Line 917 | Line 886 | validate_conf(void)
886		if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
887		ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
888
889	<	if (ConfigServerInfo.network_name == NULL)
889	>	if (EmptyString(ConfigServerInfo.network_name))
890		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
891
892	<	if (ConfigServerInfo.network_desc == NULL)
892	>	if (EmptyString(ConfigServerInfo.network_desc))
893		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
894
926	–	if (ConfigGeneral.service_name == NULL)
927	–	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
928	–
895		ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
896		}
897
#	Line 953 | Line 919 | read_conf(FILE *file)
919		class_delete_marked();  /* Delete unused classes that are marked for deletion */
920		}
921
922	+	/* conf_rehash()
923	+	*
924	+	* Actual REHASH service routine. Called with sig == 0 if it has been called
925	+	* as a result of an operator issuing this command, else assume it has been
926	+	* called as a result of the server receiving a HUP signal.
927	+	*/
928	+	void
929	+	conf_rehash(int sig)
930	+	{
931	+	if (sig)
932	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
933	+	"Got signal SIGHUP, reloading configuration file(s)");
934	+
935	+	restart_resolver();
936	+
937	+	/* don't close listeners until we know we can go ahead with the rehash */
938	+
939	+	read_conf_files(0);
940	+
941	+	load_conf_modules();
942	+	check_conf_klines();
943	+	}
944	+
945		/* lookup_confhost()
946		*
947		* start DNS lookups of all hostnames in the conf
#	Line 1001 | Line 990 | int
990		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
991		{
992		struct ip_entry *ip_found = NULL;
993	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
993	>	struct MaskItem *const conf = find_dline_conf(addr, aftype);
994
995		/* DLINE exempt also gets you out of static limits/pacing... */
996		if (conf && (conf->type == CONF_EXEMPT))
#	Line 1026 | Line 1015 | conf_connect_allowed(struct irc_ssaddr *
1015		return 0;
1016		}
1017
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 *notused)
1038	–	{
1039	–	hostmask_expire_temporary();
1040	–	expire_tklines(&xconf_items);
1041	–	expire_tklines(&nresv_items);
1042	–	expire_tklines(&cresv_items);
1043	–	}
1044	–
1018		/* expire_tklines()
1019		*
1020		* inputs       - tkline list pointer
#	Line 1049 | Line 1022 | cleanup_tklines(void *notused)
1022		* side effects - expire tklines
1023		*/
1024		static void
1025	<	expire_tklines(dlink_list *tklist)
1025	>	expire_tklines(dlink_list *list)
1026		{
1027	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1055	<	struct MaskItem *conf = NULL;
1027	>	dlink_node *node = NULL, *node_next = NULL;
1028
1029	<	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
1029	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
1030		{
1031	<	conf = ptr->data;
1031	>	struct MaskItem *conf = node->data;
1032
1033		if (!conf->until || conf->until > CurrentTime)
1034		continue;
1035
1036	<	if (conf->type == CONF_XLINE)
1037	<	{
1038	<	if (ConfigGeneral.tkline_expire_notices)
1039	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1068	<	"Temporary X-line for [%s] expired", conf->name);
1069	<	conf_free(conf);
1070	<	}
1071	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1072	<	{
1073	<	if (ConfigGeneral.tkline_expire_notices)
1074	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1075	<	"Temporary RESV for [%s] expired", conf->name);
1076	<	conf_free(conf);
1077	<	}
1036	>	if (ConfigGeneral.tkline_expire_notices)
1037	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
1038	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1039	>	conf_free(conf);
1040		}
1041		}
1042
1043	+	/* cleanup_tklines()
1044	+	*
1045	+	* inputs       - NONE
1046	+	* output       - NONE
1047	+	* side effects - call function to expire temporary k/d lines
1048	+	*                This is an event started off in ircd.c
1049	+	*/
1050	+	void
1051	+	cleanup_tklines(void *unused)
1052	+	{
1053	+	hostmask_expire_temporary();
1054	+	expire_tklines(&xconf_items);
1055	+	expire_tklines(&nresv_items);
1056	+	expire_tklines(&cresv_items);
1057	+	}
1058	+
1059		/* oper_privs_as_string()
1060		*
1061		* inputs        - pointer to client_p
#	Line 1092 | Line 1070 | static const struct oper_privs
1070		{ OPER_FLAG_ADMIN,          'A' },
1071		{ OPER_FLAG_REMOTEBAN,      'B' },
1072		{ OPER_FLAG_DIE,            'D' },
1095	–	{ OPER_FLAG_GLINE,          'G' },
1073		{ OPER_FLAG_REHASH,         'H' },
1074		{ OPER_FLAG_KLINE,          'K' },
1075		{ OPER_FLAG_KILL,           'N' },
#	Line 1106 | Line 1083 | static const struct oper_privs
1083		{ 0, '\0' }
1084		};
1085
1086	<	char *
1086	>	const char *
1087		oper_privs_as_string(const unsigned int port)
1088		{
1089		static char privs_out[IRCD_BUFSIZE];
#	Line 1134 | Line 1111 | oper_privs_as_string(const unsigned int
1111		const char *
1112		get_oper_name(const struct Client *client_p)
1113		{
1114	<	const dlink_node *cnode = NULL;
1115	<	/* +5 for !,@,{,} and null */
1116	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1114	>	static char buffer[IRCD_BUFSIZE];
1115	>
1116	>	if (IsServer(client_p))
1117	>	return client_p->name;
1118
1119		if (MyConnect(client_p))
1120		{
1121	<	if ((cnode = client_p->localClient->confs.head))
1121	>	const dlink_node *const node = client_p->connection->confs.head;
1122	>
1123	>	if (node)
1124		{
1125	<	const struct MaskItem *conf = cnode->data;
1125	>	const struct MaskItem *const conf = node->data;
1126
1127	<	if (IsConfOperator(conf))
1127	>	if (conf->type == CONF_OPER)
1128		{
1129		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1130		client_p->username, client_p->host, conf->name);
#	Line 1164 | Line 1144 | get_oper_name(const struct Client *clien
1144		return buffer;
1145		}
1146
1167	–	/* read_conf_files()
1168	–	*
1169	–	* inputs       - cold start YES or NO
1170	–	* output       - none
1171	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1172	–	*/
1173	–	void
1174	–	read_conf_files(int cold)
1175	–	{
1176	–	const char *filename = NULL;
1177	–	char chanmodes[IRCD_BUFSIZE] = "";
1178	–	char chanlimit[IRCD_BUFSIZE] = "";
1179	–
1180	–	conf_parser_ctx.boot = cold;
1181	–	filename = ConfigGeneral.configfile;
1182	–
1183	–	/* We need to know the initial filename for the yyerror() to report
1184	–	FIXME: The full path is in conffilenamebuf first time since we
1185	–	don't know anything else
1186	–
1187	–	- Gozem 2002-07-21
1188	–	*/
1189	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1190	–
1191	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1192	–	{
1193	–	if (cold)
1194	–	{
1195	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1196	–	filename, strerror(errno));
1197	–	exit(-1);
1198	–	}
1199	–	else
1200	–	{
1201	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1202	–	"Unable to read configuration file '%s': %s",
1203	–	filename, strerror(errno));
1204	–	return;
1205	–	}
1206	–	}
1207	–
1208	–	if (!cold)
1209	–	clear_out_old_conf();
1210	–
1211	–	read_conf(conf_parser_ctx.conf_file);
1212	–	fclose(conf_parser_ctx.conf_file);
1213	–
1214	–	log_reopen_all();
1215	–
1216	–	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1217	–	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1218	–
1219	–	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1220	–	add_isupport("MAXLIST", chanmodes, -1);
1221	–	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1222	–	add_isupport("CHANTYPES", "#", -1);
1223	–
1224	–	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1225	–	ConfigChannel.max_channels);
1226	–	add_isupport("CHANLIMIT", chanlimit, -1);
1227	–	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1228	–	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1229	–	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1230	–	add_isupport("CHANMODES", chanmodes, -1);
1231	–
1232	–	/*
1233	–	* message_locale may have changed.  rebuild isupport since it relies
1234	–	* on strlen(form_str(RPL_ISUPPORT))
1235	–	*/
1236	–	rebuild_isupport_message_line();
1237	–	}
1238	–
1147		/* clear_out_old_conf()
1148		*
1149		* inputs       - none
#	Line 1245 | Line 1153 | read_conf_files(int cold)
1153		static void
1154		clear_out_old_conf(void)
1155		{
1156	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1249	<	struct MaskItem *conf;
1156	>	dlink_node *node = NULL, *node_next = NULL;
1157		dlink_list *free_items [] = {
1158		&server_items,   &oconf_items,
1159		&uconf_items,   &xconf_items,
#	Line 1259 | Line 1166 | clear_out_old_conf(void)
1166		* Resetting structs, etc, is taken care of by set_default_conf().
1167		*/
1168
1169	<	for (; *iterator != NULL; iterator++)
1169	>	for (; *iterator; iterator++)
1170		{
1171	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1171	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1172		{
1173	<	conf = ptr->data;
1173	>	struct MaskItem *conf = node->data;
1174
1175	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1175	>	conf->active = 0;
1176
1177	<	/* XXX This is less than pretty */
1271	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1177	>	if (!IsConfDatabase(conf))
1178		{
1179	+	dlinkDelete(&conf->node, *iterator);
1180	+
1181		if (!conf->ref_count)
1182		conf_free(conf);
1183		}
1276	–	else if (conf->type == CONF_XLINE)
1277	–	{
1278	–	if (!conf->until)
1279	–	conf_free(conf);
1280	–	}
1281	–	else
1282	–	conf_free(conf);
1184		}
1185		}
1186
1187		motd_clear();
1188
1189		/*
1190	<	* don't delete the class table, rather mark all entries
1191	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1190	>	* Don't delete the class table, rather mark all entries for deletion.
1191	>	* The table is cleaned up by class_delete_marked. - avalon
1192		*/
1193		class_mark_for_deletion();
1194
1195		clear_out_address_conf();
1196
1197	<	/* clean out module paths */
1197	>	/* Clean out module paths */
1198		mod_clear_paths();
1199
1200	<	/* clean out ConfigServerInfo */
1200	>	pseudo_clear();
1201	>
1202	>	/* Clean out ConfigServerInfo */
1203		MyFree(ConfigServerInfo.description);
1204		ConfigServerInfo.description = NULL;
1205		MyFree(ConfigServerInfo.network_name);
#	Line 1314 | Line 1217 | clear_out_old_conf(void)
1217		ConfigServerInfo.rsa_private_key_file = NULL;
1218		#endif
1219
1220	<	/* clean out ConfigAdminInfo */
1220	>	/* Clean out ConfigAdminInfo */
1221		MyFree(ConfigAdminInfo.name);
1222		ConfigAdminInfo.name = NULL;
1223		MyFree(ConfigAdminInfo.email);
#	Line 1322 | Line 1225 | clear_out_old_conf(void)
1225		MyFree(ConfigAdminInfo.description);
1226		ConfigAdminInfo.description = NULL;
1227
1228	<	/* clean out listeners */
1229	<	close_listeners();
1228	>	/* Clean out listeners */
1229	>	listener_close_marked();
1230	>	}
1231
1232	<	/* clean out general */
1233	<	MyFree(ConfigGeneral.service_name);
1234	<	ConfigGeneral.service_name = NULL;
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(-1);
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	>
1281	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1282	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1283	>
1284	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1285	>	isupport_add("MAXLIST", chanmodes, -1);
1286	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1287	>	isupport_add("CHANTYPES", "#", -1);
1288	>
1289	>	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1290	>	ConfigChannel.max_channels);
1291	>	isupport_add("CHANLIMIT", chanlimit, -1);
1292	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORS");
1293	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1294	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1295	>	isupport_add("CHANMODES", chanmodes, -1);
1296	>
1297	>	/*
1298	>	* message_locale may have changed.  rebuild isupport since it relies
1299	>	* on strlen(form_str(RPL_ISUPPORT))
1300	>	*/
1301	>	isupport_rebuild();
1302		}
1303
1304		/* conf_add_class_to_conf()
#	Line 1337 | Line 1308 | clear_out_old_conf(void)
1308		* side effects - Add a class pointer to a conf
1309		*/
1310		void
1311	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1311	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1312		{
1313	<	if (class_name == NULL)
1313	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1314		{
1315		conf->class = class_default;
1316
1317	<	if (conf->type == CONF_CLIENT)
1318	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1317	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1318	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1319		"Warning *** Defaulting to default class for %s@%s",
1320		conf->user, conf->host);
1321		else
1322	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1322	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1323		"Warning *** Defaulting to default class for %s",
1324		conf->name);
1325		}
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,
1362	–	"Warning *** Defaulting to default class for %s@%s",
1363	–	conf->user, conf->host);
1364	–	else
1365	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1366	–	"Warning *** Defaulting to default class for %s",
1367	–	conf->name);
1368	–	conf->class = class_default;
1369	–	}
1326		}
1327
1328		/* yyerror()
#	Line 1384 | Line 1340 | yyerror(const char *msg)
1340		return;
1341
1342		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1343	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1343	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1344		"\"%s\", line %u: %s: %s",
1345		conffilebuf, lineno + 1, msg, newlinebuf);
1346		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1397 | Line 1353 | conf_error_report(const char *msg)
1353		char newlinebuf[IRCD_BUFSIZE];
1354
1355		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1356	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1356	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1357		"\"%s\", line %u: %s: %s",
1358		conffilebuf, lineno + 1, msg, newlinebuf);
1359		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1432 | Line 1388 | valid_tkline(const char *data, const int
1388
1389		/*
1390		* In the degenerate case where oper does a /quote kline 0 user@host :reason
1391	<	* i.e. they specifically use 0, I am going to return 1 instead
1392	<	* as a return value of non-zero is used to flag it as a temporary kline
1391	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1392	>	* value of non-zero is used to flag it as a temporary kline
1393		*/
1394		if (result == 0)
1395		result = 1;
#	Line 1448 | Line 1404 | valid_tkline(const char *data, const int
1404		if (result > MAX_TDKLINE_TIME)
1405		result = MAX_TDKLINE_TIME;
1406
1407	<	result = result * 60;  /* turn it into seconds */
1407	>	result = result * 60;  /* Turn it into seconds */
1408
1409		return result;
1410		}
#	Line 1464 | Line 1420 | valid_wild_card_simple(const char *data)
1420		{
1421		const unsigned char *p = (const unsigned char *)data;
1422		unsigned char tmpch = '\0';
1423	<	unsigned int nonwild = 0;
1423	>	unsigned int nonwild = 0, wild = 0;
1424
1425		while ((tmpch = *p++))
1426		{
#	Line 1479 | Line 1435 | valid_wild_card_simple(const char *data)
1435		if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1436		return 1;
1437		}
1438	+	else
1439	+	++wild;
1440		}
1441
1442	<	return 0;
1442	>	return !wild;
1443		}
1444
1445		/* valid_wild_card()
#	Line 1493 | Line 1451 | valid_wild_card_simple(const char *data)
1451		* side effects - NOTICE is given to source_p if warn is 1
1452		*/
1453		int
1454	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1454	>	valid_wild_card(struct Client *source_p, int count, ...)
1455		{
1456		unsigned char tmpch = '\0';
1457		unsigned int nonwild = 0;
#	Line 1536 | Line 1494 | valid_wild_card(struct Client *source_p,
1494		}
1495		}
1496
1497	<	if (warn)
1497	>	if (IsClient(source_p))
1498		sendto_one_notice(source_p, &me,
1499		":Please include at least %u non-wildcard characters with the mask",
1500		ConfigGeneral.min_nonwildcard);
#	Line 1544 | Line 1502 | valid_wild_card(struct Client *source_p,
1502		return 0;
1503		}
1504
1505	+	/* find_user_host()
1506	+	*
1507	+	* inputs       - pointer to client placing kline
1508	+	*              - pointer to user_host_or_nick
1509	+	*              - pointer to user buffer
1510	+	*              - pointer to host buffer
1511	+	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1512	+	* side effects -
1513	+	*/
1514	+	static int
1515	+	find_user_host(struct Client *source_p, char *user_host_or_nick,
1516	+	char *luser, char *lhost)
1517	+	{
1518	+	struct Client *target_p = NULL;
1519	+	char *hostp = NULL;
1520	+
1521	+	if (lhost == NULL)
1522	+	{
1523	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1524	+	return 1;
1525	+	}
1526	+
1527	+	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1528	+	{
1529	+	/* Explicit user@host mask given */
1530	+	if (hostp)                            /* I'm a little user@host */
1531	+	{
1532	+	*(hostp++) = '\0';                       /* short and squat */
1533	+
1534	+	if (*user_host_or_nick)
1535	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1536	+	else
1537	+	strcpy(luser, "*");
1538	+
1539	+	if (*hostp)
1540	+	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1541	+	else
1542	+	strcpy(lhost, "*");
1543	+	}
1544	+	else
1545	+	{
1546	+	luser[0] = '*';             /* no @ found, assume its *@somehost */
1547	+	luser[1] = '\0';
1548	+	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1549	+	}
1550	+
1551	+	return 1;
1552	+	}
1553	+	else
1554	+	{
1555	+	/* Try to find user@host mask from nick */
1556	+	/* Okay to use source_p as the first param, because source_p == client_p */
1557	+	if ((target_p =
1558	+	find_chasing(source_p, user_host_or_nick)) == NULL)
1559	+	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1560	+
1561	+	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1562	+	{
1563	+	if (IsClient(source_p))
1564	+	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1565	+	return 0;
1566	+	}
1567	+
1568	+	/*
1569	+	* Turn the "user" bit into "*user", blow away '~'
1570	+	* if found in original user name (non-idented)
1571	+	*/
1572	+	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1573	+
1574	+	if (target_p->username[0] == '~')
1575	+	luser[0] = '*';
1576	+
1577	+	if (!strcmp(target_p->sockhost, "0"))
1578	+	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1579	+	else
1580	+	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1581	+	return 1;
1582	+	}
1583	+
1584	+	return 0;
1585	+	}
1586	+
1587		/* XXX should this go into a separate file ? -Dianora */
1588		/* parse_aline
1589		*
#	Line 1558 | Line 1598 | valid_wild_card(struct Client *source_p,
1598		*              - pointer to target_server to parse into if non NULL
1599		*              - pointer to reason to parse into
1600		*
1601	<	* output       - 1 if valid, -1 if not valid
1601	>	* output       - 1 if valid, 0 if not valid
1602		* side effects - A generalised k/d/x etc. line parser,
1603		*               "ALINE [time] user@host|string [ON] target :reason"
1604		*                will parse returning a parsed user, host if
#	Line 1581 | Line 1621 | parse_aline(const char *cmd, struct Clie
1621		char **target_server, char **reason)
1622		{
1623		int found_tkline_time=0;
1624	<	static char def_reason[] = CONF_NOREASON;
1624	>	static char default_reason[] = CONF_NOREASON;
1625		static char user[USERLEN*4+1];
1626		static char host[HOSTLEN*4+1];
1627
#	Line 1590 | Line 1630 | parse_aline(const char *cmd, struct Clie
1630
1631		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1632
1633	<	if (found_tkline_time != 0)
1633	>	if (found_tkline_time)
1634		{
1635		parv++;
1636		parc--;
1637
1638	<	if (tkline_time != NULL)
1638	>	if (tkline_time)
1639		*tkline_time = found_tkline_time;
1640		else
1641		{
1642		sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1643	<	return -1;
1643	>	return 0;
1644		}
1645		}
1646
1647		if (parc == 0)
1648		{
1649		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1650	<	return -1;
1650	>	return 0;
1651		}
1652
1653		if (h_p == NULL)
1654		*up_p = *parv;
1655		else
1656		{
1657	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1658	<	return -1;
1657	>	if (find_user_host(source_p, *parv, user, host) == 0)
1658	>	return 0;
1659
1660		*up_p = user;
1661		*h_p = host;
#	Line 1624 | Line 1664 | parse_aline(const char *cmd, struct Clie
1664		parc--;
1665		parv++;
1666
1667	<	if (parc != 0)
1667	>	if (parc)
1668		{
1669		if (irccmp(*parv, "ON") == 0)
1670		{
1671		parc--;
1672		parv++;
1673
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	–
1674		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1675		{
1676		sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1677	<	return -1;
1677	>	return 0;
1678		}
1679
1680		if (parc == 0 || EmptyString(*parv))
1681		{
1682		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1683	<	return -1;
1683	>	return 0;
1684		}
1685
1686		*target_server = *parv;
#	Line 1658 | Line 1692 | parse_aline(const char *cmd, struct Clie
1692		/* Make sure target_server *is* NULL if no ON server found
1693		* caller probably NULL'd it first, but no harm to do it again -db
1694		*/
1695	<	if (target_server != NULL)
1695	>	if (target_server)
1696		*target_server = NULL;
1697		}
1698		}
1699
1700	<	if (h_p != NULL)
1700	>	if (h_p)
1701		{
1702	<	if (strchr(user, '!') != NULL)
1702	>	if (strchr(user, '!'))
1703		{
1704		sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1705	<	return -1;
1705	>	return 0;
1706		}
1707
1708	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1709	<	return -1;
1708	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1709	>	return 0;
1710		}
1711		else
1712	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1713	<	return -1;
1712	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1713	>	return 0;
1714
1715	<	if (reason != NULL)
1715	>	if (reason)
1716		{
1717	<	if (parc != 0 && !EmptyString(*parv))
1684	<	{
1717	>	if (parc && !EmptyString(*parv))
1718		*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	–	}
1719		else
1720	<	{
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 (!IsServer(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 (target_p->sockhost[0] == '\0' ||
1769	<	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
1770	<	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1771	<	else
1772	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1773	<	return 1;
1720	>	*reason = default_reason;
1721		}
1722
1776	–	return 0;
1777	–	}
1778	–
1779	–	/* valid_comment()
1780	–	*
1781	–	* inputs       - pointer to client
1782	–	*              - pointer to comment
1783	–	* output       - 0 if no valid comment,
1784	–	*              - 1 if valid
1785	–	* side effects - truncates reason where necessary
1786	–	*/
1787	–	int
1788	–	valid_comment(struct Client *source_p, char *comment, int warn)
1789	–	{
1790	–	if (strlen(comment) > REASONLEN)
1791	–	comment[REASONLEN-1] = '\0';
1792	–
1723		return 1;
1724		}
1725
#	Line 1821 | Line 1751 | match_conf_password(const char *password
1751		*
1752		* inputs       - client sending the cluster
1753		*              - command name "KLINE" "XLINE" etc.
1754	<	*              - capab -- CAP_KLN etc. from server.h
1754	>	*              - capab -- CAPAB_KLN etc. from server.h
1755		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1756		*              - pattern and args to send along
1757		* output       - none
#	Line 1829 | Line 1759 | match_conf_password(const char *password
1759		*                along to all servers that match capab and cluster type
1760		*/
1761		void
1762	<	cluster_a_line(struct Client *source_p, const char *command,
1763	<	int capab, int cluster_type, const char *pattern, ...)
1762	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1763	>	unsigned int cluster_type, const char *pattern, ...)
1764		{
1765		va_list args;
1766		char buffer[IRCD_BUFSIZE] = "";
1767	<	const dlink_node *ptr = NULL;
1767	>	const dlink_node *node = NULL;
1768
1769		va_start(args, pattern);
1770		vsnprintf(buffer, sizeof(buffer), pattern, args);
1771		va_end(args);
1772
1773	<	DLINK_FOREACH(ptr, cluster_items.head)
1773	>	DLINK_FOREACH(node, cluster_items.head)
1774		{
1775	<	const struct MaskItem *conf = ptr->data;
1775	>	const struct MaskItem *conf = node->data;
1776
1777		if (conf->flags & cluster_type)
1778	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1778	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1779		"%s %s %s", command, conf->name, buffer);
1780		}
1781		}
#	Line 1885 | Line 1815 | split_nuh(struct split_nuh_item *const i
1815
1816		if (iptr->nickptr)
1817		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1818	+
1819		if (iptr->userptr)
1820		strlcpy(iptr->userptr, "*", iptr->usersize);
1821	+
1822		if (iptr->hostptr)
1823		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1824
#	Line 1929 | Line 1861 | split_nuh(struct split_nuh_item *const i
1861		}
1862		else
1863		{
1864	<	/* no @ found */
1864	>	/* No @ found */
1865		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1866		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1867		else

Diff Legend

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