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 4523 by michael, Tue Aug 19 09:43:38 2014 UTC vs.
Revision 8500 by michael, Thu Apr 5 13:00:49 2018 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-2018 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 27 | Line 27
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30	+	#include "parse.h"
31		#include "conf.h"
32	+	#include "conf_cluster.h"
33	+	#include "conf_gecos.h"
34	+	#include "conf_pseudo.h"
35	+	#include "conf_resv.h"
36	+	#include "conf_service.h"
37	+	#include "conf_shared.h"
38		#include "server.h"
32	–	#include "resv.h"
39		#include "channel.h"
40		#include "client.h"
41		#include "event.h"
#	Line 45 | Line 51
51		#include "send.h"
52		#include "memory.h"
53		#include "res.h"
48	–	#include "userhost.h"
54		#include "user.h"
55		#include "channel_mode.h"
51	–	#include "parse.h"
56		#include "misc.h"
57		#include "conf_db.h"
58		#include "conf_class.h"
59		#include "motd.h"
60		#include "ipcache.h"
61	+	#include "isupport.h"
62	+	#include "whowas.h"
63	+
64
65	+	struct config_channel_entry ConfigChannel;
66	+	struct config_serverhide_entry ConfigServerHide;
67	+	struct config_general_entry ConfigGeneral;
68	+	struct config_log_entry ConfigLog = { .use_logging = 1 };
69	+	struct config_serverinfo_entry ConfigServerInfo;
70	+	struct config_admin_entry ConfigAdminInfo;
71	+	struct conf_parser_context conf_parser_ctx;
72
73		/* general conf items link list root, other than k lines etc. */
74	<	dlink_list service_items = { NULL, NULL, 0 };
75	<	dlink_list server_items  = { NULL, NULL, 0 };
62	<	dlink_list cluster_items = { NULL, NULL, 0 };
63	<	dlink_list oconf_items   = { NULL, NULL, 0 };
64	<	dlink_list uconf_items   = { NULL, NULL, 0 };
65	<	dlink_list xconf_items   = { NULL, NULL, 0 };
66	<	dlink_list nresv_items   = { NULL, NULL, 0 };
67	<	dlink_list cresv_items   = { NULL, NULL, 0 };
74	>	dlink_list connect_items;
75	>	dlink_list operator_items;
76
77		extern unsigned int lineno;
78		extern char linebuf[];
79		extern char conffilebuf[IRCD_BUFSIZE];
80		extern int yyparse(); /* defined in y.tab.c */
81
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	–
82
83		/* conf_dns_callback()
84		*
#	Line 94 | Line 93 | static int find_user_host(struct Client
93		static void
94		conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
95		{
96	<	struct MaskItem *conf = vptr;
96	>	struct MaskItem *const conf = vptr;
97
98		conf->dns_pending = 0;
99
#	Line 113 | Line 112 | conf_dns_callback(void *vptr, const stru
112		static void
113		conf_dns_lookup(struct MaskItem *conf)
114		{
115	<	if (!conf->dns_pending)
116	<	{
118	<	conf->dns_pending = 1;
115	>	if (conf->dns_pending)
116	>	return;
117
118	<	if (conf->aftype == AF_INET)
119	<	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
120	<	else
121	<	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
118	>	conf->dns_pending = 1;
119	>
120	>	if (conf->aftype == AF_INET)
121	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
122	>	else
123	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
124	>	}
125	>
126	>	/* map_to_list()
127	>	*
128	>	* inputs       - ConfType conf
129	>	* output       - pointer to dlink_list to use
130	>	* side effects - none
131	>	*/
132	>	static dlink_list *
133	>	map_to_list(enum maskitem_type type)
134	>	{
135	>	switch (type)
136	>	{
137	>	case CONF_OPER:
138	>	return &operator_items;
139	>	break;
140	>	case CONF_SERVER:
141	>	return &connect_items;
142	>	break;
143	>	default:
144	>	return NULL;
145		}
146		}
147
148		struct MaskItem *
149		conf_make(enum maskitem_type type)
150		{
151	<	struct MaskItem *conf = MyCalloc(sizeof(*conf));
151	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
152		dlink_list *list = NULL;
153
154		conf->type   = type;
#	Line 142 | Line 163 | conf_make(enum maskitem_type type)
163		void
164		conf_free(struct MaskItem *conf)
165		{
166	<	dlink_node *ptr = NULL, *ptr_next = NULL;
166	>	dlink_node *node = NULL, *node_next = NULL;
167		dlink_list *list = NULL;
168
169		if ((list = map_to_list(conf->type)))
170		dlinkFindDelete(list, conf);
171
172	<	MyFree(conf->name);
172	>	xfree(conf->name);
173
174		if (conf->dns_pending)
175		delete_resolver_queries(conf);
#	Line 159 | Line 180 | conf_free(struct MaskItem *conf)
180
181		conf->class = NULL;
182
183	<	MyFree(conf->passwd);
184	<	MyFree(conf->spasswd);
185	<	MyFree(conf->reason);
186	<	MyFree(conf->certfp);
187	<	MyFree(conf->user);
188	<	MyFree(conf->host);
189	<	#ifdef HAVE_LIBCRYPTO
190	<	MyFree(conf->cipher_list);
183	>	xfree(conf->passwd);
184	>	xfree(conf->spasswd);
185	>	xfree(conf->reason);
186	>	xfree(conf->certfp);
187	>	xfree(conf->whois);
188	>	xfree(conf->user);
189	>	xfree(conf->host);
190	>	xfree(conf->cipher_list);
191
192	<	if (conf->rsa_public_key)
172	<	RSA_free(conf->rsa_public_key);
173	<	#endif
174	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
192	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
193		{
194	<	MyFree(ptr->data);
195	<	dlinkDelete(ptr, &conf->hub_list);
196	<	free_dlink_node(ptr);
194	>	xfree(node->data);
195	>	dlinkDelete(node, &conf->hub_list);
196	>	free_dlink_node(node);
197		}
198
199	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
199	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
200		{
201	<	MyFree(ptr->data);
202	<	dlinkDelete(ptr, &conf->leaf_list);
203	<	free_dlink_node(ptr);
201	>	xfree(node->data);
202	>	dlinkDelete(node, &conf->leaf_list);
203	>	free_dlink_node(node);
204		}
205
206	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->exempt_list.head)
206	>	xfree(conf);
207	>	}
208	>
209	>	/* attach_iline()
210	>	*
211	>	* inputs       - client pointer
212	>	*              - conf pointer
213	>	* output       -
214	>	* side effects - do actual attach
215	>	*/
216	>	static int
217	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
218	>	{
219	>	const struct ClassItem *const class = conf->class;
220	>	int a_limit_reached = 0;
221	>
222	>	struct ip_entry *ipcache = ipcache_find_or_add_address(&client_p->ip);
223	>	++ipcache->count_local;
224	>	AddFlag(client_p, FLAGS_IPHASH);
225	>
226	>	if (class->max_total && class->ref_count >= class->max_total)
227	>	a_limit_reached = 1;
228	>	else if (class->max_perip_local && ipcache->count_local > class->max_perip_local)
229	>	a_limit_reached = 1;
230	>	else if (class->max_perip_global &&
231	>	(ipcache->count_local + ipcache->count_remote) > class->max_perip_global)
232	>	a_limit_reached = 1;
233	>
234	>	if (a_limit_reached)
235		{
236	<	struct exempt *exptr = ptr->data;
236	>	if (!IsConfExemptLimits(conf))
237	>	return TOO_MANY;   /* Already at maximum allowed */
238	>
239	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
240	>	"but you have exceed_limit = yes;");
241	>	}
242	>
243	>	return conf_attach(client_p, conf);
244	>	}
245	>
246	>	/* verify_access()
247	>	*
248	>	* inputs       - pointer to client to verify
249	>	* output       - 0 if success -'ve if not
250	>	* side effect  - find the first (best) I line to attach.
251	>	*/
252	>	static int
253	>	verify_access(struct Client *client_p)
254	>	{
255	>	struct MaskItem *conf = NULL;
256	>
257	>	if (HasFlag(client_p, FLAGS_GOTID))
258	>	{
259	>	conf = find_address_conf(client_p->host, client_p->username,
260	>	&client_p->ip,
261	>	client_p->ip.ss.ss_family,
262	>	client_p->connection->password);
263	>	}
264	>	else
265	>	{
266	>	char non_ident[USERLEN + 1] = "~";
267	>
268	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
269	>	conf = find_address_conf(client_p->host, non_ident,
270	>	&client_p->ip,
271	>	client_p->ip.ss.ss_family,
272	>	client_p->connection->password);
273	>	}
274	>
275	>	if (!conf)
276	>	return NOT_AUTHORIZED;
277	>
278	>	assert(IsConfClient(conf) || IsConfKill(conf));
279	>
280	>	if (IsConfClient(conf))
281	>	{
282	>	if (IsConfRedir(conf))
283	>	{
284	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
285	>	conf->name ? conf->name : "",
286	>	conf->port);
287	>	return NOT_AUTHORIZED;
288	>	}
289	>
290	>	if (IsConfDoSpoofIp(conf))
291	>	{
292	>	if (IsConfSpoofNotice(conf))
293	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
294	>	client_p->name, client_p->host, conf->name);
295	>
296	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
297	>	}
298
299	<	dlinkDelete(ptr, &conf->exempt_list);
193	<	MyFree(exptr->name);
194	<	MyFree(exptr->user);
195	<	MyFree(exptr->host);
196	<	MyFree(exptr);
299	>	return attach_iline(client_p, conf);
300		}
301
302	<	MyFree(conf);
302	>	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
303	>	return BANNED_CLIENT;
304		}
305
306		/* check_client()
#	Line 226 | Line 330 | check_client(struct Client *source_p)
330		case TOO_MANY:
331		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
332		"Too many on IP for %s (%s).",
333	<	get_client_name(source_p, SHOW_IP),
333	>	client_get_name(source_p, SHOW_IP),
334		source_p->sockhost);
335		ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
336	<	get_client_name(source_p, SHOW_IP));
336	>	client_get_name(source_p, SHOW_IP));
337		++ServerStats.is_ref;
338		exit_client(source_p, "No more connections allowed on that IP");
339		break;
340
341		case I_LINE_FULL:
342		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
343	<	"auth{} block is full for %s (%s).",
344	<	get_client_name(source_p, SHOW_IP),
343	>	"auth {} block is full for %s (%s).",
344	>	client_get_name(source_p, SHOW_IP),
345		source_p->sockhost);
346		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
347	<	get_client_name(source_p, SHOW_IP));
347	>	client_get_name(source_p, SHOW_IP));
348		++ServerStats.is_ref;
349		exit_client(source_p, "No more connections allowed in your connection class");
350		break;
351
352		case NOT_AUTHORIZED:
249	–	++ServerStats.is_ref;
353		/* jdc - lists server name & port connections are on */
354		/*       a purely cosmetical change */
355		sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
356	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
357	<	get_client_name(source_p, SHOW_IP),
358	<	source_p->sockhost,
359	<	source_p->localClient->listener->name,
360	<	source_p->localClient->listener->port);
361	<	ilog(LOG_TYPE_IRCD,
362	<	"Unauthorized client connection from %s on [%s/%u].",
363	<	get_client_name(source_p, SHOW_IP),
261	<	source_p->localClient->listener->name,
262	<	source_p->localClient->listener->port);
356	>	"Unauthorized client connection from %s on [%s/%u].",
357	>	client_get_name(source_p, SHOW_IP),
358	>	source_p->connection->listener->name,
359	>	source_p->connection->listener->port);
360	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
361	>	client_get_name(source_p, SHOW_IP),
362	>	source_p->connection->listener->name,
363	>	source_p->connection->listener->port);
364
365	+	++ServerStats.is_ref;
366		exit_client(source_p, "You are not authorized to use this server");
367		break;
368
369	<	case BANNED_CLIENT:
370	<	exit_client(source_p, "Banned");
371	<	++ServerStats.is_ref;
372	<	break;
271	<
272	<	case 0:
273	<	default:
274	<	break;
275	<	}
276	<
277	<	return (i < 0 ? 0 : 1);
278	<	}
279	<
280	<	/* verify_access()
281	<	*
282	<	* inputs       - pointer to client to verify
283	<	* output       - 0 if success -'ve if not
284	<	* side effect  - find the first (best) I line to attach.
285	<	*/
286	<	static int
287	<	verify_access(struct Client *client_p)
288	<	{
289	<	struct MaskItem *conf = NULL;
290	<	char non_ident[USERLEN + 1] = "~";
291	<
292	<	if (IsGotId(client_p))
293	<	{
294	<	conf = find_address_conf(client_p->host, client_p->username,
295	<	&client_p->localClient->ip,
296	<	client_p->localClient->aftype,
297	<	client_p->localClient->password);
298	<	}
299	<	else
300	<	{
301	<	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
302	<	conf = find_address_conf(client_p->host,non_ident,
303	<	&client_p->localClient->ip,
304	<	client_p->localClient->aftype,
305	<	client_p->localClient->password);
306	<	}
307	<
308	<	if (conf)
309	<	{
310	<	if (IsConfClient(conf))
311	<	{
312	<	if (IsConfRedir(conf))
313	<	{
314	<	sendto_one_numeric(client_p, &me, RPL_REDIR,
315	<	conf->name ? conf->name : "",
316	<	conf->port);
317	<	return NOT_AUTHORIZED;
318	<	}
319	<
320	<	if (IsConfDoIdentd(conf))
321	<	SetNeedId(client_p);
322	<
323	<	/* Thanks for spoof idea amm */
324	<	if (IsConfDoSpoofIp(conf))
325	<	{
326	<	if (!ConfigGeneral.hide_spoof_ips && IsConfSpoofNotice(conf))
327	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
328	<	"%s spoofing: %s as %s",
329	<	client_p->name, client_p->host, conf->name);
330	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
331	<	AddFlag(client_p, FLAGS_IP_SPOOFING | FLAGS_AUTH_SPOOF);
332	<	}
333	<
334	<	return attach_iline(client_p, conf);
335	<	}
336	<	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
337	<	{
338	<	if (IsConfGline(conf))
339	<	sendto_one_notice(client_p, &me, ":*** G-lined");
340	<	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
341	<	return BANNED_CLIENT;
342	<	}
343	<	}
344	<
345	<	return NOT_AUTHORIZED;
346	<	}
347	<
348	<	/* attach_iline()
349	<	*
350	<	* inputs       - client pointer
351	<	*              - conf pointer
352	<	* output       -
353	<	* side effects - do actual attach
354	<	*/
355	<	static int
356	<	attach_iline(struct Client *client_p, struct MaskItem *conf)
357	<	{
358	<	const struct ClassItem *class = conf->class;
359	<	struct ip_entry *ip_found;
360	<	int a_limit_reached = 0;
361	<	unsigned int local = 0, global = 0, ident = 0;
362	<
363	<	ip_found = ipcache_find_or_add_address(&client_p->localClient->ip);
364	<	ip_found->count++;
365	<	AddFlag(client_p, FLAGS_IPHASH);
366	<
367	<	count_user_host(client_p->username, client_p->host,
368	<	&global, &local, &ident);
369	<
370	<	/* XXX blah. go down checking the various silly limits
371	<	* setting a_limit_reached if any limit is reached.
372	<	* - Dianora
373	<	*/
374	<	if (class->max_total && class->ref_count >= class->max_total)
375	<	a_limit_reached = 1;
376	<	else if (class->max_perip && ip_found->count > class->max_perip)
377	<	a_limit_reached = 1;
378	<	else if (class->max_local && local >= class->max_local)
379	<	a_limit_reached = 1;
380	<	else if (class->max_global && global >= class->max_global)
381	<	a_limit_reached = 1;
382	<	else if (class->max_ident && ident >= class->max_ident &&
383	<	client_p->username[0] != '~')
384	<	a_limit_reached = 1;
385	<
386	<	if (a_limit_reached)
387	<	{
388	<	if (!IsConfExemptLimits(conf))
389	<	return TOO_MANY;   /* Already at maximum allowed */
369	>	case BANNED_CLIENT:
370	>	++ServerStats.is_ref;
371	>	exit_client(source_p, "Banned");
372	>	break;
373
374	<	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
375	<	"but you have exceed_limit = yes;");
374	>	case 0:
375	>	default:
376	>	break;
377		}
378
379	<	return attach_conf(client_p, conf);
379	>	return !(i < 0);
380		}
381
382	<	/* detach_conf()
383	<	*
384	<	* inputs       - pointer to client to detach
385	<	*              - type of conf to detach
402	<	* output       - 0 for success, -1 for failure
403	<	* side effects - Disassociate configuration from the client.
404	<	*                Also removes a class from the list if marked for deleting.
382	>	/*! \brief Disassociate configuration from the client. Also removes a class
383	>	*         from the list if marked for deleting.
384	>	* \param client_p Client to operate on
385	>	* \param type     Type of conf to detach
386		*/
387		void
388	<	detach_conf(struct Client *client_p, enum maskitem_type type)
388	>	conf_detach(struct Client *client_p, enum maskitem_type type)
389		{
390	<	dlink_node *ptr = NULL, *ptr_next = NULL;
390	>	dlink_node *node, *node_next;
391
392	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->confs.head)
392	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
393		{
394	<	struct MaskItem *conf = ptr->data;
394	>	struct MaskItem *conf = node->data;
395
396		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
397		assert(conf->ref_count > 0);
#	Line 419 | Line 400 | detach_conf(struct Client *client_p, enu
400		if (!(conf->type & type))
401		continue;
402
403	<	dlinkDelete(ptr, &client_p->localClient->confs);
404	<	free_dlink_node(ptr);
403	>	dlinkDelete(node, &client_p->connection->confs);
404	>	free_dlink_node(node);
405
406		if (conf->type == CONF_CLIENT)
407	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
407	>	remove_from_cidr_check(&client_p->ip, conf->class);
408
409		if (--conf->class->ref_count == 0 && conf->class->active == 0)
410		{
#	Line 436 | Line 417 | detach_conf(struct Client *client_p, enu
417		}
418		}
419
420	<	/* attach_conf()
421	<	*
422	<	* inputs       - client pointer
423	<	*              - conf pointer
424	<	* output       -
444	<	* side effects - Associate a specific configuration entry to a *local*
445	<	*                client (this is the one which used in accepting the
446	<	*                connection). Note, that this automatically changes the
447	<	*                attachment if there was an old one...
420	>	/*! \brief Associate a specific configuration entry to a *local* client (this
421	>	*         is the one which used in accepting the connection). Note, that this
422	>	*         automatically changes the attachment if there was an old one.
423	>	* \param client_p Client to attach the conf to
424	>	* \param conf Configuration record to attach
425		*/
426		int
427	<	attach_conf(struct Client *client_p, struct MaskItem *conf)
427	>	conf_attach(struct Client *client_p, struct MaskItem *conf)
428		{
429	<	if (dlinkFind(&client_p->localClient->confs, conf))
429	>	if (dlinkFind(&client_p->connection->confs, conf))
430		return 1;
431
432		if (conf->type == CONF_CLIENT)
433		if (cidr_limit_reached(IsConfExemptLimits(conf),
434	<	&client_p->localClient->ip, conf->class))
434	>	&client_p->ip, conf->class))
435		return TOO_MANY;    /* Already at maximum allowed */
436
437		conf->class->ref_count++;
438		conf->ref_count++;
439
440	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
464	<
465	<	return 0;
466	<	}
467	<
468	<	/* attach_connect_block()
469	<	*
470	<	* inputs       - pointer to server to attach
471	<	*              - name of server
472	<	*              - hostname of server
473	<	* output       - true (1) if both are found, otherwise return false (0)
474	<	* side effects - find connect block and attach them to connecting client
475	<	*/
476	<	int
477	<	attach_connect_block(struct Client *client_p, const char *name,
478	<	const char *host)
479	<	{
480	<	dlink_node *ptr;
481	<	struct MaskItem *conf = NULL;
482	<
483	<	assert(client_p != NULL);
484	<	assert(host != NULL);
485	<
486	<	if (client_p == NULL || host == NULL)
487	<	return 0;
488	<
489	<	DLINK_FOREACH(ptr, server_items.head)
490	<	{
491	<	conf = ptr->data;
492	<
493	<	if (match(conf->name, name) || match(conf->host, host))
494	<	continue;
495	<
496	<	attach_conf(client_p, conf);
497	<	return -1;
498	<	}
440	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
441
442		return 0;
443		}
#	Line 512 | Line 454 | attach_connect_block(struct Client *clie
454		struct MaskItem *
455		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
456		{
457	<	dlink_node *ptr;
516	<	struct MaskItem* conf;
457	>	dlink_node *node = NULL;
458
459	<	DLINK_FOREACH(ptr, list->head)
459	>	DLINK_FOREACH(node, list->head)
460		{
461	<	conf = ptr->data;
461	>	struct MaskItem *conf = node->data;
462
463		if (conf->type == type)
464		{
465	<	if (conf->name && (!irccmp(conf->name, name) ||
466	<	!match(conf->name, name)))
526	<	return conf;
465	>	if (conf->name && !irccmp(conf->name, name))
466	>	return conf;
467		}
468		}
469
470		return NULL;
471		}
472
473	<	/* map_to_list()
474	<	*
475	<	* inputs       - ConfType conf
536	<	* output       - pointer to dlink_list to use
537	<	* side effects - none
538	<	*/
539	<	static dlink_list *
540	<	map_to_list(enum maskitem_type type)
541	<	{
542	<	switch(type)
543	<	{
544	<	case CONF_XLINE:
545	<	return(&xconf_items);
546	<	break;
547	<	case CONF_ULINE:
548	<	return(&uconf_items);
549	<	break;
550	<	case CONF_NRESV:
551	<	return(&nresv_items);
552	<	break;
553	<	case CONF_CRESV:
554	<	return(&cresv_items);
555	<	case CONF_OPER:
556	<	return(&oconf_items);
557	<	break;
558	<	case CONF_SERVER:
559	<	return(&server_items);
560	<	break;
561	<	case CONF_SERVICE:
562	<	return(&service_items);
563	<	break;
564	<	case CONF_CLUSTER:
565	<	return(&cluster_items);
566	<	break;
567	<	default:
568	<	return NULL;
569	<	}
570	<	}
571	<
572	<	/* find_matching_name_conf()
573	<	*
574	<	* inputs       - type of link list to look in
575	<	*              - pointer to name string to find
576	<	*              - pointer to user
577	<	*              - pointer to host
578	<	*              - optional flags to match on as well
579	<	* output       - NULL or pointer to found struct MaskItem
580	<	* side effects - looks for a match on name field
473	>	/*! \brief Find a connect {} conf that has a name that matches \a name.
474	>	* \param name Name to match
475	>	* \param compare Pointer to function to be used for string matching
476		*/
477		struct MaskItem *
478	<	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
584	<	const char *host, unsigned int flags)
478	>	connect_find(const char *name, int (*compare)(const char *, const char *))
479		{
480	<	dlink_node *ptr=NULL;
587	<	struct MaskItem *conf=NULL;
588	<	dlink_list *list_p = map_to_list(type);
480	>	dlink_node *node;
481
482	<	switch (type)
482	>	DLINK_FOREACH(node, connect_items.head)
483		{
484	<	case CONF_SERVICE:
593	<	DLINK_FOREACH(ptr, list_p->head)
594	<	{
595	<	conf = ptr->data;
596	<
597	<	if (EmptyString(conf->name))
598	<	continue;
599	<	if ((name != NULL) && !irccmp(name, conf->name))
600	<	return conf;
601	<	}
602	<	break;
603	<
604	<	case CONF_XLINE:
605	<	case CONF_ULINE:
606	<	case CONF_NRESV:
607	<	case CONF_CRESV:
608	<	DLINK_FOREACH(ptr, list_p->head)
609	<	{
610	<	conf = ptr->data;
611	<
612	<	if (EmptyString(conf->name))
613	<	continue;
614	<	if ((name != NULL) && !match(conf->name, name))
615	<	{
616	<	if ((user == NULL && (host == NULL)))
617	<	return conf;
618	<	if ((conf->flags & flags) != flags)
619	<	continue;
620	<	if (EmptyString(conf->user) || EmptyString(conf->host))
621	<	return conf;
622	<	if (!match(conf->user, user) && !match(conf->host, host))
623	<	return conf;
624	<	}
625	<	}
626	<	break;
627	<
628	<	case CONF_SERVER:
629	<	DLINK_FOREACH(ptr, list_p->head)
630	<	{
631	<	conf = ptr->data;
632	<
633	<	if ((name != NULL) && !match(name, conf->name))
634	<	return conf;
635	<	else if ((host != NULL) && !match(host, conf->host))
636	<	return conf;
637	<	}
638	<	break;
484	>	struct MaskItem *conf = node->data;
485
486	<	default:
487	<	break;
486	>	if (!compare(name, conf->name))
487	>	return conf;
488		}
489	+
490		return NULL;
491		}
492
#	Line 653 | Line 500 | find_matching_name_conf(enum maskitem_ty
500		* side effects - looks for an exact match on name field
501		*/
502		struct MaskItem *
503	<	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
657	<	const char *user, const char *host)
503	>	operator_find(const struct Client *who, const char *name)
504		{
505	<	dlink_node *ptr = NULL;
660	<	struct MaskItem *conf;
661	<	dlink_list *list_p = map_to_list(type);
505	>	dlink_node *node = NULL;
506
507	<	switch(type)
507	>	DLINK_FOREACH(node, operator_items.head)
508		{
509	<	case CONF_XLINE:
666	<	case CONF_ULINE:
667	<	case CONF_NRESV:
668	<	case CONF_CRESV:
509	>	struct MaskItem *conf = node->data;
510
511	<	DLINK_FOREACH(ptr, list_p->head)
511	>	if (!irccmp(conf->name, name))
512		{
513	<	conf = ptr->data;
514	<
674	<	if (EmptyString(conf->name))
675	<	continue;
676	<
677	<	if (irccmp(conf->name, name) == 0)
678	<	{
679	<	if ((user == NULL && (host == NULL)))
680	<	return conf;
681	<	if (EmptyString(conf->user) || EmptyString(conf->host))
682	<	return conf;
683	<	if (!match(conf->user, user) && !match(conf->host, host))
684	<	return conf;
685	<	}
686	<	}
687	<	break;
688	<
689	<	case CONF_OPER:
690	<	DLINK_FOREACH(ptr, list_p->head)
691	<	{
692	<	conf = ptr->data;
693	<
694	<	if (EmptyString(conf->name))
695	<	continue;
513	>	if (!who)
514	>	return conf;
515
516	<	if (!irccmp(conf->name, name))
516	>	if (!match(conf->user, who->username))
517		{
518	<	if (!who)
700	<	return conf;
701	<	if (EmptyString(conf->user) || EmptyString(conf->host))
702	<	return NULL;
703	<	if (!match(conf->user, who->username))
518	>	switch (conf->htype)
519		{
520	<	switch (conf->htype)
521	<	{
522	<	case HM_HOST:
523	<	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
520	>	case HM_HOST:
521	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
522	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
523	>	return conf;
524	>	break;
525	>	case HM_IPV4:
526	>	if (who->ip.ss.ss_family == AF_INET)
527	>	if (match_ipv4(&who->ip, &conf->addr, conf->bits))
528	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
529	>	return conf;
530	>	break;
531	>	case HM_IPV6:
532	>	if (who->ip.ss.ss_family == AF_INET6)
533	>	if (match_ipv6(&who->ip, &conf->addr, conf->bits))
534		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
535		return conf;
536	<	break;
537	<	case HM_IPV4:
538	<	if (who->localClient->aftype == AF_INET)
714	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
715	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
716	<	return conf;
717	<	break;
718	<	case HM_IPV6:
719	<	if (who->localClient->aftype == AF_INET6)
720	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
721	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
722	<	return conf;
723	<	break;
724	<	default:
725	<	assert(0);
726	<	}
536	>	break;
537	>	default:
538	>	assert(0);
539		}
540		}
541		}
730	–
731	–	break;
732	–
733	–	case CONF_SERVER:
734	–	DLINK_FOREACH(ptr, list_p->head)
735	–	{
736	–	conf = ptr->data;
737	–
738	–	if (EmptyString(conf->name))
739	–	continue;
740	–
741	–	if (name == NULL)
742	–	{
743	–	if (EmptyString(conf->host))
744	–	continue;
745	–	if (irccmp(conf->host, host) == 0)
746	–	return conf;
747	–	}
748	–	else if (irccmp(conf->name, name) == 0)
749	–	return conf;
750	–	}
751	–
752	–	break;
753	–
754	–	default:
755	–	break;
542		}
543
544		return NULL;
545		}
546
761	–	/* rehash()
762	–	*
763	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
764	–	* as a result of an operator issuing this command, else assume it has been
765	–	* called as a result of the server receiving a HUP signal.
766	–	*/
767	–	int
768	–	rehash(int sig)
769	–	{
770	–	if (sig)
771	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
772	–	"Got signal SIGHUP, reloading configuration file(s)");
773	–
774	–	restart_resolver();
775	–
776	–	/* don't close listeners until we know we can go ahead with the rehash */
777	–
778	–	read_conf_files(0);
779	–
780	–	load_conf_modules();
781	–	check_conf_klines();
782	–
783	–	return 0;
784	–	}
785	–
547		/* set_default_conf()
548		*
549		* inputs       - NONE
#	Line 800 | Line 561 | set_default_conf(void)
561		*/
562		assert(class_default == class_get_list()->tail->data);
563
803	–	#ifdef HAVE_LIBCRYPTO
804	–	#if OPENSSL_VERSION_NUMBER >= 0x1000005FL && !defined(OPENSSL_NO_ECDH)
805	–	{
806	–	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
807	–
808	–	if (key)
809	–	{
810	–	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
811	–	EC_KEY_free(key);
812	–	}
813	–	}
814	–
815	–	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
816	–	#endif
817	–
818	–	ConfigServerInfo.message_digest_algorithm = EVP_sha256();
819	–	ConfigServerInfo.rsa_private_key = NULL;
820	–	ConfigServerInfo.rsa_private_key_file = NULL;
821	–	#endif
822	–
823	–	/* ConfigServerInfo.name is not rehashable */
824	–	/* ConfigServerInfo.name = ConfigServerInfo.name; */
825	–	ConfigServerInfo.description = NULL;
564		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
565		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
566
#	Line 831 | Line 569 | set_default_conf(void)
569		memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
570		ConfigServerInfo.specific_ipv6_vhost = 0;
571
572	<	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
572	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
573		ConfigServerInfo.max_nick_length = 9;
574		ConfigServerInfo.max_topic_length = 80;
575		ConfigServerInfo.hub = 0;
576
839	–	ConfigAdminInfo.name = NULL;
840	–	ConfigAdminInfo.email = NULL;
841	–	ConfigAdminInfo.description = NULL;
842	–
577		log_del_all();
578
579		ConfigLog.use_logging = 1;
#	Line 847 | Line 581 | set_default_conf(void)
581		ConfigChannel.disable_fake_channels = 0;
582		ConfigChannel.invite_client_count = 10;
583		ConfigChannel.invite_client_time = 300;
584	+	ConfigChannel.invite_delay_channel = 5;
585	+	ConfigChannel.invite_expire_time = 1800;
586		ConfigChannel.knock_client_count = 1;
587		ConfigChannel.knock_client_time = 300;
588		ConfigChannel.knock_delay_channel = 60;
589		ConfigChannel.max_channels = 25;
590	<	ConfigChannel.max_bans = 25;
591	<	ConfigChannel.default_split_user_count = 0;
592	<	ConfigChannel.default_split_server_count = 0;
593	<	ConfigChannel.no_join_on_split = 0;
594	<	ConfigChannel.no_create_on_split = 0;
590	>	ConfigChannel.max_invites = 20;
591	>	ConfigChannel.max_bans = 100;
592	>	ConfigChannel.max_bans_large = 500;
593	>	ConfigChannel.default_join_flood_count = 18;
594	>	ConfigChannel.default_join_flood_time = 6;
595
596		ConfigServerHide.flatten_links = 0;
597	<	ConfigServerHide.links_delay = 300;
597	>	ConfigServerHide.flatten_links_delay = 300;
598		ConfigServerHide.hidden = 0;
599		ConfigServerHide.hide_servers = 0;
600		ConfigServerHide.hide_services = 0;
#	Line 868 | Line 604 | set_default_conf(void)
604
605		ConfigGeneral.away_count = 2;
606		ConfigGeneral.away_time = 10;
607	<	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
608	<	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
607	>	ConfigGeneral.max_watch = 50;
608	>	ConfigGeneral.whowas_history_length = 15000;
609		ConfigGeneral.cycle_on_host_change = 1;
610	<	ConfigGeneral.glines = 0;
611	<	ConfigGeneral.gline_time = 12 * 3600;
612	<	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
613	<	ConfigGeneral.gline_min_cidr = 16;
878	<	ConfigGeneral.gline_min_cidr6 = 48;
610	>	ConfigGeneral.dline_min_cidr = 16;
611	>	ConfigGeneral.dline_min_cidr6 = 48;
612	>	ConfigGeneral.kline_min_cidr = 16;
613	>	ConfigGeneral.kline_min_cidr6 = 48;
614		ConfigGeneral.invisible_on_connect = 1;
615		ConfigGeneral.tkline_expire_notices = 1;
881	–	ConfigGeneral.hide_spoof_ips = 1;
616		ConfigGeneral.ignore_bogus_ts = 0;
617		ConfigGeneral.disable_auth = 0;
618		ConfigGeneral.kill_chase_time_limit = 90;
619		ConfigGeneral.default_floodcount = 8;
620	+	ConfigGeneral.default_floodtime = 1;
621		ConfigGeneral.failed_oper_notice = 1;
622		ConfigGeneral.dots_in_ident = 0;
623		ConfigGeneral.min_nonwildcard = 4;
624		ConfigGeneral.min_nonwildcard_simple = 3;
625	<	ConfigGeneral.max_accept = 20;
625	>	ConfigGeneral.max_accept = 50;
626		ConfigGeneral.anti_nick_flood = 0;
627		ConfigGeneral.max_nick_time = 20;
628		ConfigGeneral.max_nick_changes = 5;
629		ConfigGeneral.anti_spam_exit_message_time = 0;
630	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
631	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
630	>	ConfigGeneral.ts_warn_delta = 30;
631	>	ConfigGeneral.ts_max_delta = 600;
632		ConfigGeneral.warn_no_connect_block = 1;
633		ConfigGeneral.stats_e_disabled = 0;
899	–	ConfigGeneral.stats_o_oper_only = 0;
900	–	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
634		ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
635	+	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
636	+	ConfigGeneral.stats_o_oper_only = 1;
637	+	ConfigGeneral.stats_m_oper_only = 1;
638		ConfigGeneral.stats_P_oper_only = 0;
639		ConfigGeneral.stats_u_oper_only = 0;
640		ConfigGeneral.caller_id_wait = 60;
641	<	ConfigGeneral.opers_bypass_callerid = 0;
641	>	ConfigGeneral.opers_bypass_callerid = 1;
642		ConfigGeneral.pace_wait = 10;
643		ConfigGeneral.pace_wait_simple = 1;
644		ConfigGeneral.short_motd = 0;
645		ConfigGeneral.ping_cookie = 0;
646		ConfigGeneral.no_oper_flood = 0;
911	–	ConfigGeneral.true_no_oper_flood = 0;
912	–	ConfigGeneral.oper_pass_resv = 1;
647		ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
648	<	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
648	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
649	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
650	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
651		ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
652		ConfigGeneral.throttle_count = 1;
653		ConfigGeneral.throttle_time = 1;
#	Line 920 | Line 656 | set_default_conf(void)
656		static void
657		validate_conf(void)
658		{
659	<	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
924	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
925	<
926	<	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
927	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
928	<
929	<	if (ConfigServerInfo.network_name == NULL)
659	>	if (EmptyString(ConfigServerInfo.network_name))
660		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
661
662	<	if (ConfigServerInfo.network_desc == NULL)
662	>	if (EmptyString(ConfigServerInfo.network_desc))
663		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
934	–
935	–	if (ConfigGeneral.service_name == NULL)
936	–	ConfigGeneral.service_name = xstrdup(SERVICE_NAME_DEFAULT);
937	–
938	–	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
664		}
665
666		/* read_conf()
#	Line 947 | Line 672 | validate_conf(void)
672		static void
673		read_conf(FILE *file)
674		{
675	<	lineno = 0;
675	>	lineno = 1;
676
677		set_default_conf();  /* Set default values prior to conf parsing */
678		conf_parser_ctx.pass = 1;
#	Line 959 | Line 684 | read_conf(FILE *file)
684		yyparse();  /* Load the values from the conf */
685		validate_conf();  /* Check to make sure some values are still okay. */
686		/* Some global values are also loaded here. */
687	+	whowas_trim();  /* Attempt to trim whowas list if necessary */
688		class_delete_marked();  /* Delete unused classes that are marked for deletion */
689		}
690
691	+	/* conf_rehash()
692	+	*
693	+	* Actual REHASH service routine. Called with sig == 0 if it has been called
694	+	* as a result of an operator issuing this command, else assume it has been
695	+	* called as a result of the server receiving a HUP signal.
696	+	*/
697	+	void
698	+	conf_rehash(int sig)
699	+	{
700	+	if (sig)
701	+	{
702	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
703	+	"Got signal SIGHUP, reloading configuration file(s)");
704	+	ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
705	+	}
706	+
707	+	restart_resolver();
708	+
709	+	/* don't close listeners until we know we can go ahead with the rehash */
710	+
711	+	read_conf_files(0);
712	+
713	+	load_conf_modules();
714	+	check_conf_klines();
715	+	}
716	+
717		/* lookup_confhost()
718		*
719		* start DNS lookups of all hostnames in the conf
#	Line 1010 | Line 762 | int
762		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
763		{
764		struct ip_entry *ip_found = NULL;
765	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
1014	<
1015	<	/* DLINE exempt also gets you out of static limits/pacing... */
1016	<	if (conf && (conf->type == CONF_EXEMPT))
1017	<	return 0;
765	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
766
767		if (conf)
768	+	{
769	+	/* DLINE exempt also gets you out of static limits/pacing... */
770	+	if (conf->type == CONF_EXEMPT)
771	+	return 0;
772		return BANNED_CLIENT;
773	+	}
774
775		ip_found = ipcache_find_or_add_address(addr);
776
#	Line 1046 | Line 799 | void
799		cleanup_tklines(void *unused)
800		{
801		hostmask_expire_temporary();
802	<	expire_tklines(&xconf_items);
803	<	expire_tklines(&nresv_items);
1051	<	expire_tklines(&cresv_items);
1052	<	}
1053	<
1054	<	/* expire_tklines()
1055	<	*
1056	<	* inputs       - tkline list pointer
1057	<	* output       - NONE
1058	<	* side effects - expire tklines
1059	<	*/
1060	<	static void
1061	<	expire_tklines(dlink_list *tklist)
1062	<	{
1063	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1064	<	struct MaskItem *conf = NULL;
1065	<
1066	<	DLINK_FOREACH_SAFE(ptr, ptr_next, tklist->head)
1067	<	{
1068	<	conf = ptr->data;
1069	<
1070	<	if (!conf->until || conf->until > CurrentTime)
1071	<	continue;
1072	<
1073	<	if (conf->type == CONF_XLINE)
1074	<	{
1075	<	if (ConfigGeneral.tkline_expire_notices)
1076	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1077	<	"Temporary X-line for [%s] expired", conf->name);
1078	<	conf_free(conf);
1079	<	}
1080	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1081	<	{
1082	<	if (ConfigGeneral.tkline_expire_notices)
1083	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1084	<	"Temporary RESV for [%s] expired", conf->name);
1085	<	conf_free(conf);
1086	<	}
1087	<	}
802	>	gecos_expire();
803	>	resv_expire();
804		}
805
806		/* oper_privs_as_string()
#	Line 1093 | Line 809 | expire_tklines(dlink_list *tklist)
809		* output        - pointer to static string showing oper privs
810		* side effects  - return as string, the oper privs as derived from port
811		*/
812	<	static const struct oper_privs
812	>	static const struct oper_flags
813		{
814		const unsigned int flag;
815		const unsigned char c;
816	<	} flag_list[] = {
816	>	} flag_table[] = {
817		{ OPER_FLAG_ADMIN,          'A' },
818	<	{ OPER_FLAG_REMOTEBAN,      'B' },
819	<	{ OPER_FLAG_DIE,            'D' },
820	<	{ OPER_FLAG_GLINE,          'G' },
821	<	{ OPER_FLAG_REHASH,         'H' },
818	>	{ OPER_FLAG_CLOSE,          'B' },
819	>	{ OPER_FLAG_CONNECT,        'C' },
820	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
821	>	{ OPER_FLAG_DIE,            'E' },
822	>	{ OPER_FLAG_DLINE,          'F' },
823	>	{ OPER_FLAG_GLOBOPS,        'G' },
824	>	{ OPER_FLAG_JOIN_RESV,      'H' },
825	>	{ OPER_FLAG_KILL,           'I' },
826	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
827		{ OPER_FLAG_KLINE,          'K' },
828	<	{ OPER_FLAG_KILL,           'N' },
829	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
830	<	{ OPER_FLAG_CONNECT,        'P' },
831	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
832	<	{ OPER_FLAG_SQUIT,          'R' },
833	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
834	<	{ OPER_FLAG_UNKLINE,        'U' },
835	<	{ OPER_FLAG_XLINE,          'X' },
828	>	{ OPER_FLAG_LOCOPS,         'L' },
829	>	{ OPER_FLAG_MODULE,         'M' },
830	>	{ OPER_FLAG_NICK_RESV,      'N' },
831	>	{ OPER_FLAG_OPME,           'O' },
832	>	{ OPER_FLAG_REHASH,         'P' },
833	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
834	>	{ OPER_FLAG_RESTART,        'R' },
835	>	{ OPER_FLAG_RESV,           'S' },
836	>	{ OPER_FLAG_SET,            'T' },
837	>	{ OPER_FLAG_SQUIT,          'U' },
838	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
839	>	{ OPER_FLAG_UNDLINE,        'W' },
840	>	{ OPER_FLAG_UNKLINE,        'X' },
841	>	{ OPER_FLAG_UNRESV,         'Y' },
842	>	{ OPER_FLAG_UNXLINE,        'Z' },
843	>	{ OPER_FLAG_WALLOPS,        'a' },
844	>	{ OPER_FLAG_XLINE,          'b' },
845		{ 0, '\0' }
846		};
847
848	<	char *
849	<	oper_privs_as_string(const unsigned int port)
848	>	const char *
849	>	oper_privs_as_string(const unsigned int flags)
850		{
851	<	static char privs_out[IRCD_BUFSIZE];
852	<	char *privs_ptr = privs_out;
851	>	static char buf[sizeof(flag_table) / sizeof(flag_table[0])];
852	>	char *p = buf;
853
854	<	for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
855	<	{
856	<	if (port & opriv->flag)
857	<	*privs_ptr++ = opriv->c;
858	<	else
859	<	*privs_ptr++ = ToLower(opriv->c);
1130	<	}
854	>	for (const struct oper_flags *tab = flag_table; tab->flag; ++tab)
855	>	if (flags & tab->flag)
856	>	*p++ = tab->c;
857	>
858	>	if (p == buf)
859	>	*p++ = '0';
860
861	<	*privs_ptr = '\0';
861	>	*p = '\0';
862
863	<	return privs_out;
863	>	return buf;
864		}
865
866		/*
#	Line 1143 | Line 872 | oper_privs_as_string(const unsigned int
872		const char *
873		get_oper_name(const struct Client *client_p)
874		{
875	<	const dlink_node *cnode = NULL;
876	<	/* +5 for !,@,{,} and null */
877	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
875	>	static char buffer[IRCD_BUFSIZE];
876	>
877	>	if (IsServer(client_p))
878	>	return client_p->name;
879
880		if (MyConnect(client_p))
881		{
882	<	if ((cnode = client_p->localClient->confs.head))
882	>	const dlink_node *const node = client_p->connection->confs.head;
883	>
884	>	if (node)
885		{
886	<	const struct MaskItem *conf = cnode->data;
886	>	const struct MaskItem *const conf = node->data;
887
888	<	if (IsConfOperator(conf))
888	>	if (conf->type == CONF_OPER)
889		{
890		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
891		client_p->username, client_p->host, conf->name);
#	Line 1173 | Line 905 | get_oper_name(const struct Client *clien
905		return buffer;
906		}
907
908	+	/* clear_out_old_conf()
909	+	*
910	+	* inputs       - none
911	+	* output       - none
912	+	* side effects - Clear out the old configuration
913	+	*/
914	+	static void
915	+	clear_out_old_conf(void)
916	+	{
917	+	dlink_node *node = NULL, *node_next = NULL;
918	+	dlink_list *free_items [] = {
919	+	&connect_items, &operator_items, NULL
920	+	};
921	+
922	+	dlink_list ** iterator = free_items; /* C is dumb */
923	+
924	+	/* We only need to free anything allocated by yyparse() here.
925	+	* Resetting structs, etc, is taken care of by set_default_conf().
926	+	*/
927	+
928	+	for (; *iterator; iterator++)
929	+	{
930	+	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
931	+	{
932	+	struct MaskItem *conf = node->data;
933	+
934	+	conf->active = 0;
935	+	dlinkDelete(&conf->node, *iterator);
936	+
937	+	if (!conf->ref_count)
938	+	conf_free(conf);
939	+	}
940	+	}
941	+
942	+	/*
943	+	* Don't delete the class table, rather mark all entries for deletion.
944	+	* The table is cleaned up by class_delete_marked. - avalon
945	+	*/
946	+	class_mark_for_deletion();
947	+
948	+	clear_out_address_conf();
949	+
950	+	modules_conf_clear();  /* Clear modules {} items */
951	+
952	+	motd_clear();  /* Clear motd {} items and re-cache default motd */
953	+
954	+	cluster_clear();  /* Clear cluster {} items */
955	+
956	+	gecos_clear();  /* Clear gecos {} items */
957	+
958	+	resv_clear();  /* Clear resv {} items */
959	+
960	+	service_clear();  /* Clear service {} items */
961	+
962	+	shared_clear();  /* Clear shared {} items */
963	+
964	+	pseudo_clear();  /* Clear pseudo {} items */
965	+
966	+	/* Clean out ConfigServerInfo */
967	+	xfree(ConfigServerInfo.description);
968	+	ConfigServerInfo.description = NULL;
969	+	xfree(ConfigServerInfo.network_name);
970	+	ConfigServerInfo.network_name = NULL;
971	+	xfree(ConfigServerInfo.network_desc);
972	+	ConfigServerInfo.network_desc = NULL;
973	+	xfree(ConfigServerInfo.rsa_private_key_file);
974	+	ConfigServerInfo.rsa_private_key_file = NULL;
975	+	xfree(ConfigServerInfo.ssl_certificate_file);
976	+	ConfigServerInfo.ssl_certificate_file = NULL;
977	+	xfree(ConfigServerInfo.ssl_dh_param_file);
978	+	ConfigServerInfo.ssl_dh_param_file = NULL;
979	+	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
980	+	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
981	+	xfree(ConfigServerInfo.ssl_cipher_list);
982	+	ConfigServerInfo.ssl_cipher_list = NULL;
983	+	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
984	+	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
985	+
986	+	/* Clean out ConfigAdminInfo */
987	+	xfree(ConfigAdminInfo.name);
988	+	ConfigAdminInfo.name = NULL;
989	+	xfree(ConfigAdminInfo.email);
990	+	ConfigAdminInfo.email = NULL;
991	+	xfree(ConfigAdminInfo.description);
992	+	ConfigAdminInfo.description = NULL;
993	+
994	+	/* Clean out ConfigServerHide */
995	+	xfree(ConfigServerHide.flatten_links_file);
996	+	ConfigServerHide.flatten_links_file = NULL;
997	+	xfree(ConfigServerHide.hidden_name);
998	+	ConfigServerHide.hidden_name = NULL;
999	+
1000	+	/* Clean out listeners */
1001	+	listener_close_marked();
1002	+	}
1003	+
1004	+	static void
1005	+	conf_handle_tls(int cold)
1006	+	{
1007	+	if (!tls_new_cred())
1008	+	{
1009	+	if (cold)
1010	+	{
1011	+	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1012	+	exit(EXIT_FAILURE);
1013	+	}
1014	+	else
1015	+	{
1016	+	/* Failed to load new settings/certs, old ones remain active */
1017	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1018	+	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1019	+	}
1020	+	}
1021	+	}
1022	+
1023		/* read_conf_files()
1024		*
1025		* inputs       - cold start YES or NO
#	Line 1203 | Line 1050 | read_conf_files(int cold)
1050		{
1051		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1052		filename, strerror(errno));
1053	<	exit(-1);
1053	>	exit(EXIT_FAILURE);
1054		}
1055		else
1056		{
1057	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1057	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1058		"Unable to read configuration file '%s': %s",
1059		filename, strerror(errno));
1060		return;
#	Line 1221 | Line 1068 | read_conf_files(int cold)
1068		fclose(conf_parser_ctx.conf_file);
1069
1070		log_reopen_all();
1071	+	conf_handle_tls(cold);
1072
1073	<	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1074	<	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1073	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1074	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1075
1076	<	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1077	<	add_isupport("MAXLIST", chanmodes, -1);
1078	<	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1079	<	add_isupport("CHANTYPES", "#", -1);
1076	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1077	>	isupport_add("MAXLIST", chanmodes, -1);
1078	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1079	>	isupport_add("CHANTYPES", "#", -1);
1080
1081	<	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1081	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1082		ConfigChannel.max_channels);
1083	<	add_isupport("CHANLIMIT", chanlimit, -1);
1084	<	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1085	<	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1086	<	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1087	<	add_isupport("CHANMODES", chanmodes, -1);
1240	<
1241	<	/*
1242	<	* message_locale may have changed.  rebuild isupport since it relies
1243	<	* on strlen(form_str(RPL_ISUPPORT))
1244	<	*/
1245	<	rebuild_isupport_message_line();
1246	<	}
1247	<
1248	<	/* clear_out_old_conf()
1249	<	*
1250	<	* inputs       - none
1251	<	* output       - none
1252	<	* side effects - Clear out the old configuration
1253	<	*/
1254	<	static void
1255	<	clear_out_old_conf(void)
1256	<	{
1257	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1258	<	dlink_list *free_items [] = {
1259	<	&server_items,   &oconf_items,
1260	<	&uconf_items,   &xconf_items,
1261	<	&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1262	<	};
1263	<
1264	<	dlink_list ** iterator = free_items; /* C is dumb */
1265	<
1266	<	/* We only need to free anything allocated by yyparse() here.
1267	<	* Resetting structs, etc, is taken care of by set_default_conf().
1268	<	*/
1269	<
1270	<	for (; *iterator != NULL; iterator++)
1271	<	{
1272	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1273	<	{
1274	<	struct MaskItem *conf = ptr->data;
1275	<
1276	<	conf->active = 0;
1277	<	dlinkDelete(&conf->node, *iterator);
1278	<
1279	<	/* XXX This is less than pretty */
1280	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1281	<	{
1282	<	if (!conf->ref_count)
1283	<	conf_free(conf);
1284	<	}
1285	<	else if (conf->type == CONF_XLINE)
1286	<	{
1287	<	if (!conf->until)
1288	<	conf_free(conf);
1289	<	}
1290	<	else
1291	<	conf_free(conf);
1292	<	}
1293	<	}
1294	<
1295	<	motd_clear();
1296	<
1297	<	/*
1298	<	* don't delete the class table, rather mark all entries
1299	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1300	<	*/
1301	<	class_mark_for_deletion();
1302	<
1303	<	clear_out_address_conf();
1304	<
1305	<	/* clean out module paths */
1306	<	mod_clear_paths();
1307	<
1308	<	/* clean out ConfigServerInfo */
1309	<	MyFree(ConfigServerInfo.description);
1310	<	ConfigServerInfo.description = NULL;
1311	<	MyFree(ConfigServerInfo.network_name);
1312	<	ConfigServerInfo.network_name = NULL;
1313	<	MyFree(ConfigServerInfo.network_desc);
1314	<	ConfigServerInfo.network_desc = NULL;
1315	<	#ifdef HAVE_LIBCRYPTO
1316	<	if (ConfigServerInfo.rsa_private_key)
1317	<	{
1318	<	RSA_free(ConfigServerInfo.rsa_private_key);
1319	<	ConfigServerInfo.rsa_private_key = NULL;
1320	<	}
1321	<
1322	<	MyFree(ConfigServerInfo.rsa_private_key_file);
1323	<	ConfigServerInfo.rsa_private_key_file = NULL;
1324	<	#endif
1325	<
1326	<	/* clean out ConfigAdminInfo */
1327	<	MyFree(ConfigAdminInfo.name);
1328	<	ConfigAdminInfo.name = NULL;
1329	<	MyFree(ConfigAdminInfo.email);
1330	<	ConfigAdminInfo.email = NULL;
1331	<	MyFree(ConfigAdminInfo.description);
1332	<	ConfigAdminInfo.description = NULL;
1333	<
1334	<	/* clean out listeners */
1335	<	close_listeners();
1336	<
1337	<	/* clean out general */
1338	<	MyFree(ConfigGeneral.service_name);
1339	<	ConfigGeneral.service_name = NULL;
1083	>	isupport_add("CHANLIMIT", chanlimit, -1);
1084	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstuCLMNORST");
1085	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1086	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1087	>	isupport_add("CHANMODES", chanmodes, -1);
1088		}
1089
1090		/* conf_add_class_to_conf()
#	Line 1346 | Line 1094 | clear_out_old_conf(void)
1094		* side effects - Add a class pointer to a conf
1095		*/
1096		void
1097	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1097	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1098		{
1099	<	if (class_name == NULL)
1099	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1100		{
1101		conf->class = class_default;
1102
1103	<	if (conf->type == CONF_CLIENT)
1104	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1357	<	"Warning *** Defaulting to default class for %s@%s",
1358	<	conf->user, conf->host);
1359	<	else
1360	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1361	<	"Warning *** Defaulting to default class for %s",
1362	<	conf->name);
1363	<	}
1364	<	else
1365	<	conf->class = class_find(class_name, 1);
1366	<
1367	<	if (conf->class == NULL)
1368	<	{
1369	<	if (conf->type == CONF_CLIENT)
1370	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1103	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1104	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1105		"Warning *** Defaulting to default class for %s@%s",
1106		conf->user, conf->host);
1107		else
1108	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1108	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1109		"Warning *** Defaulting to default class for %s",
1110		conf->name);
1377	–	conf->class = class_default;
1111		}
1112		}
1113
#	Line 1387 | Line 1120 | conf_add_class_to_conf(struct MaskItem *
1120		void
1121		yyerror(const char *msg)
1122		{
1390	–	char newlinebuf[IRCD_BUFSIZE];
1391	–
1123		if (conf_parser_ctx.pass != 1)
1124		return;
1125
1126	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1127	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1126	>	const char *p = stripws(linebuf);
1127	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1128		"\"%s\", line %u: %s: %s",
1129	<	conffilebuf, lineno + 1, msg, newlinebuf);
1129	>	conffilebuf, lineno, msg, p);
1130		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1131	<	conffilebuf, lineno + 1, msg, newlinebuf);
1131	>	conffilebuf, lineno, msg, p);
1132		}
1133
1134		void
1135		conf_error_report(const char *msg)
1136		{
1137	<	char newlinebuf[IRCD_BUFSIZE];
1138	<
1408	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1409	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1137	>	const char *p = stripws(linebuf);
1138	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1139		"\"%s\", line %u: %s: %s",
1140	<	conffilebuf, lineno + 1, msg, newlinebuf);
1140	>	conffilebuf, lineno, msg, p);
1141		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1142	<	conffilebuf, lineno + 1, msg, newlinebuf);
1142	>	conffilebuf, lineno, msg, p);
1143		}
1144
1145		/*
#	Line 1423 | Line 1152 | conf_error_report(const char *msg)
1152		* side effects - none
1153		* Originally written by Dianora (Diane, db@db.net)
1154		*/
1155	<	time_t
1155	>	uintmax_t
1156		valid_tkline(const char *data, const int minutes)
1157		{
1158		const unsigned char *p = (const unsigned char *)data;
1159		unsigned char tmpch = '\0';
1160	<	time_t result = 0;
1160	>	uintmax_t result = 0;
1161
1162		while ((tmpch = *p++))
1163		{
#	Line 1441 | Line 1170 | valid_tkline(const char *data, const int
1170
1171		/*
1172		* In the degenerate case where oper does a /quote kline 0 user@host :reason
1173	<	* i.e. they specifically use 0, I am going to return 1 instead
1174	<	* as a return value of non-zero is used to flag it as a temporary kline
1173	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1174	>	* value of non-zero is used to flag it as a temporary kline
1175		*/
1176		if (result == 0)
1177		result = 1;
#	Line 1457 | Line 1186 | valid_tkline(const char *data, const int
1186		if (result > MAX_TDKLINE_TIME)
1187		result = MAX_TDKLINE_TIME;
1188
1189	<	result = result * 60;  /* turn it into seconds */
1189	>	result = result * 60;  /* Turn it into seconds */
1190
1191		return result;
1192		}
#	Line 1473 | Line 1202 | valid_wild_card_simple(const char *data)
1202		{
1203		const unsigned char *p = (const unsigned char *)data;
1204		unsigned char tmpch = '\0';
1205	<	unsigned int nonwild = 0;
1205	>	unsigned int nonwild = 0, wild = 0;
1206
1207		while ((tmpch = *p++))
1208		{
#	Line 1488 | Line 1217 | valid_wild_card_simple(const char *data)
1217		if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1218		return 1;
1219		}
1220	+	else
1221	+	++wild;
1222		}
1223
1224	<	return 0;
1224	>	return !wild;
1225		}
1226
1227		/* valid_wild_card()
#	Line 1502 | Line 1233 | valid_wild_card_simple(const char *data)
1233		* side effects - NOTICE is given to source_p if warn is 1
1234		*/
1235		int
1236	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1236	>	valid_wild_card(int count, ...)
1237		{
1238		unsigned char tmpch = '\0';
1239		unsigned int nonwild = 0;
#	Line 1545 | Line 1276 | valid_wild_card(struct Client *source_p,
1276		}
1277		}
1278
1548	–	if (warn)
1549	–	sendto_one_notice(source_p, &me,
1550	–	":Please include at least %u non-wildcard characters with the mask",
1551	–	ConfigGeneral.min_nonwildcard);
1279		va_end(args);
1280		return 0;
1281		}
1282
1283	+	/* find_user_host()
1284	+	*
1285	+	* inputs       - pointer to client placing kline
1286	+	*              - pointer to user_host_or_nick
1287	+	*              - pointer to user buffer
1288	+	*              - pointer to host buffer
1289	+	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1290	+	* side effects -
1291	+	*/
1292	+	static int
1293	+	find_user_host(struct Client *source_p, char *user_host_or_nick,
1294	+	char *luser, char *lhost)
1295	+	{
1296	+	struct Client *target_p = NULL;
1297	+	char *hostp = NULL;
1298	+
1299	+	if (lhost == NULL)
1300	+	{
1301	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1302	+	return 1;
1303	+	}
1304	+
1305	+	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1306	+	{
1307	+	/* Explicit user@host mask given */
1308	+	if (hostp)                            /* I'm a little user@host */
1309	+	{
1310	+	*(hostp++) = '\0';                       /* short and squat */
1311	+
1312	+	if (*user_host_or_nick)
1313	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1314	+	else
1315	+	strcpy(luser, "*");
1316	+
1317	+	if (*hostp)
1318	+	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1319	+	else
1320	+	strcpy(lhost, "*");
1321	+	}
1322	+	else
1323	+	{
1324	+	luser[0] = '*';             /* no @ found, assume its *@somehost */
1325	+	luser[1] = '\0';
1326	+	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1327	+	}
1328	+
1329	+	return 1;
1330	+	}
1331	+	else
1332	+	{
1333	+	/* Try to find user@host mask from nick */
1334	+	/* Okay to use source_p as the first param, because source_p == client_p */
1335	+	if ((target_p =
1336	+	find_chasing(source_p, user_host_or_nick)) == NULL)
1337	+	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1338	+
1339	+	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1340	+	{
1341	+	if (IsClient(source_p))
1342	+	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1343	+	return 0;
1344	+	}
1345	+
1346	+	/*
1347	+	* Turn the "user" bit into "*user", blow away '~'
1348	+	* if found in original user name (non-idented)
1349	+	*/
1350	+	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1351	+
1352	+	if (target_p->username[0] == '~')
1353	+	luser[0] = '*';
1354	+
1355	+	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1356	+	return 1;
1357	+	}
1358	+
1359	+	return 0;
1360	+	}
1361	+
1362		/* XXX should this go into a separate file ? -Dianora */
1363		/* parse_aline
1364		*
#	Line 1567 | Line 1373 | valid_wild_card(struct Client *source_p,
1373		*              - pointer to target_server to parse into if non NULL
1374		*              - pointer to reason to parse into
1375		*
1376	<	* output       - 1 if valid, -1 if not valid
1376	>	* output       - 1 if valid, 0 if not valid
1377		* side effects - A generalised k/d/x etc. line parser,
1378		*               "ALINE [time] user@host|string [ON] target :reason"
1379		*                will parse returning a parsed user, host if
#	Line 1586 | Line 1392 | valid_wild_card(struct Client *source_p,
1392		int
1393		parse_aline(const char *cmd, struct Client *source_p,
1394		int parc, char **parv,
1395	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1395	>	char **up_p, char **h_p, uintmax_t *tkline_time,
1396		char **target_server, char **reason)
1397		{
1398	<	int found_tkline_time=0;
1399	<	static char def_reason[] = CONF_NOREASON;
1398	>	uintmax_t found_tkline_time=0;
1399	>	static char default_reason[] = CONF_NOREASON;
1400		static char user[USERLEN*4+1];
1401		static char host[HOSTLEN*4+1];
1402
#	Line 1599 | Line 1405 | parse_aline(const char *cmd, struct Clie
1405
1406		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1407
1408	<	if (found_tkline_time != 0)
1408	>	if (found_tkline_time)
1409		{
1410		parv++;
1411		parc--;
1412
1413	<	if (tkline_time != NULL)
1413	>	if (tkline_time)
1414		*tkline_time = found_tkline_time;
1415		else
1416		{
1417		sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1418	<	return -1;
1418	>	return 0;
1419		}
1420		}
1421
1422		if (parc == 0)
1423		{
1424		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1425	<	return -1;
1425	>	return 0;
1426		}
1427
1428		if (h_p == NULL)
1429		*up_p = *parv;
1430		else
1431		{
1432	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1433	<	return -1;
1432	>	if (find_user_host(source_p, *parv, user, host) == 0)
1433	>	return 0;
1434
1435		*up_p = user;
1436		*h_p = host;
#	Line 1633 | Line 1439 | parse_aline(const char *cmd, struct Clie
1439		parc--;
1440		parv++;
1441
1442	<	if (parc != 0)
1442	>	if (parc)
1443		{
1444		if (irccmp(*parv, "ON") == 0)
1445		{
1446		parc--;
1447		parv++;
1448
1643	–	if (target_server == NULL)
1644	–	{
1645	–	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1646	–	return -1;
1647	–	}
1648	–
1449		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1450		{
1451		sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1452	<	return -1;
1452	>	return 0;
1453		}
1454
1455		if (parc == 0 || EmptyString(*parv))
1456		{
1457		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1458	<	return -1;
1458	>	return 0;
1459		}
1460
1461		*target_server = *parv;
#	Line 1667 | Line 1467 | parse_aline(const char *cmd, struct Clie
1467		/* Make sure target_server *is* NULL if no ON server found
1468		* caller probably NULL'd it first, but no harm to do it again -db
1469		*/
1470	<	if (target_server != NULL)
1470	>	if (target_server)
1471		*target_server = NULL;
1472		}
1473		}
1474
1475	<	if (h_p != NULL)
1676	<	{
1677	<	if (strchr(user, '!') != NULL)
1678	<	{
1679	<	sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1680	<	return -1;
1681	<	}
1682	<
1683	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1684	<	return -1;
1685	<	}
1686	<	else
1687	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1688	<	return -1;
1689	<
1690	<	if (reason != NULL)
1475	>	if (reason)
1476		{
1477	<	if (parc != 0 && !EmptyString(*parv))
1693	<	{
1477	>	if (parc && !EmptyString(*parv))
1478		*reason = *parv;
1695	–	if (!valid_comment(source_p, *reason, 1))
1696	–	return -1;
1697	–	}
1479		else
1480	<	*reason = def_reason;
1480	>	*reason = default_reason;
1481		}
1482
1483		return 1;
1484		}
1485
1705	–	/* find_user_host()
1706	–	*
1707	–	* inputs       - pointer to client placing kline
1708	–	*              - pointer to user_host_or_nick
1709	–	*              - pointer to user buffer
1710	–	*              - pointer to host buffer
1711	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1712	–	* side effects -
1713	–	*/
1714	–	static int
1715	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
1716	–	char *luser, char *lhost, unsigned int flags)
1717	–	{
1718	–	struct Client *target_p = NULL;
1719	–	char *hostp = NULL;
1720	–
1721	–	if (lhost == NULL)
1722	–	{
1723	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1724	–	return 1;
1725	–	}
1726	–
1727	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1728	–	{
1729	–	/* Explicit user@host mask given */
1730	–
1731	–	if (hostp != NULL)                            /* I'm a little user@host */
1732	–	{
1733	–	*(hostp++) = '\0';                       /* short and squat */
1734	–	if (*user_host_or_nick)
1735	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1736	–	else
1737	–	strcpy(luser, "*");
1738	–
1739	–	if (*hostp)
1740	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1741	–	else
1742	–	strcpy(lhost, "*");
1743	–	}
1744	–	else
1745	–	{
1746	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
1747	–	luser[1] = '\0';
1748	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1749	–	}
1750	–
1751	–	return 1;
1752	–	}
1753	–	else
1754	–	{
1755	–	/* Try to find user@host mask from nick */
1756	–	/* Okay to use source_p as the first param, because source_p == client_p */
1757	–	if ((target_p =
1758	–	find_chasing(source_p, user_host_or_nick)) == NULL)
1759	–	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1760	–
1761	–	if (IsExemptKline(target_p))
1762	–	{
1763	–	if (!IsServer(source_p))
1764	–	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1765	–	return 0;
1766	–	}
1767	–
1768	–	/*
1769	–	* turn the "user" bit into "*user", blow away '~'
1770	–	* if found in original user name (non-idented)
1771	–	*/
1772	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1773	–
1774	–	if (target_p->username[0] == '~')
1775	–	luser[0] = '*';
1776	–
1777	–	if (target_p->sockhost[0] == '\0' ||
1778	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
1779	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1780	–	else
1781	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1782	–	return 1;
1783	–	}
1784	–
1785	–	return 0;
1786	–	}
1787	–
1788	–	/* valid_comment()
1789	–	*
1790	–	* inputs       - pointer to client
1791	–	*              - pointer to comment
1792	–	* output       - 0 if no valid comment,
1793	–	*              - 1 if valid
1794	–	* side effects - truncates reason where necessary
1795	–	*/
1796	–	int
1797	–	valid_comment(struct Client *source_p, char *comment, int warn)
1798	–	{
1799	–	if (strlen(comment) > REASONLEN)
1800	–	comment[REASONLEN-1] = '\0';
1801	–
1802	–	return 1;
1803	–	}
1804	–
1486		/* match_conf_password()
1487		*
1488		* inputs       - pointer to given password
#	Line 1826 | Line 1507 | match_conf_password(const char *password
1507		}
1508
1509		/*
1829	–	* cluster_a_line
1830	–	*
1831	–	* inputs       - client sending the cluster
1832	–	*              - command name "KLINE" "XLINE" etc.
1833	–	*              - capab -- CAP_KLN etc. from server.h
1834	–	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1835	–	*              - pattern and args to send along
1836	–	* output       - none
1837	–	* side effects - Take source_p send the pattern with args given
1838	–	*                along to all servers that match capab and cluster type
1839	–	*/
1840	–	void
1841	–	cluster_a_line(struct Client *source_p, const char *command,
1842	–	int capab, int cluster_type, const char *pattern, ...)
1843	–	{
1844	–	va_list args;
1845	–	char buffer[IRCD_BUFSIZE] = "";
1846	–	const dlink_node *ptr = NULL;
1847	–
1848	–	va_start(args, pattern);
1849	–	vsnprintf(buffer, sizeof(buffer), pattern, args);
1850	–	va_end(args);
1851	–
1852	–	DLINK_FOREACH(ptr, cluster_items.head)
1853	–	{
1854	–	const struct MaskItem *conf = ptr->data;
1855	–
1856	–	if (conf->flags & cluster_type)
1857	–	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1858	–	"%s %s %s", command, conf->name, buffer);
1859	–	}
1860	–	}
1861	–
1862	–	/*
1510		* split_nuh
1511		*
1512		* inputs       - pointer to original mask (modified in place)
#	Line 1894 | Line 1541 | split_nuh(struct split_nuh_item *const i
1541
1542		if (iptr->nickptr)
1543		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1544	+
1545		if (iptr->userptr)
1546		strlcpy(iptr->userptr, "*", iptr->usersize);
1547	+
1548		if (iptr->hostptr)
1549		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1550
#	Line 1938 | Line 1587 | split_nuh(struct split_nuh_item *const i
1587		}
1588		else
1589		{
1590	<	/* no @ found */
1590	>	/* No @ found */
1591		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1592		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1593		else

Comparing ircd-hybrid/trunk/src/conf.c (property svn:keywords):
Revision 4523 by michael, Tue Aug 19 09:43:38 2014 UTC vs.
Revision 8500 by michael, Thu Apr 5 13:00:49 2018 UTC

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

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines