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 7217 by michael, Wed Feb 3 15:22:21 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 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_cluster.h"
32	+	#include "conf_pseudo.h"
33	+	#include "conf_shared.h"
34		#include "server.h"
35		#include "resv.h"
36		#include "channel.h"
#	Line 54 | Line 57
57		#include "conf_class.h"
58		#include "motd.h"
59		#include "ipcache.h"
60	+	#include "isupport.h"
61
62
63	+	struct config_channel_entry ConfigChannel;
64	+	struct config_serverhide_entry ConfigServerHide;
65	+	struct config_general_entry ConfigGeneral;
66	+	struct config_log_entry ConfigLog = { .use_logging = 1 };
67	+	struct config_serverinfo_entry ConfigServerInfo;
68	+	struct config_admin_entry ConfigAdminInfo;
69	+	struct conf_parser_context conf_parser_ctx;
70	+
71		/* general conf items link list root, other than k lines etc. */
72	<	dlink_list service_items = { NULL, NULL, 0 };
73	<	dlink_list server_items  = { NULL, NULL, 0 };
74	<	dlink_list cluster_items = { NULL, NULL, 0 };
75	<	dlink_list oconf_items   = { NULL, NULL, 0 };
76	<	dlink_list uconf_items   = { NULL, NULL, 0 };
77	<	dlink_list xconf_items   = { NULL, NULL, 0 };
66	<	dlink_list nresv_items   = { NULL, NULL, 0 };
67	<	dlink_list cresv_items   = { NULL, NULL, 0 };
72	>	dlink_list service_items;
73	>	dlink_list server_items;
74	>	dlink_list operator_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
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 &gecos_items;
141	>	break;
142	>	case CONF_NRESV:
143	>	return &nresv_items;
144	>	break;
145	>	case CONF_CRESV:
146	>	return &cresv_items;
147	>	break;
148	>	case CONF_OPER:
149	>	return &operator_items;
150	>	break;
151	>	case CONF_SERVER:
152	>	return &server_items;
153	>	break;
154	>	case CONF_SERVICE:
155	>	return &service_items;
156	>	break;
157	>	default:
158	>	return NULL;
159		}
160		}
161
162		struct MaskItem *
163		conf_make(enum maskitem_type type)
164		{
165	<	struct MaskItem *conf = MyCalloc(sizeof(*conf));
165	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
166		dlink_list *list = NULL;
167
168		conf->type   = type;
#	Line 138 | Line 177 | conf_make(enum maskitem_type type)
177		void
178		conf_free(struct MaskItem *conf)
179		{
180	<	dlink_node *ptr = NULL, *ptr_next = NULL;
180	>	dlink_node *node = NULL, *node_next = NULL;
181		dlink_list *list = NULL;
182
183	<	if (conf->node.next)
184	<	if ((list = map_to_list(conf->type)))
146	<	dlinkDelete(&conf->node, list);
183	>	if ((list = map_to_list(conf->type)))
184	>	dlinkFindDelete(list, conf);
185
186	<	MyFree(conf->name);
186	>	xfree(conf->name);
187
188		if (conf->dns_pending)
189		delete_resolver_queries(conf);
#	Line 156 | Line 194 | conf_free(struct MaskItem *conf)
194
195		conf->class = NULL;
196
197	<	MyFree(conf->passwd);
198	<	MyFree(conf->spasswd);
199	<	MyFree(conf->reason);
200	<	MyFree(conf->certfp);
201	<	MyFree(conf->user);
202	<	MyFree(conf->host);
203	<	#ifdef HAVE_LIBCRYPTO
204	<	MyFree(conf->cipher_list);
197	>	xfree(conf->passwd);
198	>	xfree(conf->spasswd);
199	>	xfree(conf->reason);
200	>	xfree(conf->certfp);
201	>	xfree(conf->whois);
202	>	xfree(conf->user);
203	>	xfree(conf->host);
204	>	xfree(conf->cipher_list);
205	>
206	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
207	>	{
208	>	xfree(node->data);
209	>	dlinkDelete(node, &conf->hub_list);
210	>	free_dlink_node(node);
211	>	}
212
213	<	if (conf->rsa_public_key)
169	<	RSA_free(conf->rsa_public_key);
170	<	#endif
171	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
213	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
214		{
215	<	MyFree(ptr->data);
216	<	dlinkDelete(ptr, &conf->hub_list);
217	<	free_dlink_node(ptr);
215	>	xfree(node->data);
216	>	dlinkDelete(node, &conf->leaf_list);
217	>	free_dlink_node(node);
218		}
219
220	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
220	>	DLINK_FOREACH_SAFE(node, node_next, conf->exempt_list.head)
221		{
222	<	MyFree(ptr->data);
223	<	dlinkDelete(ptr, &conf->leaf_list);
224	<	free_dlink_node(ptr);
222	>	struct exempt *exptr = node->data;
223	>
224	>	dlinkDelete(node, &conf->exempt_list);
225	>	xfree(exptr->name);
226	>	xfree(exptr->user);
227	>	xfree(exptr->host);
228	>	xfree(exptr);
229		}
230
231	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
231	>	xfree(conf);
232	>	}
233	>
234	>	/* attach_iline()
235	>	*
236	>	* inputs       - client pointer
237	>	*              - conf pointer
238	>	* output       -
239	>	* side effects - do actual attach
240	>	*/
241	>	static int
242	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
243	>	{
244	>	const struct ClassItem *const class = conf->class;
245	>	struct ip_entry *ip_found;
246	>	int a_limit_reached = 0;
247	>	unsigned int local = 0, global = 0, ident = 0;
248	>
249	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
250	>	ip_found->count++;
251	>	AddFlag(client_p, FLAGS_IPHASH);
252	>
253	>	userhost_count(client_p->username, client_p->host,
254	>	&global, &local, &ident);
255	>
256	>	/* XXX blah. go down checking the various silly limits
257	>	* setting a_limit_reached if any limit is reached.
258	>	* - Dianora
259	>	*/
260	>	if (class->max_total && class->ref_count >= class->max_total)
261	>	a_limit_reached = 1;
262	>	else if (class->max_perip && ip_found->count > class->max_perip)
263	>	a_limit_reached = 1;
264	>	else if (class->max_local && local >= class->max_local)
265	>	a_limit_reached = 1;
266	>	else if (class->max_global && global >= class->max_global)
267	>	a_limit_reached = 1;
268	>	else if (class->max_ident && ident >= class->max_ident &&
269	>	client_p->username[0] != '~')
270	>	a_limit_reached = 1;
271	>
272	>	if (a_limit_reached)
273		{
274	<	struct exempt *exptr = ptr->data;
274	>	if (!IsConfExemptLimits(conf))
275	>	return TOO_MANY;   /* Already at maximum allowed */
276
277	<	dlinkDelete(ptr, &conf->exempt_list);
278	<	MyFree(exptr->name);
191	<	MyFree(exptr->user);
192	<	MyFree(exptr->host);
193	<	MyFree(exptr);
277	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
278	>	"but you have exceed_limit = yes;");
279		}
280
281	<	MyFree(conf);
281	>	return attach_conf(client_p, conf);
282	>	}
283	>
284	>	/* verify_access()
285	>	*
286	>	* inputs       - pointer to client to verify
287	>	* output       - 0 if success -'ve if not
288	>	* side effect  - find the first (best) I line to attach.
289	>	*/
290	>	static int
291	>	verify_access(struct Client *client_p)
292	>	{
293	>	struct MaskItem *conf = NULL;
294	>
295	>	if (HasFlag(client_p, FLAGS_GOTID))
296	>	{
297	>	conf = find_address_conf(client_p->host, client_p->username,
298	>	&client_p->connection->ip,
299	>	client_p->connection->aftype,
300	>	client_p->connection->password);
301	>	}
302	>	else
303	>	{
304	>	char non_ident[USERLEN + 1] = "~";
305	>
306	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
307	>	conf = find_address_conf(client_p->host, non_ident,
308	>	&client_p->connection->ip,
309	>	client_p->connection->aftype,
310	>	client_p->connection->password);
311	>	}
312	>
313	>	if (!conf)
314	>	return NOT_AUTHORIZED;
315	>
316	>	assert(IsConfClient(conf) || IsConfKill(conf));
317	>
318	>	if (IsConfClient(conf))
319	>	{
320	>	if (IsConfRedir(conf))
321	>	{
322	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
323	>	conf->name ? conf->name : "",
324	>	conf->port);
325	>	return NOT_AUTHORIZED;
326	>	}
327	>
328	>	if (IsConfDoSpoofIp(conf))
329	>	{
330	>	if (IsConfSpoofNotice(conf))
331	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
332	>	client_p->name, client_p->host, conf->name);
333	>
334	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
335	>	}
336	>
337	>	return attach_iline(client_p, conf);
338	>	}
339	>
340	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
341	>	return BANNED_CLIENT;
342		}
343
344		/* check_client()
#	Line 233 | Line 378 | check_client(struct Client *source_p)
378
379		case I_LINE_FULL:
380		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
381	<	"auth{} block is full for %s (%s).",
381	>	"auth {} block is full for %s (%s).",
382		get_client_name(source_p, SHOW_IP),
383		source_p->sockhost);
384		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
#	Line 243 | Line 388 | check_client(struct Client *source_p)
388		break;
389
390		case NOT_AUTHORIZED:
246	–	++ServerStats.is_ref;
391		/* jdc - lists server name & port connections are on */
392		/*       a purely cosmetical change */
393		sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
394		"Unauthorized client connection from %s [%s] on [%s/%u].",
395		get_client_name(source_p, SHOW_IP),
396		source_p->sockhost,
397	<	source_p->localClient->listener->name,
398	<	source_p->localClient->listener->port);
399	<	ilog(LOG_TYPE_IRCD,
256	<	"Unauthorized client connection from %s on [%s/%u].",
397	>	source_p->connection->listener->name,
398	>	source_p->connection->listener->port);
399	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
400		get_client_name(source_p, SHOW_IP),
401	<	source_p->localClient->listener->name,
402	<	source_p->localClient->listener->port);
401	>	source_p->connection->listener->name,
402	>	source_p->connection->listener->port);
403
404	+	++ServerStats.is_ref;
405		exit_client(source_p, "You are not authorized to use this server");
406		break;
407
408	<	case BANNED_CLIENT:
409	<	exit_client(source_p, "Banned");
410	<	++ServerStats.is_ref;
411	<	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 */
408	>	case BANNED_CLIENT:
409	>	++ServerStats.is_ref;
410	>	exit_client(source_p, "Banned");
411	>	break;
412
413	<	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
414	<	"but you have exceed_limit = yes;");
413	>	case 0:
414	>	default:
415	>	break;
416		}
417
418	<	return attach_conf(client_p, conf);
418	>	return !(i < 0);
419		}
420
421		/* detach_conf()
#	Line 403 | Line 429 | attach_iline(struct Client *client_p, st
429		void
430		detach_conf(struct Client *client_p, enum maskitem_type type)
431		{
432	<	dlink_node *ptr = NULL, *ptr_next = NULL;
432	>	dlink_node *node = NULL, *node_next = NULL;
433
434	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->confs.head)
434	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
435		{
436	<	struct MaskItem *conf = ptr->data;
436	>	struct MaskItem *conf = node->data;
437
438		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
439		assert(conf->ref_count > 0);
#	Line 416 | Line 442 | detach_conf(struct Client *client_p, enu
442		if (!(conf->type & type))
443		continue;
444
445	<	dlinkDelete(ptr, &client_p->localClient->confs);
446	<	free_dlink_node(ptr);
445	>	dlinkDelete(node, &client_p->connection->confs);
446	>	free_dlink_node(node);
447
448		if (conf->type == CONF_CLIENT)
449	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
449	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
450
451		if (--conf->class->ref_count == 0 && conf->class->active == 0)
452		{
#	Line 446 | Line 472 | detach_conf(struct Client *client_p, enu
472		int
473		attach_conf(struct Client *client_p, struct MaskItem *conf)
474		{
475	<	if (dlinkFind(&client_p->localClient->confs, conf))
475	>	if (dlinkFind(&client_p->connection->confs, conf))
476		return 1;
477
478		if (conf->type == CONF_CLIENT)
479		if (cidr_limit_reached(IsConfExemptLimits(conf),
480	<	&client_p->localClient->ip, conf->class))
480	>	&client_p->connection->ip, conf->class))
481		return TOO_MANY;    /* Already at maximum allowed */
482
483		conf->class->ref_count++;
484		conf->ref_count++;
485
486	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
486	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
487
488		return 0;
489		}
#	Line 474 | Line 500 | int
500		attach_connect_block(struct Client *client_p, const char *name,
501		const char *host)
502		{
503	<	dlink_node *ptr;
478	<	struct MaskItem *conf = NULL;
503	>	dlink_node *node = NULL;
504
505	<	assert(client_p != NULL);
481	<	assert(host != NULL);
482	<
483	<	if (client_p == NULL || host == NULL)
484	<	return 0;
505	>	assert(host);
506
507	<	DLINK_FOREACH(ptr, server_items.head)
507	>	DLINK_FOREACH(node, server_items.head)
508		{
509	<	conf = ptr->data;
509	>	struct MaskItem *conf = node->data;
510
511		if (match(conf->name, name) || match(conf->host, host))
512		continue;
513
514		attach_conf(client_p, conf);
515	<	return -1;
515	>	return 1;
516		}
517
518		return 0;
#	Line 509 | Line 530 | attach_connect_block(struct Client *clie
530		struct MaskItem *
531		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
532		{
533	<	dlink_node *ptr;
513	<	struct MaskItem* conf;
533	>	dlink_node *node = NULL;
534
535	<	DLINK_FOREACH(ptr, list->head)
535	>	DLINK_FOREACH(node, list->head)
536		{
537	<	conf = ptr->data;
537	>	struct MaskItem *conf = node->data;
538
539		if (conf->type == type)
540		{
541	<	if (conf->name && (!irccmp(conf->name, name) ||
542	<	!match(conf->name, name)))
523	<	return conf;
541	>	if (conf->name && !irccmp(conf->name, name))
542	>	return conf;
543		}
544		}
545
546		return NULL;
547		}
548
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	–
549		/* find_matching_name_conf()
550		*
551		* inputs       - type of link list to look in
#	Line 580 | Line 560 | struct MaskItem *
560		find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
561		const char *host, unsigned int flags)
562		{
563	<	dlink_node *ptr=NULL;
564	<	struct MaskItem *conf=NULL;
565	<	dlink_list *list_p = map_to_list(type);
563	>	dlink_node *node = NULL;
564	>	dlink_list *list = map_to_list(type);
565	>	struct MaskItem *conf = NULL;
566
567		switch (type)
568		{
569		case CONF_SERVICE:
570	<	DLINK_FOREACH(ptr, list_p->head)
570	>	DLINK_FOREACH(node, list->head)
571		{
572	<	conf = ptr->data;
572	>	conf = node->data;
573
574		if (EmptyString(conf->name))
575		continue;
576	<	if ((name != NULL) && !irccmp(name, conf->name))
576	>	if (name && !irccmp(name, conf->name))
577		return conf;
578		}
579		break;
580
581		case CONF_XLINE:
602	–	case CONF_ULINE:
582		case CONF_NRESV:
583		case CONF_CRESV:
584	<	DLINK_FOREACH(ptr, list_p->head)
584	>	DLINK_FOREACH(node, list->head)
585		{
586	<	conf = ptr->data;
586	>	conf = node->data;
587
588		if (EmptyString(conf->name))
589		continue;
590	<	if ((name != NULL) && !match(conf->name, name))
590	>	if (name && !match(conf->name, name))
591		{
592		if ((user == NULL && (host == NULL)))
593		return conf;
594	<	if ((conf->flags & flags) != flags)
594	>	if ((conf->modes & flags) != flags)
595		continue;
596		if (EmptyString(conf->user) || EmptyString(conf->host))
597		return conf;
#	Line 623 | Line 602 | find_matching_name_conf(enum maskitem_ty
602		break;
603
604		case CONF_SERVER:
605	<	DLINK_FOREACH(ptr, list_p->head)
605	>	DLINK_FOREACH(node, list->head)
606		{
607	<	conf = ptr->data;
607	>	conf = node->data;
608
609	<	if ((name != NULL) && !match(name, conf->name))
609	>	if (name && !match(name, conf->name))
610		return conf;
611	<	else if ((host != NULL) && !match(host, conf->host))
611	>	if (host && !match(host, conf->host))
612		return conf;
613		}
614		break;
#	Line 653 | Line 632 | struct MaskItem *
632		find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
633		const char *user, const char *host)
634		{
635	<	dlink_node *ptr = NULL;
636	<	struct MaskItem *conf;
637	<	dlink_list *list_p = map_to_list(type);
635	>	dlink_node *node = NULL;
636	>	dlink_list *list = map_to_list(type);
637	>	struct MaskItem *conf = NULL;
638
639		switch(type)
640		{
641		case CONF_XLINE:
663	–	case CONF_ULINE:
642		case CONF_NRESV:
643		case CONF_CRESV:
644
645	<	DLINK_FOREACH(ptr, list_p->head)
645	>	DLINK_FOREACH(node, list->head)
646		{
647	<	conf = ptr->data;
647	>	conf = node->data;
648
649		if (EmptyString(conf->name))
650		continue;
#	Line 684 | Line 662 | find_exact_name_conf(enum maskitem_type
662		break;
663
664		case CONF_OPER:
665	<	DLINK_FOREACH(ptr, list_p->head)
665	>	DLINK_FOREACH(node, list->head)
666		{
667	<	conf = ptr->data;
667	>	conf = node->data;
668
669		if (EmptyString(conf->name))
670		continue;
#	Line 707 | Line 685 | find_exact_name_conf(enum maskitem_type
685		return conf;
686		break;
687		case HM_IPV4:
688	<	if (who->localClient->aftype == AF_INET)
689	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
688	>	if (who->connection->aftype == AF_INET)
689	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
690		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
691		return conf;
692		break;
715	–	#ifdef IPV6
693		case HM_IPV6:
694	<	if (who->localClient->aftype == AF_INET6)
695	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
694	>	if (who->connection->aftype == AF_INET6)
695	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
696		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
697		return conf;
698		break;
722	–	#endif
699		default:
700		assert(0);
701		}
#	Line 730 | Line 706 | find_exact_name_conf(enum maskitem_type
706		break;
707
708		case CONF_SERVER:
709	<	DLINK_FOREACH(ptr, list_p->head)
709	>	DLINK_FOREACH(node, list->head)
710		{
711	<	conf = ptr->data;
711	>	conf = node->data;
712
713		if (EmptyString(conf->name))
714		continue;
#	Line 757 | Line 733 | find_exact_name_conf(enum maskitem_type
733		return NULL;
734		}
735
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	–
736		/* set_default_conf()
737		*
738		* inputs       - NONE
#	Line 805 | Line 750 | set_default_conf(void)
750		*/
751		assert(class_default == class_get_list()->tail->data);
752
808	–	#ifdef HAVE_LIBCRYPTO
809	–	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
810	–	ConfigServerInfo.rsa_private_key = NULL;
811	–	ConfigServerInfo.rsa_private_key_file = NULL;
812	–	#endif
813	–
814	–	/* ConfigServerInfo.name is not rehashable */
815	–	/* ConfigServerInfo.name = ConfigServerInfo.name; */
816	–	ConfigServerInfo.description = NULL;
753		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
754		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
755
#	Line 822 | Line 758 | set_default_conf(void)
758		memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
759		ConfigServerInfo.specific_ipv6_vhost = 0;
760
761	<	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
761	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
762		ConfigServerInfo.max_nick_length = 9;
763		ConfigServerInfo.max_topic_length = 80;
764		ConfigServerInfo.hub = 0;
765
830	–	ConfigAdminInfo.name = NULL;
831	–	ConfigAdminInfo.email = NULL;
832	–	ConfigAdminInfo.description = NULL;
833	–
766		log_del_all();
767
768		ConfigLog.use_logging = 1;
#	Line 838 | Line 770 | set_default_conf(void)
770		ConfigChannel.disable_fake_channels = 0;
771		ConfigChannel.invite_client_count = 10;
772		ConfigChannel.invite_client_time = 300;
773	+	ConfigChannel.invite_delay_channel = 5;
774		ConfigChannel.knock_client_count = 1;
775		ConfigChannel.knock_client_time = 300;
776		ConfigChannel.knock_delay_channel = 60;
777		ConfigChannel.max_channels = 25;
778		ConfigChannel.max_bans = 25;
779	<	ConfigChannel.default_split_user_count = 0;
780	<	ConfigChannel.default_split_server_count = 0;
848	<	ConfigChannel.no_join_on_split = 0;
849	<	ConfigChannel.no_create_on_split = 0;
779	>	ConfigChannel.default_join_flood_count = 18;
780	>	ConfigChannel.default_join_flood_time = 6;
781
782		ConfigServerHide.flatten_links = 0;
783	<	ConfigServerHide.links_delay = 300;
783	>	ConfigServerHide.flatten_links_delay = 300;
784		ConfigServerHide.hidden = 0;
785		ConfigServerHide.hide_servers = 0;
786		ConfigServerHide.hide_services = 0;
#	Line 859 | Line 790 | set_default_conf(void)
790
791		ConfigGeneral.away_count = 2;
792		ConfigGeneral.away_time = 10;
793	<	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
863	<	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
793	>	ConfigGeneral.max_watch = 50;
794		ConfigGeneral.cycle_on_host_change = 1;
795	<	ConfigGeneral.glines = 0;
796	<	ConfigGeneral.gline_time = 12 * 3600;
797	<	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
798	<	ConfigGeneral.gline_min_cidr = 16;
869	<	ConfigGeneral.gline_min_cidr6 = 48;
795	>	ConfigGeneral.dline_min_cidr = 16;
796	>	ConfigGeneral.dline_min_cidr6 = 48;
797	>	ConfigGeneral.kline_min_cidr = 16;
798	>	ConfigGeneral.kline_min_cidr6 = 48;
799		ConfigGeneral.invisible_on_connect = 1;
800		ConfigGeneral.tkline_expire_notices = 1;
872	–	ConfigGeneral.hide_spoof_ips = 1;
801		ConfigGeneral.ignore_bogus_ts = 0;
802		ConfigGeneral.disable_auth = 0;
803		ConfigGeneral.kill_chase_time_limit = 90;
#	Line 878 | Line 806 | set_default_conf(void)
806		ConfigGeneral.dots_in_ident = 0;
807		ConfigGeneral.min_nonwildcard = 4;
808		ConfigGeneral.min_nonwildcard_simple = 3;
809	<	ConfigGeneral.max_accept = 20;
809	>	ConfigGeneral.max_accept = 50;
810		ConfigGeneral.anti_nick_flood = 0;
811		ConfigGeneral.max_nick_time = 20;
812		ConfigGeneral.max_nick_changes = 5;
813		ConfigGeneral.anti_spam_exit_message_time = 0;
814	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
815	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
814	>	ConfigGeneral.ts_warn_delta = 30;
815	>	ConfigGeneral.ts_max_delta = 600;
816		ConfigGeneral.warn_no_connect_block = 1;
817		ConfigGeneral.stats_e_disabled = 0;
890	–	ConfigGeneral.stats_o_oper_only = 0;
891	–	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
818		ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
819	+	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
820	+	ConfigGeneral.stats_o_oper_only = 1;
821	+	ConfigGeneral.stats_m_oper_only = 1;
822		ConfigGeneral.stats_P_oper_only = 0;
823		ConfigGeneral.stats_u_oper_only = 0;
824		ConfigGeneral.caller_id_wait = 60;
#	Line 899 | Line 828 | set_default_conf(void)
828		ConfigGeneral.short_motd = 0;
829		ConfigGeneral.ping_cookie = 0;
830		ConfigGeneral.no_oper_flood = 0;
902	–	ConfigGeneral.true_no_oper_flood = 0;
903	–	ConfigGeneral.oper_pass_resv = 1;
831		ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
832	<	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
832	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
833	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
834	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
835		ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
836		ConfigGeneral.throttle_count = 1;
837		ConfigGeneral.throttle_time = 1;
#	Line 911 | Line 840 | set_default_conf(void)
840		static void
841		validate_conf(void)
842		{
843	<	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
915	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
916	<
917	<	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
918	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
919	<
920	<	if (ConfigServerInfo.network_name == NULL)
843	>	if (EmptyString(ConfigServerInfo.network_name))
844		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
845
846	<	if (ConfigServerInfo.network_desc == NULL)
846	>	if (EmptyString(ConfigServerInfo.network_desc))
847		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
925	–
926	–	if (ConfigGeneral.service_name == NULL)
927	–	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
928	–
929	–	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
848		}
849
850		/* read_conf()
#	Line 953 | Line 871 | read_conf(FILE *file)
871		class_delete_marked();  /* Delete unused classes that are marked for deletion */
872		}
873
874	+	/* conf_rehash()
875	+	*
876	+	* Actual REHASH service routine. Called with sig == 0 if it has been called
877	+	* as a result of an operator issuing this command, else assume it has been
878	+	* called as a result of the server receiving a HUP signal.
879	+	*/
880	+	void
881	+	conf_rehash(int sig)
882	+	{
883	+	if (sig)
884	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
885	+	"Got signal SIGHUP, reloading configuration file(s)");
886	+
887	+	restart_resolver();
888	+
889	+	/* don't close listeners until we know we can go ahead with the rehash */
890	+
891	+	read_conf_files(0);
892	+
893	+	load_conf_modules();
894	+	check_conf_klines();
895	+	}
896	+
897		/* lookup_confhost()
898		*
899		* start DNS lookups of all hostnames in the conf
#	Line 1001 | Line 942 | int
942		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
943		{
944		struct ip_entry *ip_found = NULL;
945	<	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;
945	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
946
947		if (conf)
948	+	{
949	+	/* DLINE exempt also gets you out of static limits/pacing... */
950	+	if (conf->type == CONF_EXEMPT)
951	+	return 0;
952		return BANNED_CLIENT;
953	+	}
954
955		ip_found = ipcache_find_or_add_address(addr);
956
#	Line 1026 | Line 968 | conf_connect_allowed(struct irc_ssaddr *
968		return 0;
969		}
970
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	–
971		/* expire_tklines()
972		*
973		* inputs       - tkline list pointer
#	Line 1049 | Line 975 | cleanup_tklines(void *notused)
975		* side effects - expire tklines
976		*/
977		static void
978	<	expire_tklines(dlink_list *tklist)
978	>	expire_tklines(dlink_list *list)
979		{
980	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1055	<	struct MaskItem *conf = NULL;
980	>	dlink_node *node = NULL, *node_next = NULL;
981
982	<	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
982	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
983		{
984	<	conf = ptr->data;
984	>	struct MaskItem *conf = node->data;
985
986		if (!conf->until || conf->until > CurrentTime)
987		continue;
988
989	<	if (conf->type == CONF_XLINE)
990	<	{
991	<	if (ConfigGeneral.tkline_expire_notices)
992	<	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	<	}
989	>	if (ConfigGeneral.tkline_expire_notices)
990	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
991	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
992	>	conf_free(conf);
993		}
994		}
995
996	+	/* cleanup_tklines()
997	+	*
998	+	* inputs       - NONE
999	+	* output       - NONE
1000	+	* side effects - call function to expire temporary k/d lines
1001	+	*                This is an event started off in ircd.c
1002	+	*/
1003	+	void
1004	+	cleanup_tklines(void *unused)
1005	+	{
1006	+	hostmask_expire_temporary();
1007	+	expire_tklines(&gecos_items);
1008	+	expire_tklines(&nresv_items);
1009	+	expire_tklines(&cresv_items);
1010	+	}
1011	+
1012		/* oper_privs_as_string()
1013		*
1014		* inputs        - pointer to client_p
#	Line 1090 | Line 1021 | static const struct oper_privs
1021		const unsigned char c;
1022		} flag_list[] = {
1023		{ OPER_FLAG_ADMIN,          'A' },
1024	<	{ OPER_FLAG_REMOTEBAN,      'B' },
1025	<	{ OPER_FLAG_DIE,            'D' },
1026	<	{ OPER_FLAG_GLINE,          'G' },
1027	<	{ OPER_FLAG_REHASH,         'H' },
1024	>	{ OPER_FLAG_CLOSE,          'B' },
1025	>	{ OPER_FLAG_CONNECT,        'C' },
1026	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
1027	>	{ OPER_FLAG_DIE,            'E' },
1028	>	{ OPER_FLAG_DLINE,          'F' },
1029	>	{ OPER_FLAG_GLOBOPS,        'G' },
1030	>	{ OPER_FLAG_JOIN_RESV,      'H' },
1031	>	{ OPER_FLAG_KILL,           'I' },
1032	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
1033		{ OPER_FLAG_KLINE,          'K' },
1034	<	{ OPER_FLAG_KILL,           'N' },
1035	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
1036	<	{ OPER_FLAG_CONNECT,        'P' },
1037	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1038	<	{ OPER_FLAG_SQUIT,          'R' },
1039	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1040	<	{ OPER_FLAG_UNKLINE,        'U' },
1041	<	{ OPER_FLAG_XLINE,          'X' },
1034	>	{ OPER_FLAG_LOCOPS,         'L' },
1035	>	{ OPER_FLAG_MODULE,         'M' },
1036	>	{ OPER_FLAG_NICK_RESV,      'N' },
1037	>	{ OPER_FLAG_OPME,           'O' },
1038	>	{ OPER_FLAG_REHASH,         'P' },
1039	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
1040	>	{ OPER_FLAG_RESTART,        'R' },
1041	>	{ OPER_FLAG_RESV,           'S' },
1042	>	{ OPER_FLAG_SET,            'T' },
1043	>	{ OPER_FLAG_SQUIT,          'U' },
1044	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
1045	>	{ OPER_FLAG_UNDLINE,        'W' },
1046	>	{ OPER_FLAG_UNKLINE,        'X' },
1047	>	{ OPER_FLAG_UNRESV,         'Y' },
1048	>	{ OPER_FLAG_UNXLINE,        'Z' },
1049	>	{ OPER_FLAG_WALLOPS,        'a' },
1050	>	{ OPER_FLAG_XLINE,          'b' },
1051		{ 0, '\0' }
1052		};
1053
1054	<	char *
1054	>	const char *
1055		oper_privs_as_string(const unsigned int port)
1056		{
1057		static char privs_out[IRCD_BUFSIZE];
1058		char *privs_ptr = privs_out;
1059
1060		for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1116	–	{
1061		if (port & opriv->flag)
1062		*privs_ptr++ = opriv->c;
1063	<	else
1064	<	*privs_ptr++ = ToLower(opriv->c);
1065	<	}
1063	>
1064	>	if (privs_ptr == privs_out)
1065	>	*privs_ptr++ = '0';
1066
1067		*privs_ptr = '\0';
1068
#	Line 1134 | Line 1078 | oper_privs_as_string(const unsigned int
1078		const char *
1079		get_oper_name(const struct Client *client_p)
1080		{
1081	<	const dlink_node *cnode = NULL;
1082	<	/* +5 for !,@,{,} and null */
1083	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1081	>	static char buffer[IRCD_BUFSIZE];
1082	>
1083	>	if (IsServer(client_p))
1084	>	return client_p->name;
1085
1086		if (MyConnect(client_p))
1087		{
1088	<	if ((cnode = client_p->localClient->confs.head))
1088	>	const dlink_node *const node = client_p->connection->confs.head;
1089	>
1090	>	if (node)
1091		{
1092	<	const struct MaskItem *conf = cnode->data;
1092	>	const struct MaskItem *const conf = node->data;
1093
1094	<	if (IsConfOperator(conf))
1094	>	if (conf->type == CONF_OPER)
1095		{
1096		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1097		client_p->username, client_p->host, conf->name);
#	Line 1164 | Line 1111 | get_oper_name(const struct Client *clien
1111		return buffer;
1112		}
1113
1114	+	/* clear_out_old_conf()
1115	+	*
1116	+	* inputs       - none
1117	+	* output       - none
1118	+	* side effects - Clear out the old configuration
1119	+	*/
1120	+	static void
1121	+	clear_out_old_conf(void)
1122	+	{
1123	+	dlink_node *node = NULL, *node_next = NULL;
1124	+	dlink_list *free_items [] = {
1125	+	&server_items,   &operator_items,
1126	+	&gecos_items,
1127	+	&nresv_items, &service_items, &cresv_items, NULL
1128	+	};
1129	+
1130	+	dlink_list ** iterator = free_items; /* C is dumb */
1131	+
1132	+	/* We only need to free anything allocated by yyparse() here.
1133	+	* Resetting structs, etc, is taken care of by set_default_conf().
1134	+	*/
1135	+
1136	+	for (; *iterator; iterator++)
1137	+	{
1138	+	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1139	+	{
1140	+	struct MaskItem *conf = node->data;
1141	+
1142	+	conf->active = 0;
1143	+
1144	+	if (!IsConfDatabase(conf))
1145	+	{
1146	+	dlinkDelete(&conf->node, *iterator);
1147	+
1148	+	if (!conf->ref_count)
1149	+	conf_free(conf);
1150	+	}
1151	+	}
1152	+	}
1153	+
1154	+	motd_clear();
1155	+
1156	+	/*
1157	+	* Don't delete the class table, rather mark all entries for deletion.
1158	+	* The table is cleaned up by class_delete_marked. - avalon
1159	+	*/
1160	+	class_mark_for_deletion();
1161	+
1162	+	clear_out_address_conf();
1163	+
1164	+	/* Clean out module paths */
1165	+	mod_clear_paths();
1166	+
1167	+	cluster_clear();  /* Clear cluster {} items */
1168	+
1169	+	shared_clear();  /* Clear shared {} items */
1170	+
1171	+	pseudo_clear();  /* Clear pseudo {} items */
1172	+
1173	+	/* Clean out ConfigServerInfo */
1174	+	xfree(ConfigServerInfo.description);
1175	+	ConfigServerInfo.description = NULL;
1176	+	xfree(ConfigServerInfo.network_name);
1177	+	ConfigServerInfo.network_name = NULL;
1178	+	xfree(ConfigServerInfo.network_desc);
1179	+	ConfigServerInfo.network_desc = NULL;
1180	+
1181	+	xfree(ConfigServerInfo.rsa_private_key_file);
1182	+	ConfigServerInfo.rsa_private_key_file = NULL;
1183	+	xfree(ConfigServerInfo.ssl_certificate_file);
1184	+	ConfigServerInfo.ssl_certificate_file = NULL;
1185	+	xfree(ConfigServerInfo.ssl_dh_param_file);
1186	+	ConfigServerInfo.ssl_dh_param_file = NULL;
1187	+	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
1188	+	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
1189	+	xfree(ConfigServerInfo.ssl_cipher_list);
1190	+	ConfigServerInfo.ssl_cipher_list = NULL;
1191	+	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
1192	+	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
1193	+
1194	+	/* Clean out ConfigAdminInfo */
1195	+	xfree(ConfigAdminInfo.name);
1196	+	ConfigAdminInfo.name = NULL;
1197	+	xfree(ConfigAdminInfo.email);
1198	+	ConfigAdminInfo.email = NULL;
1199	+	xfree(ConfigAdminInfo.description);
1200	+	ConfigAdminInfo.description = NULL;
1201	+
1202	+	xfree(ConfigServerHide.flatten_links_file);
1203	+	ConfigServerHide.flatten_links_file = NULL;
1204	+
1205	+	/* Clean out listeners */
1206	+	listener_close_marked();
1207	+	}
1208	+
1209	+	static void
1210	+	conf_handle_tls(int cold)
1211	+	{
1212	+	if (!tls_new_cred())
1213	+	{
1214	+	if (cold)
1215	+	{
1216	+	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1217	+	exit(-1);
1218	+	}
1219	+	else
1220	+	{
1221	+	/* Failed to load new settings/certs, old ones remain active */
1222	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1223	+	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1224	+	}
1225	+	}
1226	+	}
1227	+
1228		/* read_conf_files()
1229		*
1230		* inputs       - cold start YES or NO
#	Line 1194 | Line 1255 | read_conf_files(int cold)
1255		{
1256		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1257		filename, strerror(errno));
1258	<	exit(-1);
1258	>	exit(EXIT_FAILURE);
1259		}
1260		else
1261		{
1262	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1262	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1263		"Unable to read configuration file '%s': %s",
1264		filename, strerror(errno));
1265		return;
#	Line 1212 | Line 1273 | read_conf_files(int cold)
1273		fclose(conf_parser_ctx.conf_file);
1274
1275		log_reopen_all();
1276	+	conf_handle_tls(cold);
1277
1278	<	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1279	<	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1278	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1279	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1280
1281	<	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1282	<	add_isupport("MAXLIST", chanmodes, -1);
1283	<	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1284	<	add_isupport("CHANTYPES", "#", -1);
1281	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1282	>	isupport_add("MAXLIST", chanmodes, -1);
1283	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1284	>	isupport_add("CHANTYPES", "#", -1);
1285
1286	<	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1286	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1287		ConfigChannel.max_channels);
1288	<	add_isupport("CHANLIMIT", chanlimit, -1);
1289	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1290	<	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1291	<	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1292	<	add_isupport("CHANMODES", chanmodes, -1);
1288	>	isupport_add("CHANLIMIT", chanlimit, -1);
1289	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1290	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1291	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1292	>	isupport_add("CHANMODES", chanmodes, -1);
1293
1294		/*
1295		* message_locale may have changed.  rebuild isupport since it relies
1296		* on strlen(form_str(RPL_ISUPPORT))
1297		*/
1298	<	rebuild_isupport_message_line();
1237	<	}
1238	<
1239	<	/* clear_out_old_conf()
1240	<	*
1241	<	* inputs       - none
1242	<	* output       - none
1243	<	* side effects - Clear out the old configuration
1244	<	*/
1245	<	static void
1246	<	clear_out_old_conf(void)
1247	<	{
1248	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1249	<	struct MaskItem *conf;
1250	<	dlink_list *free_items [] = {
1251	<	&server_items,   &oconf_items,
1252	<	&uconf_items,   &xconf_items,
1253	<	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1254	<	};
1255	<
1256	<	dlink_list ** iterator = free_items; /* C is dumb */
1257	<
1258	<	/* We only need to free anything allocated by yyparse() here.
1259	<	* Resetting structs, etc, is taken care of by set_default_conf().
1260	<	*/
1261	<
1262	<	for (; *iterator != NULL; iterator++)
1263	<	{
1264	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1265	<	{
1266	<	conf = ptr->data;
1267	<
1268	<	dlinkDelete(&conf->node, map_to_list(conf->type));
1269	<
1270	<	/* XXX This is less than pretty */
1271	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1272	<	{
1273	<	if (!conf->ref_count)
1274	<	conf_free(conf);
1275	<	}
1276	<	else if (conf->type == CONF_XLINE)
1277	<	{
1278	<	if (!conf->until)
1279	<	conf_free(conf);
1280	<	}
1281	<	else
1282	<	conf_free(conf);
1283	<	}
1284	<	}
1285	<
1286	<	motd_clear();
1287	<
1288	<	/*
1289	<	* don't delete the class table, rather mark all entries
1290	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1291	<	*/
1292	<	class_mark_for_deletion();
1293	<
1294	<	clear_out_address_conf();
1295	<
1296	<	/* clean out module paths */
1297	<	mod_clear_paths();
1298	<
1299	<	/* clean out ConfigServerInfo */
1300	<	MyFree(ConfigServerInfo.description);
1301	<	ConfigServerInfo.description = NULL;
1302	<	MyFree(ConfigServerInfo.network_name);
1303	<	ConfigServerInfo.network_name = NULL;
1304	<	MyFree(ConfigServerInfo.network_desc);
1305	<	ConfigServerInfo.network_desc = NULL;
1306	<	#ifdef HAVE_LIBCRYPTO
1307	<	if (ConfigServerInfo.rsa_private_key)
1308	<	{
1309	<	RSA_free(ConfigServerInfo.rsa_private_key);
1310	<	ConfigServerInfo.rsa_private_key = NULL;
1311	<	}
1312	<
1313	<	MyFree(ConfigServerInfo.rsa_private_key_file);
1314	<	ConfigServerInfo.rsa_private_key_file = NULL;
1315	<	#endif
1316	<
1317	<	/* clean out ConfigAdminInfo */
1318	<	MyFree(ConfigAdminInfo.name);
1319	<	ConfigAdminInfo.name = NULL;
1320	<	MyFree(ConfigAdminInfo.email);
1321	<	ConfigAdminInfo.email = NULL;
1322	<	MyFree(ConfigAdminInfo.description);
1323	<	ConfigAdminInfo.description = NULL;
1324	<
1325	<	/* clean out listeners */
1326	<	close_listeners();
1327	<
1328	<	/* clean out general */
1329	<	MyFree(ConfigGeneral.service_name);
1330	<	ConfigGeneral.service_name = NULL;
1298	>	isupport_rebuild();
1299		}
1300
1301		/* conf_add_class_to_conf()
#	Line 1337 | Line 1305 | clear_out_old_conf(void)
1305		* side effects - Add a class pointer to a conf
1306		*/
1307		void
1308	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1308	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1309		{
1310	<	if (class_name == NULL)
1310	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1311		{
1312		conf->class = class_default;
1313
1314	<	if (conf->type == CONF_CLIENT)
1315	<	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,
1314	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1315	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1316		"Warning *** Defaulting to default class for %s@%s",
1317		conf->user, conf->host);
1318		else
1319	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1319	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1320		"Warning *** Defaulting to default class for %s",
1321		conf->name);
1368	–	conf->class = class_default;
1322		}
1323		}
1324
#	Line 1384 | Line 1337 | yyerror(const char *msg)
1337		return;
1338
1339		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1340	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1340	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1341		"\"%s\", line %u: %s: %s",
1342		conffilebuf, lineno + 1, msg, newlinebuf);
1343		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1397 | Line 1350 | conf_error_report(const char *msg)
1350		char newlinebuf[IRCD_BUFSIZE];
1351
1352		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1353	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1353	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1354		"\"%s\", line %u: %s: %s",
1355		conffilebuf, lineno + 1, msg, newlinebuf);
1356		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1432 | Line 1385 | valid_tkline(const char *data, const int
1385
1386		/*
1387		* In the degenerate case where oper does a /quote kline 0 user@host :reason
1388	<	* i.e. they specifically use 0, I am going to return 1 instead
1389	<	* as a return value of non-zero is used to flag it as a temporary kline
1388	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1389	>	* value of non-zero is used to flag it as a temporary kline
1390		*/
1391		if (result == 0)
1392		result = 1;
#	Line 1448 | Line 1401 | valid_tkline(const char *data, const int
1401		if (result > MAX_TDKLINE_TIME)
1402		result = MAX_TDKLINE_TIME;
1403
1404	<	result = result * 60;  /* turn it into seconds */
1404	>	result = result * 60;  /* Turn it into seconds */
1405
1406		return result;
1407		}
#	Line 1464 | Line 1417 | valid_wild_card_simple(const char *data)
1417		{
1418		const unsigned char *p = (const unsigned char *)data;
1419		unsigned char tmpch = '\0';
1420	<	unsigned int nonwild = 0;
1420	>	unsigned int nonwild = 0, wild = 0;
1421
1422		while ((tmpch = *p++))
1423		{
#	Line 1479 | Line 1432 | valid_wild_card_simple(const char *data)
1432		if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1433		return 1;
1434		}
1435	+	else
1436	+	++wild;
1437		}
1438
1439	<	return 0;
1439	>	return !wild;
1440		}
1441
1442		/* valid_wild_card()
#	Line 1493 | Line 1448 | valid_wild_card_simple(const char *data)
1448		* side effects - NOTICE is given to source_p if warn is 1
1449		*/
1450		int
1451	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1451	>	valid_wild_card(struct Client *source_p, int count, ...)
1452		{
1453		unsigned char tmpch = '\0';
1454		unsigned int nonwild = 0;
#	Line 1536 | Line 1491 | valid_wild_card(struct Client *source_p,
1491		}
1492		}
1493
1494	<	if (warn)
1494	>	if (IsClient(source_p))
1495		sendto_one_notice(source_p, &me,
1496		":Please include at least %u non-wildcard characters with the mask",
1497		ConfigGeneral.min_nonwildcard);
#	Line 1544 | Line 1499 | valid_wild_card(struct Client *source_p,
1499		return 0;
1500		}
1501
1502	+	/* find_user_host()
1503	+	*
1504	+	* inputs       - pointer to client placing kline
1505	+	*              - pointer to user_host_or_nick
1506	+	*              - pointer to user buffer
1507	+	*              - pointer to host buffer
1508	+	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1509	+	* side effects -
1510	+	*/
1511	+	static int
1512	+	find_user_host(struct Client *source_p, char *user_host_or_nick,
1513	+	char *luser, char *lhost)
1514	+	{
1515	+	struct Client *target_p = NULL;
1516	+	char *hostp = NULL;
1517	+
1518	+	if (lhost == NULL)
1519	+	{
1520	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1521	+	return 1;
1522	+	}
1523	+
1524	+	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1525	+	{
1526	+	/* Explicit user@host mask given */
1527	+	if (hostp)                            /* I'm a little user@host */
1528	+	{
1529	+	*(hostp++) = '\0';                       /* short and squat */
1530	+
1531	+	if (*user_host_or_nick)
1532	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1533	+	else
1534	+	strcpy(luser, "*");
1535	+
1536	+	if (*hostp)
1537	+	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1538	+	else
1539	+	strcpy(lhost, "*");
1540	+	}
1541	+	else
1542	+	{
1543	+	luser[0] = '*';             /* no @ found, assume its *@somehost */
1544	+	luser[1] = '\0';
1545	+	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1546	+	}
1547	+
1548	+	return 1;
1549	+	}
1550	+	else
1551	+	{
1552	+	/* Try to find user@host mask from nick */
1553	+	/* Okay to use source_p as the first param, because source_p == client_p */
1554	+	if ((target_p =
1555	+	find_chasing(source_p, user_host_or_nick)) == NULL)
1556	+	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1557	+
1558	+	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1559	+	{
1560	+	if (IsClient(source_p))
1561	+	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1562	+	return 0;
1563	+	}
1564	+
1565	+	/*
1566	+	* Turn the "user" bit into "*user", blow away '~'
1567	+	* if found in original user name (non-idented)
1568	+	*/
1569	+	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1570	+
1571	+	if (target_p->username[0] == '~')
1572	+	luser[0] = '*';
1573	+
1574	+	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1575	+	return 1;
1576	+	}
1577	+
1578	+	return 0;
1579	+	}
1580	+
1581		/* XXX should this go into a separate file ? -Dianora */
1582		/* parse_aline
1583		*
#	Line 1558 | Line 1592 | valid_wild_card(struct Client *source_p,
1592		*              - pointer to target_server to parse into if non NULL
1593		*              - pointer to reason to parse into
1594		*
1595	<	* output       - 1 if valid, -1 if not valid
1595	>	* output       - 1 if valid, 0 if not valid
1596		* side effects - A generalised k/d/x etc. line parser,
1597		*               "ALINE [time] user@host|string [ON] target :reason"
1598		*                will parse returning a parsed user, host if
#	Line 1581 | Line 1615 | parse_aline(const char *cmd, struct Clie
1615		char **target_server, char **reason)
1616		{
1617		int found_tkline_time=0;
1618	<	static char def_reason[] = CONF_NOREASON;
1618	>	static char default_reason[] = CONF_NOREASON;
1619		static char user[USERLEN*4+1];
1620		static char host[HOSTLEN*4+1];
1621
#	Line 1590 | Line 1624 | parse_aline(const char *cmd, struct Clie
1624
1625		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1626
1627	<	if (found_tkline_time != 0)
1627	>	if (found_tkline_time)
1628		{
1629		parv++;
1630		parc--;
1631
1632	<	if (tkline_time != NULL)
1632	>	if (tkline_time)
1633		*tkline_time = found_tkline_time;
1634		else
1635		{
1636		sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1637	<	return -1;
1637	>	return 0;
1638		}
1639		}
1640
1641		if (parc == 0)
1642		{
1643		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1644	<	return -1;
1644	>	return 0;
1645		}
1646
1647		if (h_p == NULL)
1648		*up_p = *parv;
1649		else
1650		{
1651	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1652	<	return -1;
1651	>	if (find_user_host(source_p, *parv, user, host) == 0)
1652	>	return 0;
1653
1654		*up_p = user;
1655		*h_p = host;
#	Line 1624 | Line 1658 | parse_aline(const char *cmd, struct Clie
1658		parc--;
1659		parv++;
1660
1661	<	if (parc != 0)
1661	>	if (parc)
1662		{
1663		if (irccmp(*parv, "ON") == 0)
1664		{
1665		parc--;
1666		parv++;
1667
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	–
1668		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1669		{
1670		sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1671	<	return -1;
1671	>	return 0;
1672		}
1673
1674		if (parc == 0 || EmptyString(*parv))
1675		{
1676		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1677	<	return -1;
1677	>	return 0;
1678		}
1679
1680		*target_server = *parv;
#	Line 1658 | Line 1686 | parse_aline(const char *cmd, struct Clie
1686		/* Make sure target_server *is* NULL if no ON server found
1687		* caller probably NULL'd it first, but no harm to do it again -db
1688		*/
1689	<	if (target_server != NULL)
1689	>	if (target_server)
1690		*target_server = NULL;
1691		}
1692		}
1693
1694	<	if (h_p != NULL)
1694	>	if (h_p)
1695		{
1696	<	if (strchr(user, '!') != NULL)
1696	>	if (strchr(user, '!'))
1697		{
1698		sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1699	<	return -1;
1699	>	return 0;
1700		}
1701
1702	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1703	<	return -1;
1702	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1703	>	return 0;
1704		}
1705		else
1706	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1707	<	return -1;
1706	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1707	>	return 0;
1708
1709	<	if (reason != NULL)
1709	>	if (reason)
1710		{
1711	<	if (parc != 0 && !EmptyString(*parv))
1684	<	{
1711	>	if (parc && !EmptyString(*parv))
1712		*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	–	}
1713		else
1714	<	{
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;
1714	>	*reason = default_reason;
1715		}
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;
1774	–	}
1775	–
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';
1716
1717		return 1;
1718		}
#	Line 1817 | Line 1741 | match_conf_password(const char *password
1741		}
1742
1743		/*
1820	–	* cluster_a_line
1821	–	*
1822	–	* inputs       - client sending the cluster
1823	–	*              - command name "KLINE" "XLINE" etc.
1824	–	*              - capab -- CAP_KLN etc. from server.h
1825	–	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1826	–	*              - pattern and args to send along
1827	–	* output       - none
1828	–	* side effects - Take source_p send the pattern with args given
1829	–	*                along to all servers that match capab and cluster type
1830	–	*/
1831	–	void
1832	–	cluster_a_line(struct Client *source_p, const char *command,
1833	–	int capab, int cluster_type, const char *pattern, ...)
1834	–	{
1835	–	va_list args;
1836	–	char buffer[IRCD_BUFSIZE] = "";
1837	–	const dlink_node *ptr = NULL;
1838	–
1839	–	va_start(args, pattern);
1840	–	vsnprintf(buffer, sizeof(buffer), pattern, args);
1841	–	va_end(args);
1842	–
1843	–	DLINK_FOREACH(ptr, cluster_items.head)
1844	–	{
1845	–	const struct MaskItem *conf = ptr->data;
1846	–
1847	–	if (conf->flags & cluster_type)
1848	–	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1849	–	"%s %s %s", command, conf->name, buffer);
1850	–	}
1851	–	}
1852	–
1853	–	/*
1744		* split_nuh
1745		*
1746		* inputs       - pointer to original mask (modified in place)
#	Line 1885 | Line 1775 | split_nuh(struct split_nuh_item *const i
1775
1776		if (iptr->nickptr)
1777		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1778	+
1779		if (iptr->userptr)
1780		strlcpy(iptr->userptr, "*", iptr->usersize);
1781	+
1782		if (iptr->hostptr)
1783		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1784
#	Line 1929 | Line 1821 | split_nuh(struct split_nuh_item *const i
1821		}
1822		else
1823		{
1824	<	/* no @ found */
1824	>	/* No @ found */
1825		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1826		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1827		else

Diff Legend

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