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 1751 by michael, Wed Jan 16 18:30:52 2013 UTC vs.
Revision 9638 by michael, Tue Sep 29 12:49:07 2020 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  conf.c: Configuration file functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2020 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file conf.c
23	>	* \brief Configuration file functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "ircd_defs.h"
30	+	#include "parse.h"
31		#include "conf.h"
32	<	#include "s_serv.h"
33	<	#include "resv.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"
39		#include "channel.h"
40		#include "client.h"
41		#include "event.h"
34	–	#include "hook.h"
42		#include "irc_string.h"
43		#include "s_bsd.h"
44		#include "ircd.h"
#	Line 42 | Line 49
49		#include "fdlist.h"
50		#include "log.h"
51		#include "send.h"
45	–	#include "s_gline.h"
52		#include "memory.h"
53	<	#include "mempool.h"
54	<	#include "irc_res.h"
49	<	#include "userhost.h"
50	<	#include "s_user.h"
53	>	#include "res.h"
54	>	#include "user.h"
55		#include "channel_mode.h"
56	<	#include "parse.h"
53	<	#include "s_misc.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_server_hide ConfigServerHide;
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 rxconf_items  = { NULL, NULL, 0 };
67	<	dlink_list rkconf_items  = { NULL, NULL, 0 };
68	<	dlink_list nresv_items   = { NULL, NULL, 0 };
69	<	dlink_list temporary_resv = { 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
76	–	struct conf_parser_context conf_parser_ctx = { 0, 0, NULL };
77	–
78	–	/* internally defined functions */
79	–	static void read_conf(FILE *);
80	–	static void clear_out_old_conf(void);
81	–	static void expire_tklines(dlink_list *);
82	–	static void garbage_collect_ip_entries(void);
83	–	static int hash_ip(struct irc_ssaddr *);
84	–	static int verify_access(struct Client *);
85	–	static int attach_iline(struct Client *, struct MaskItem *);
86	–	static struct ip_entry *find_or_add_ip(struct irc_ssaddr *);
87	–	static dlink_list *map_to_list(enum maskitem_type);
88	–	static struct MaskItem *find_regexp_kline(const char *[]);
89	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
90	–
91	–
92	–	/* usually, with hash tables, you use a prime number...
93	–	* but in this case I am dealing with ip addresses,
94	–	* not ascii strings.
95	–	*/
96	–	#define IP_HASH_SIZE 0x1000
97	–
98	–	struct ip_entry
99	–	{
100	–	struct irc_ssaddr ip;
101	–	unsigned int count;
102	–	time_t last_attempt;
103	–	struct ip_entry *next;
104	–	};
105	–
106	–	static struct ip_entry *ip_hash_table[IP_HASH_SIZE];
107	–	static mp_pool_t *ip_entry_pool = NULL;
108	–	static int ip_entries_count = 0;
109	–
82
83		/* conf_dns_callback()
84		*
#	Line 119 | Line 91 | static int ip_entries_count = 0;
91		* if successful save hp in the conf item it was called with
92		*/
93		static void
94	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
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;
98	>	conf->dns_pending = false;
99
100	<	if (addr != NULL)
101	<	memcpy(&conf->addr, addr, sizeof(conf->addr));
100	>	if (addr)
101	>	*conf->addr = *addr;
102		else
103	<	conf->dns_failed = 1;
103	>	conf->dns_failed = true;
104		}
105
106	<	/* conf_dns_lookup()
106	>	/* conf_resolve_host()
107		*
108	<	* do a nameserver lookup of the conf host
109	<	* if the conf entry is currently doing a ns lookup do nothing, otherwise
138	<	* allocate a dns_query and start ns lookup.
108	>	* start DNS lookups of all hostnames in the conf
109	>	* line and convert an IP addresses in a.b.c.d number for to IP#s.
110		*/
111	<	static void
111	>	void
112		conf_dns_lookup(struct MaskItem *conf)
113		{
114	<	if (!conf->dns_pending)
114	>	struct addrinfo hints, *res;
115	>
116	>	/*
117	>	* Do name lookup now on hostnames given and store the
118	>	* ip numbers in conf structure.
119	>	*/
120	>	memset(&hints, 0, sizeof(hints));
121	>
122	>	hints.ai_family = AF_UNSPEC;
123	>	hints.ai_socktype = SOCK_STREAM;
124	>
125	>	/* Get us ready for a bind() and don't bother doing dns lookup */
126	>	hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
127	>
128	>	if (getaddrinfo(conf->host, NULL, &hints, &res))
129		{
130	<	conf->dns_pending = 1;
131	<	gethost_byname(conf_dns_callback, conf, conf->host);
130	>	/*
131	>	* By this point conf->host possibly is not a numerical network address. Do a nameserver
132	>	* lookup of the conf host. If the conf entry is currently doing a ns lookup do nothing.
133	>	*/
134	>	if (conf->dns_pending == true)
135	>	return;
136	>
137	>	conf->dns_pending = true;
138	>
139	>	if (conf->aftype == AF_INET)
140	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
141	>	else
142	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
143	>	return;
144	>	}
145	>
146	>	assert(res);
147	>
148	>	memcpy(conf->addr, res->ai_addr, res->ai_addrlen);
149	>	conf->addr->ss_len = res->ai_addrlen;
150	>
151	>	freeaddrinfo(res);
152	>	}
153	>
154	>	/* map_to_list()
155	>	*
156	>	* inputs       - ConfType conf
157	>	* output       - pointer to dlink_list to use
158	>	* side effects - none
159	>	*/
160	>	static dlink_list *
161	>	map_to_list(enum maskitem_type type)
162	>	{
163	>	switch (type)
164	>	{
165	>	case CONF_OPER:
166	>	return &operator_items;
167	>	break;
168	>	case CONF_SERVER:
169	>	return &connect_items;
170	>	break;
171	>	default:
172	>	return NULL;
173		}
174		}
175
176		struct MaskItem *
177		conf_make(enum maskitem_type type)
178		{
179	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
179	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
180		dlink_list *list = NULL;
181
182		conf->type   = type;
183	<	conf->active = 1;
183	>	conf->active = true;
184		conf->aftype = AF_INET;
185
186		if ((list = map_to_list(type)))
#	Line 165 | Line 191 | conf_make(enum maskitem_type type)
191		void
192		conf_free(struct MaskItem *conf)
193		{
194	<	dlink_node *ptr = NULL, *ptr_next = NULL;
194	>	dlink_node *node = NULL, *node_next = NULL;
195		dlink_list *list = NULL;
196
197	<	if (conf->node.next)
198	<	if ((list = map_to_list(conf->type)))
173	<	dlinkDelete(&conf->node, list);
197	>	if ((list = map_to_list(conf->type)))
198	>	dlinkFindDelete(list, conf);
199
200	<	MyFree(conf->name);
200	>	xfree(conf->name);
201
202	<	if (conf->dns_pending)
202	>	if (conf->dns_pending == true)
203		delete_resolver_queries(conf);
204	<	if (conf->passwd != NULL)
204	>	if (conf->passwd)
205		memset(conf->passwd, 0, strlen(conf->passwd));
206	<	if (conf->spasswd != NULL)
206	>	if (conf->spasswd)
207		memset(conf->spasswd, 0, strlen(conf->spasswd));
208
209		conf->class = NULL;
210
211	<	MyFree(conf->passwd);
212	<	MyFree(conf->spasswd);
213	<	MyFree(conf->reason);
214	<	MyFree(conf->user);
215	<	MyFree(conf->host);
216	<	MyFree(conf->regexuser);
217	<	MyFree(conf->regexhost);
218	<	#ifdef HAVE_LIBCRYPTO
219	<	MyFree(conf->cipher_list);
220	<
196	<	if (conf->rsa_public_key)
197	<	RSA_free(conf->rsa_public_key);
198	<	#endif
199	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
200	<	{
201	<	MyFree(ptr->data);
202	<	free_dlink_node(ptr);
203	<	}
204	<
205	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
206	<	{
207	<	MyFree(ptr->data);
208	<	free_dlink_node(ptr);
209	<	}
210	<
211	<	MyFree(conf);
212	<	}
213	<
214	<	static const struct shared_flags
215	<	{
216	<	const unsigned int type;
217	<	const unsigned char letter;
218	<	} flag_table[] = {
219	<	{ SHARED_KLINE,   'K' },
220	<	{ SHARED_UNKLINE, 'U' },
221	<	{ SHARED_XLINE,   'X' },
222	<	{ SHARED_UNXLINE, 'Y' },
223	<	{ SHARED_RESV,    'Q' },
224	<	{ SHARED_UNRESV,  'R' },
225	<	{ SHARED_LOCOPS,  'L' },
226	<	{ SHARED_DLINE,   'D' },
227	<	{ SHARED_UNDLINE, 'E' },
228	<	{ 0, '\0' }
229	<	};
211	>	xfree(conf->passwd);
212	>	xfree(conf->spasswd);
213	>	xfree(conf->reason);
214	>	xfree(conf->certfp);
215	>	xfree(conf->whois);
216	>	xfree(conf->user);
217	>	xfree(conf->host);
218	>	xfree(conf->addr);
219	>	xfree(conf->bind);
220	>	xfree(conf->cipher_list);
221
222	<	/*
232	<	* inputs       - pointer to client requesting confitem report
233	<	*              - ConfType to report
234	<	* output       - none
235	<	* side effects -
236	<	*/
237	<	void
238	<	report_confitem_types(struct Client *source_p, enum maskitem_type type)
239	<	{
240	<	dlink_node *ptr = NULL, *dptr = NULL;
241	<	struct MaskItem *conf = NULL;
242	<	const struct ClassItem *class = NULL;
243	<	const struct shared_flags *shared = NULL;
244	<	char buf[12];
245	<	char *p = NULL;
246	<
247	<	switch (type)
222	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
223		{
224	<	case CONF_XLINE:
225	<	DLINK_FOREACH(ptr, xconf_items.head)
226	<	{
227	<	conf = ptr->data;
253	<
254	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
255	<	me.name, source_p->name,
256	<	conf->until ? "x": "X", conf->count,
257	<	conf->name, conf->reason);
258	<	}
259	<	break;
260	<
261	<	#ifdef HAVE_LIBPCRE
262	<	case CONF_RXLINE:
263	<	DLINK_FOREACH(ptr, rxconf_items.head)
264	<	{
265	<	conf = ptr->data;
266	<
267	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
268	<	me.name, source_p->name,
269	<	"XR", conf->count,
270	<	conf->name, conf->reason);
271	<	}
272	<	break;
273	<
274	<	case CONF_RKLINE:
275	<	DLINK_FOREACH(ptr, rkconf_items.head)
276	<	{
277	<	conf = ptr->data;
278	<
279	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
280	<	source_p->name, "KR", conf->host, conf->user,
281	<	conf->reason);
282	<	}
283	<	break;
284	<	#endif
285	<
286	<	case CONF_ULINE:
287	<	shared = flag_table;
288	<	DLINK_FOREACH(ptr, uconf_items.head)
289	<	{
290	<	conf = ptr->data;
291	<
292	<	p = buf;
293	<
294	<	*p++ = 'c';
295	<	for (; shared->type; ++shared)
296	<	if (shared->type & conf->flags)
297	<	*p++ = shared->letter;
298	<	else
299	<	*p++ = ToLower(shared->letter);
300	<
301	<	sendto_one(source_p, form_str(RPL_STATSULINE),
302	<	me.name, source_p->name, conf->name,
303	<	conf->user?conf->user: "*",
304	<	conf->host?conf->host: "*", buf);
305	<	}
224	>	xfree(node->data);
225	>	dlinkDelete(node, &conf->hub_list);
226	>	free_dlink_node(node);
227	>	}
228
229	<	shared = flag_table;
230	<	DLINK_FOREACH(ptr, cluster_items.head)
231	<	{
232	<	conf = ptr->data;
229	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
230	>	{
231	>	xfree(node->data);
232	>	dlinkDelete(node, &conf->leaf_list);
233	>	free_dlink_node(node);
234	>	}
235
236	<	p = buf;
236	>	xfree(conf);
237	>	}
238
239	<	*p++ = 'C';
240	<	for (; shared->type; ++shared)
241	<	if (shared->type & conf->flags)
242	<	*p++ = shared->letter;
243	<	else
244	<	*p++ = ToLower(shared->letter);
245	<
246	<	sendto_one(source_p, form_str(RPL_STATSULINE),
247	<	me.name, source_p->name, conf->name,
248	<	"*", "*", buf);
249	<	}
239	>	/* attach_iline()
240	>	*
241	>	* inputs       - client pointer
242	>	*              - conf pointer
243	>	* output       -
244	>	* side effects - do actual attach
245	>	*/
246	>	static int
247	>	attach_iline(struct Client *client, struct MaskItem *conf)
248	>	{
249	>	const struct ClassItem *const class = conf->class;
250	>	bool a_limit_reached = false;
251
252	<	break;
252	>	struct ip_entry *ipcache = ipcache_record_find_or_add(&client->ip);
253	>	++ipcache->count_local;
254	>	AddFlag(client, FLAGS_IPHASH);
255	>
256	>	if (class->max_total && class->ref_count >= class->max_total)
257	>	a_limit_reached = true;
258	>	else if (class->max_perip_local && ipcache->count_local > class->max_perip_local)
259	>	a_limit_reached = true;
260	>	else if (class->max_perip_global &&
261	>	(ipcache->count_local + ipcache->count_remote) > class->max_perip_global)
262	>	a_limit_reached = true;
263
264	<	case CONF_OPER:
265	<	DLINK_FOREACH(ptr, oconf_items.head)
266	<	{
267	<	conf = ptr->data;
264	>	if (a_limit_reached == true)
265	>	{
266	>	if (!IsConfExemptLimits(conf))
267	>	return TOO_MANY;   /* Already at maximum allowed */
268
269	<	/* Don't allow non opers to see oper privs */
270	<	if (HasUMode(source_p, UMODE_OPER))
271	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
336	<	me.name, source_p->name, 'O', conf->user, conf->host,
337	<	conf->name, oper_privs_as_string(conf->port),
338	<	conf->class ? conf->class->name : "<default>");
339	<	else
340	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
341	<	me.name, source_p->name, 'O', conf->user, conf->host,
342	<	conf->name, "0",
343	<	conf->class ? conf->class->name : "<default>");
344	<	}
345	<	break;
269	>	sendto_one_notice(client, &me, ":*** Your connection class is full, "
270	>	"but you have exceed_limit = yes;");
271	>	}
272
273	<	case CONF_CLASS:
274	<	DLINK_FOREACH(ptr, class_get_list()->head)
349	<	{
350	<	class = ptr->data;
351	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
352	<	me.name, source_p->name, 'Y',
353	<	class->name, class->ping_freq,
354	<	class->con_freq,
355	<	class->max_total, class->max_sendq,
356	<	class->max_recvq,
357	<	class->ref_count,
358	<	class->number_per_cidr, class->cidr_bitlen_ipv4,
359	<	class->number_per_cidr, class->cidr_bitlen_ipv6,
360	<	class->active ? "active" : "disabled");
361	<	}
362	<	break;
273	>	return conf_attach(client, conf);
274	>	}
275
276	<	case CONF_SERVICE:
277	<	DLINK_FOREACH(ptr, service_items.head)
278	<	{
279	<	conf = ptr->data;
280	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
281	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
282	<	}
283	<	break;
276	>	/* verify_access()
277	>	*
278	>	* inputs       - pointer to client to verify
279	>	* output       - 0 if success -'ve if not
280	>	* side effect  - find the first (best) I line to attach.
281	>	*/
282	>	static int
283	>	verify_access(struct Client *client)
284	>	{
285	>	struct MaskItem *conf;
286
287	<	case CONF_SERVER:
288	<	DLINK_FOREACH(ptr, server_items.head)
289	<	{
290	<	p = buf;
291	<	conf = ptr->data;
287	>	if (HasFlag(client, FLAGS_GOTID))
288	>	conf = find_address_conf(client->host, client->username, &client->ip,
289	>	client->connection->password);
290	>	else
291	>	{
292	>	char non_ident[USERLEN + 1] = "~";
293
294	<	buf[0] = '\0';
294	>	strlcpy(non_ident + 1, client->username, sizeof(non_ident) - 1);
295	>	conf = find_address_conf(client->host, non_ident, &client->ip,
296	>	client->connection->password);
297	>	}
298
299	<	if (IsConfAllowAutoConn(conf))
300	<	*p++ = 'A';
383	<	if (IsConfSSL(conf))
384	<	*p++ = 'S';
385	<	if (buf[0] == '\0')
386	<	*p++ = '*';
387	<
388	<	*p = '\0';
389	<
390	<	/*
391	<	* Allow admins to see actual ips unless hide_server_ips is enabled
392	<	*/
393	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
394	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
395	<	me.name, source_p->name, 'C', conf->host,
396	<	buf, conf->name, conf->port,
397	<	conf->class ? conf->class->name : "<default>");
398	<	else
399	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
400	<	me.name, source_p->name, 'C',
401	<	"*@127.0.0.1", buf, conf->name, conf->port,
402	<	conf->class ? conf->class->name : "<default>");
403	<	}
404	<	break;
299	>	if (conf == NULL)
300	>	return NOT_AUTHORIZED;
301
302	<	case CONF_HUB:
407	<	DLINK_FOREACH(ptr, server_items.head)
408	<	{
409	<	conf = ptr->data;
302	>	assert(IsConfClient(conf) || IsConfKill(conf));
303
304	<	DLINK_FOREACH(dptr, conf->hub_list.head)
305	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
306	<	source_p->name, 'H', dptr->data, conf->name, 0, "*");
307	<	}
304	>	if (IsConfKill(conf))
305	>	{
306	>	sendto_one_notice(client, &me, ":*** Banned: %s", conf->reason);
307	>	return BANNED_CLIENT;
308	>	}
309
310	<	DLINK_FOREACH(ptr, server_items.head)
311	<	{
312	<	conf = ptr->data;
310	>	if (IsConfRedir(conf))
311	>	{
312	>	sendto_one_numeric(client, &me, RPL_REDIR,
313	>	conf->name ? conf->name : "",
314	>	conf->port);
315	>	return NOT_AUTHORIZED;
316	>	}
317
318	<	DLINK_FOREACH(dptr, conf->leaf_list.head)
319	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
422	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
423	<	}
318	>	/* Preserve x->host in x->realhost before it gets overwritten. */
319	>	strlcpy(client->realhost, client->host, sizeof(client->realhost));
320
321	<	break;
321	>	if (IsConfDoSpoofIp(conf))
322	>	strlcpy(client->host, conf->name, sizeof(client->host));
323
324	<	default:
428	<	break;
429	<	}
324	>	return attach_iline(client, conf);
325		}
326
327		/* check_client()
#	Line 442 | Line 337 | report_confitem_types(struct Client *sou
337		*                Look for conf lines which have the same
338		*                status as the flags passed.
339		*/
340	<	int
341	<	check_client(struct Client *source_p)
340	>	bool
341	>	conf_check_client(struct Client *client)
342		{
343		int i;
344	<
345	<	if ((i = verify_access(source_p)))
346	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
347	<	source_p->name, source_p->sockhost);
344	>
345	>	if ((i = verify_access(client)))
346	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
347	>	client->name, client->sockhost);
348
349		switch (i)
350		{
351		case TOO_MANY:
352	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
352	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
353		"Too many on IP for %s (%s).",
354	<	get_client_name(source_p, SHOW_IP),
355	<	source_p->sockhost);
354	>	client_get_name(client, SHOW_IP),
355	>	client->sockhost);
356		ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
357	<	get_client_name(source_p, SHOW_IP));
357	>	client_get_name(client, SHOW_IP));
358		++ServerStats.is_ref;
359	<	exit_client(source_p, &me, "No more connections allowed on that IP");
359	>	exit_client(client, "No more connections allowed on that IP");
360		break;
361
362		case I_LINE_FULL:
363	<	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
364	<	"auth{} block is full for %s (%s).",
365	<	get_client_name(source_p, SHOW_IP),
366	<	source_p->sockhost);
363	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
364	>	"auth {} block is full for %s (%s).",
365	>	client_get_name(client, SHOW_IP),
366	>	client->sockhost);
367		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
368	<	get_client_name(source_p, SHOW_IP));
368	>	client_get_name(client, SHOW_IP));
369		++ServerStats.is_ref;
370	<	exit_client(source_p, &me,
476	<	"No more connections allowed in your connection class");
370	>	exit_client(client, "No more connections allowed in your connection class");
371		break;
372
373		case NOT_AUTHORIZED:
374	+	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
375	+	"Unauthorized client connection from %s.",
376	+	client_get_name(client, SHOW_IP));
377	+	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s.",
378	+	client_get_name(client, SHOW_IP));
379		++ServerStats.is_ref;
380	<	/* jdc - lists server name & port connections are on */
482	<	/*       a purely cosmetical change */
483	<	sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
484	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
485	<	get_client_name(source_p, SHOW_IP),
486	<	source_p->sockhost,
487	<	source_p->localClient->listener->name,
488	<	source_p->localClient->listener->port);
489	<	ilog(LOG_TYPE_IRCD,
490	<	"Unauthorized client connection from %s on [%s/%u].",
491	<	get_client_name(source_p, SHOW_IP),
492	<	source_p->localClient->listener->name,
493	<	source_p->localClient->listener->port);
494	<
495	<	exit_client(source_p, &me, "You are not authorized to use this server");
380	>	exit_client(client, "You are not authorized to use this server");
381		break;
382
383	<	case BANNED_CLIENT:
384	<	exit_client(source_p, &me, "Banned");
385	<	++ServerStats.is_ref;
386	<	break;
502	<
503	<	case 0:
504	<	default:
505	<	break;
506	<	}
507	<
508	<	return (i < 0 ? 0 : 1);
509	<	}
510	<
511	<	/* verify_access()
512	<	*
513	<	* inputs       - pointer to client to verify
514	<	* output       - 0 if success -'ve if not
515	<	* side effect  - find the first (best) I line to attach.
516	<	*/
517	<	static int
518	<	verify_access(struct Client *client_p)
519	<	{
520	<	struct MaskItem *conf = NULL, *rkconf = NULL;
521	<	char non_ident[USERLEN + 1] = { '~', '\0' };
522	<	const char *uhi[3];
523	<
524	<	if (IsGotId(client_p))
525	<	{
526	<	conf = find_address_conf(client_p->host, client_p->username,
527	<	&client_p->localClient->ip,
528	<	client_p->localClient->aftype,
529	<	client_p->localClient->passwd);
530	<	}
531	<	else
532	<	{
533	<	strlcpy(non_ident+1, client_p->username, sizeof(non_ident)-1);
534	<	conf = find_address_conf(client_p->host,non_ident,
535	<	&client_p->localClient->ip,
536	<	client_p->localClient->aftype,
537	<	client_p->localClient->passwd);
538	<	}
539	<
540	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
541	<	uhi[1] = client_p->host;
542	<	uhi[2] = client_p->sockhost;
543	<
544	<	rkconf = find_regexp_kline(uhi);
545	<
546	<	if (conf != NULL)
547	<	{
548	<	if (IsConfClient(conf) && !rkconf)
549	<	{
550	<	if (IsConfRedir(conf))
551	<	{
552	<	sendto_one(client_p, form_str(RPL_REDIR),
553	<	me.name, client_p->name,
554	<	conf->name ? conf->name : "",
555	<	conf->port);
556	<	return(NOT_AUTHORIZED);
557	<	}
558	<
559	<	if (IsConfDoIdentd(conf))
560	<	SetNeedId(client_p);
561	<
562	<	/* Thanks for spoof idea amm */
563	<	if (IsConfDoSpoofIp(conf))
564	<	{
565	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
566	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
567	<	"%s spoofing: %s as %s",
568	<	client_p->name, client_p->host, conf->name);
569	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
570	<	SetIPSpoof(client_p);
571	<	}
572	<
573	<	return(attach_iline(client_p, conf));
574	<	}
575	<	else if (rkconf || IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
576	<	{
577	<	/* XXX */
578	<	conf = rkconf ? rkconf : conf;
579	<	if (IsConfGline(conf))
580	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
581	<	client_p->name);
582	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
583	<	me.name, client_p->name, conf->reason);
584	<	return(BANNED_CLIENT);
585	<	}
586	<	}
587	<
588	<	return(NOT_AUTHORIZED);
589	<	}
590	<
591	<	/* attach_iline()
592	<	*
593	<	* inputs       - client pointer
594	<	*              - conf pointer
595	<	* output       -
596	<	* side effects - do actual attach
597	<	*/
598	<	static int
599	<	attach_iline(struct Client *client_p, struct MaskItem *conf)
600	<	{
601	<	struct ClassItem *class = NULL;
602	<	struct ip_entry *ip_found;
603	<	int a_limit_reached = 0;
604	<	unsigned int local = 0, global = 0, ident = 0;
605	<
606	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
607	<	ip_found->count++;
608	<	SetIpHash(client_p);
609	<
610	<	if (conf->class == NULL)
611	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
612	<
613	<	class = conf->class;
614	<
615	<	count_user_host(client_p->username, client_p->host,
616	<	&global, &local, &ident);
617	<
618	<	/* XXX blah. go down checking the various silly limits
619	<	* setting a_limit_reached if any limit is reached.
620	<	* - Dianora
621	<	*/
622	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
623	<	a_limit_reached = 1;
624	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
625	<	a_limit_reached = 1;
626	<	else if (class->max_local != 0 && local >= class->max_local)
627	<	a_limit_reached = 1;
628	<	else if (class->max_global != 0 && global >= class->max_global)
629	<	a_limit_reached = 1;
630	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
631	<	client_p->username[0] != '~')
632	<	a_limit_reached = 1;
633	<
634	<	if (a_limit_reached)
635	<	{
636	<	if (!IsConfExemptLimits(conf))
637	<	return TOO_MANY;   /* Already at maximum allowed */
638	<
639	<	sendto_one(client_p,
640	<	":%s NOTICE %s :*** Your connection class is full, "
641	<	"but you have exceed_limit = yes;", me.name, client_p->name);
642	<	}
643	<
644	<	return attach_conf(client_p, conf);
645	<	}
646	<
647	<	/* init_ip_hash_table()
648	<	*
649	<	* inputs               - NONE
650	<	* output               - NONE
651	<	* side effects         - allocate memory for ip_entry(s)
652	<	*                      - clear the ip hash table
653	<	*/
654	<	void
655	<	init_ip_hash_table(void)
656	<	{
657	<	ip_entry_pool = mp_pool_new(sizeof(struct ip_entry),
658	<	2 * hard_fdlimit);
659	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
660	<	}
661	<
662	<	/* find_or_add_ip()
663	<	*
664	<	* inputs       - pointer to struct irc_ssaddr
665	<	* output       - pointer to a struct ip_entry
666	<	* side effects -
667	<	*
668	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
669	<	* count set to 0.
670	<	*/
671	<	static struct ip_entry *
672	<	find_or_add_ip(struct irc_ssaddr *ip_in)
673	<	{
674	<	struct ip_entry *ptr, *newptr;
675	<	int hash_index = hash_ip(ip_in), res;
676	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
677	<	#ifdef IPV6
678	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
679	<	#endif
680	<
681	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
682	<	{
683	<	#ifdef IPV6
684	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
685	<	continue;
686	<	if (ip_in->ss.ss_family == AF_INET6)
687	<	{
688	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
689	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
690	<	}
691	<	else
692	<	#endif
693	<	{
694	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
695	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
696	<	}
697	<	if (res == 0)
698	<	{
699	<	/* Found entry already in hash, return it. */
700	<	return ptr;
701	<	}
702	<	}
703	<
704	<	if (ip_entries_count >= 2 * hard_fdlimit)
705	<	garbage_collect_ip_entries();
706	<
707	<	newptr = mp_pool_get(ip_entry_pool);
708	<	memset(newptr, 0, sizeof(*newptr));
709	<	ip_entries_count++;
710	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
711	<
712	<	newptr->next = ip_hash_table[hash_index];
713	<	ip_hash_table[hash_index] = newptr;
714	<
715	<	return newptr;
716	<	}
717	<
718	<	/* remove_one_ip()
719	<	*
720	<	* inputs        - unsigned long IP address value
721	<	* output        - NONE
722	<	* side effects  - The ip address given, is looked up in ip hash table
723	<	*                 and number of ip#'s for that ip decremented.
724	<	*                 If ip # count reaches 0 and has expired,
725	<	*                 the struct ip_entry is returned to the ip_entry_heap
726	<	*/
727	<	void
728	<	remove_one_ip(struct irc_ssaddr *ip_in)
729	<	{
730	<	struct ip_entry *ptr;
731	<	struct ip_entry *last_ptr = NULL;
732	<	int hash_index = hash_ip(ip_in), res;
733	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
734	<	#ifdef IPV6
735	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
736	<	#endif
737	<
738	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
739	<	{
740	<	#ifdef IPV6
741	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
742	<	continue;
743	<	if (ip_in->ss.ss_family == AF_INET6)
744	<	{
745	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
746	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
747	<	}
748	<	else
749	<	#endif
750	<	{
751	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
752	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
753	<	}
754	<	if (res)
755	<	continue;
756	<	if (ptr->count > 0)
757	<	ptr->count--;
758	<	if (ptr->count == 0 &&
759	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
760	<	{
761	<	if (last_ptr != NULL)
762	<	last_ptr->next = ptr->next;
763	<	else
764	<	ip_hash_table[hash_index] = ptr->next;
383	>	case BANNED_CLIENT:
384	>	++ServerStats.is_ref;
385	>	exit_client(client, "Banned");
386	>	break;
387
388	<	mp_pool_release(ptr);
389	<	ip_entries_count--;
390	<	return;
769	<	}
770	<	last_ptr = ptr;
388	>	case 0:
389	>	default:
390	>	break;
391		}
772	–	}
773	–
774	–	/* hash_ip()
775	–	*
776	–	* input        - pointer to an irc_inaddr
777	–	* output       - integer value used as index into hash table
778	–	* side effects - hopefully, none
779	–	*/
780	–	static int
781	–	hash_ip(struct irc_ssaddr *addr)
782	–	{
783	–	if (addr->ss.ss_family == AF_INET)
784	–	{
785	–	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
786	–	int hash;
787	–	uint32_t ip;
392
393	<	ip   = ntohl(v4->sin_addr.s_addr);
394	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
395	<	return hash;
792	<	}
793	<	#ifdef IPV6
794	<	else
795	<	{
796	<	int hash;
797	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
798	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
799	<
800	<	hash  = ip[0] ^ ip[3];
801	<	hash ^= hash >> 16;
802	<	hash ^= hash >> 8;
803	<	hash  = hash & (IP_HASH_SIZE - 1);
804	<	return hash;
805	<	}
806	<	#else
807	<	return 0;
808	<	#endif
393	>	if (i < 0)
394	>	return false;
395	>	return true;
396		}
397
398	<	/* count_ip_hash()
399	<	*
400	<	* inputs        - pointer to counter of number of ips hashed
401	<	*               - pointer to memory used for ip hash
815	<	* output        - returned via pointers input
816	<	* side effects  - NONE
817	<	*
818	<	* number of hashed ip #'s is counted up, plus the amount of memory
819	<	* used in the hash.
398	>	/*! \brief Disassociate configuration from the client. Also removes a class
399	>	*         from the list if marked for deleting.
400	>	* \param client Client to operate on
401	>	* \param type     Type of conf to detach
402		*/
403		void
404	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
404	>	conf_detach(struct Client *client, enum maskitem_type type)
405		{
406	<	struct ip_entry *ptr;
825	<	int i;
406	>	dlink_node *node, *node_next;
407
408	<	*number_ips_stored = 0;
828	<	*mem_ips_stored    = 0;
829	<
830	<	for (i = 0; i < IP_HASH_SIZE; i++)
408	>	DLINK_FOREACH_SAFE(node, node_next, client->connection->confs.head)
409		{
410	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
833	<	{
834	<	*number_ips_stored += 1;
835	<	*mem_ips_stored += sizeof(struct ip_entry);
836	<	}
837	<	}
838	<	}
839	<
840	<	/* garbage_collect_ip_entries()
841	<	*
842	<	* input        - NONE
843	<	* output       - NONE
844	<	* side effects - free up all ip entries with no connections
845	<	*/
846	<	static void
847	<	garbage_collect_ip_entries(void)
848	<	{
849	<	struct ip_entry *ptr;
850	<	struct ip_entry *last_ptr;
851	<	struct ip_entry *next_ptr;
852	<	int i;
853	<
854	<	for (i = 0; i < IP_HASH_SIZE; i++)
855	<	{
856	<	last_ptr = NULL;
857	<
858	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
859	<	{
860	<	next_ptr = ptr->next;
861	<
862	<	if (ptr->count == 0 &&
863	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
864	<	{
865	<	if (last_ptr != NULL)
866	<	last_ptr->next = ptr->next;
867	<	else
868	<	ip_hash_table[i] = ptr->next;
869	<	mp_pool_release(ptr);
870	<	ip_entries_count--;
871	<	}
872	<	else
873	<	last_ptr = ptr;
874	<	}
875	<	}
876	<	}
877	<
878	<	/* detach_conf()
879	<	*
880	<	* inputs       - pointer to client to detach
881	<	*              - type of conf to detach
882	<	* output       - 0 for success, -1 for failure
883	<	* side effects - Disassociate configuration from the client.
884	<	*                Also removes a class from the list if marked for deleting.
885	<	*/
886	<	void
887	<	detach_conf(struct Client *client_p, enum maskitem_type type)
888	<	{
889	<	dlink_node *ptr = NULL, *next_ptr = NULL;
890	<
891	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
892	<	{
893	<	struct MaskItem *conf = ptr->data;
410	>	struct MaskItem *conf = node->data;
411
412		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
413		assert(conf->ref_count > 0);
#	Line 899 | Line 416 | detach_conf(struct Client *client_p, enu
416		if (!(conf->type & type))
417		continue;
418
419	<	dlinkDelete(ptr, &client_p->localClient->confs);
420	<	free_dlink_node(ptr);
419	>	dlinkDelete(node, &client->connection->confs);
420	>	free_dlink_node(node);
421
422		if (conf->type == CONF_CLIENT)
423	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
423	>	class_ip_limit_remove(conf->class, &client->ip);
424
425	<	if (--conf->class->ref_count == 0 && conf->class->active == 0)
425	>	if (--conf->class->ref_count == 0 && conf->class->active == false)
426		{
427		class_free(conf->class);
428		conf->class = NULL;
429		}
430
431	<	if (--conf->ref_count == 0 && conf->active == 0)
431	>	if (--conf->ref_count == 0 && conf->active == false)
432		conf_free(conf);
433		}
434		}
435
436	<	/* attach_conf()
437	<	*
438	<	* inputs       - client pointer
439	<	*              - conf pointer
440	<	* output       -
924	<	* side effects - Associate a specific configuration entry to a *local*
925	<	*                client (this is the one which used in accepting the
926	<	*                connection). Note, that this automatically changes the
927	<	*                attachment if there was an old one...
436	>	/*! \brief Associate a specific configuration entry to a *local* client (this
437	>	*         is the one which used in accepting the connection). Note, that this
438	>	*         automatically changes the attachment if there was an old one.
439	>	* \param client Client to attach the conf to
440	>	* \param conf Configuration record to attach
441		*/
442		int
443	<	attach_conf(struct Client *client_p, struct MaskItem *conf)
443	>	conf_attach(struct Client *client, struct MaskItem *conf)
444		{
445	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
445	>	if (dlinkFind(&client->connection->confs, conf))
446		return 1;
447
448		if (conf->type == CONF_CLIENT)
449	<	if (cidr_limit_reached(IsConfExemptLimits(conf),
937	<	&client_p->localClient->ip, conf->class))
449	>	if (class_ip_limit_add(conf->class, &client->ip, IsConfExemptLimits(conf)) == true)
450		return TOO_MANY;    /* Already at maximum allowed */
451
452		conf->class->ref_count++;
453		conf->ref_count++;
454
455	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
944	<
945	<	return 0;
946	<	}
947	<
948	<	/* attach_connect_block()
949	<	*
950	<	* inputs       - pointer to server to attach
951	<	*              - name of server
952	<	*              - hostname of server
953	<	* output       - true (1) if both are found, otherwise return false (0)
954	<	* side effects - find connect block and attach them to connecting client
955	<	*/
956	<	int
957	<	attach_connect_block(struct Client *client_p, const char *name,
958	<	const char *host)
959	<	{
960	<	dlink_node *ptr;
961	<	struct MaskItem *conf = NULL;
962	<
963	<	assert(client_p != NULL);
964	<	assert(host != NULL);
965	<
966	<	if (client_p == NULL || host == NULL)
967	<	return 0;
968	<
969	<	DLINK_FOREACH(ptr, server_items.head)
970	<	{
971	<	conf = ptr->data;
972	<
973	<	if (match(conf->name, name) || match(conf->host, host))
974	<	continue;
975	<
976	<	attach_conf(client_p, conf);
977	<	return -1;
978	<	}
455	>	dlinkAdd(conf, make_dlink_node(), &client->connection->confs);
456
457		return 0;
458		}
#	Line 992 | Line 469 | attach_connect_block(struct Client *clie
469		struct MaskItem *
470		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
471		{
472	<	dlink_node *ptr;
996	<	struct MaskItem* conf;
472	>	dlink_node *node = NULL;
473
474	<	DLINK_FOREACH(ptr, list->head)
474	>	DLINK_FOREACH(node, list->head)
475		{
476	<	conf = ptr->data;
477	<
476	>	struct MaskItem *conf = node->data;
477	>
478		if (conf->type == type)
479		{
480	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
481	<	!match(conf->name, name)))
1006	<	return conf;
480	>	if (conf->name && !irccmp(conf->name, name))
481	>	return conf;
482		}
483		}
484
485		return NULL;
486		}
487
488	<	/* map_to_list()
489	<	*
490	<	* inputs       - ConfType conf
1016	<	* output       - pointer to dlink_list to use
1017	<	* side effects - none
1018	<	*/
1019	<	static dlink_list *
1020	<	map_to_list(enum maskitem_type type)
1021	<	{
1022	<	switch(type)
1023	<	{
1024	<	case CONF_RKLINE:
1025	<	return(&rkconf_items);
1026	<	break;
1027	<	case CONF_RXLINE:
1028	<	return(&rxconf_items);
1029	<	break;
1030	<	case CONF_XLINE:
1031	<	return(&xconf_items);
1032	<	break;
1033	<	case CONF_ULINE:
1034	<	return(&uconf_items);
1035	<	break;
1036	<	case CONF_NRESV:
1037	<	return(&nresv_items);
1038	<	break;
1039	<	case CONF_OPER:
1040	<	return(&oconf_items);
1041	<	break;
1042	<	case CONF_SERVER:
1043	<	return(&server_items);
1044	<	break;
1045	<	case CONF_SERVICE:
1046	<	return(&service_items);
1047	<	break;
1048	<	case CONF_CLUSTER:
1049	<	return(&cluster_items);
1050	<	break;
1051	<	default:
1052	<	return NULL;
1053	<	}
1054	<	}
1055	<
1056	<	/* find_matching_name_conf()
1057	<	*
1058	<	* inputs       - type of link list to look in
1059	<	*              - pointer to name string to find
1060	<	*              - pointer to user
1061	<	*              - pointer to host
1062	<	*              - optional flags to match on as well
1063	<	* output       - NULL or pointer to found struct MaskItem
1064	<	* side effects - looks for a match on name field
488	>	/*! \brief Find a connect {} conf that has a name that matches \a name.
489	>	* \param name Name to match
490	>	* \param compare Pointer to function to be used for string matching
491		*/
492		struct MaskItem *
493	<	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
1068	<	const char *host, unsigned int flags)
493	>	connect_find(const char *name, int (*compare)(const char *, const char *))
494		{
495	<	dlink_node *ptr=NULL;
1071	<	struct MaskItem *conf=NULL;
1072	<	dlink_list *list_p = map_to_list(type);
495	>	dlink_node *node;
496
497	<	switch (type)
497	>	DLINK_FOREACH(node, connect_items.head)
498		{
499	<	#ifdef HAVE_LIBPCRE
1077	<	case CONF_RXLINE:
1078	<	DLINK_FOREACH(ptr, list_p->head)
1079	<	{
1080	<	conf = ptr->data;
1081	<	assert(conf->regexuser);
499	>	struct MaskItem *conf = node->data;
500
501	<	if (!ircd_pcre_exec(conf->regexuser, name))
502	<	return conf;
1085	<	}
1086	<	break;
1087	<	#endif
1088	<	case CONF_SERVICE:
1089	<	DLINK_FOREACH(ptr, list_p->head)
1090	<	{
1091	<	conf = ptr->data;
1092	<
1093	<	if (EmptyString(conf->name))
1094	<	continue;
1095	<	if ((name != NULL) && !irccmp(name, conf->name))
1096	<	return conf;
1097	<	}
1098	<	break;
1099	<
1100	<	case CONF_XLINE:
1101	<	case CONF_ULINE:
1102	<	case CONF_NRESV:
1103	<	DLINK_FOREACH(ptr, list_p->head)
1104	<	{
1105	<	conf = ptr->data;
1106	<
1107	<	if (EmptyString(conf->name))
1108	<	continue;
1109	<	if ((name != NULL) && !match(conf->name, name))
1110	<	{
1111	<	if ((user == NULL && (host == NULL)))
1112	<	return conf;
1113	<	if ((conf->flags & flags) != flags)
1114	<	continue;
1115	<	if (EmptyString(conf->user) || EmptyString(conf->host))
1116	<	return conf;
1117	<	if (!match(conf->user, user) && !match(conf->host, host))
1118	<	return conf;
1119	<	}
1120	<	}
1121	<	break;
1122	<
1123	<	case CONF_SERVER:
1124	<	DLINK_FOREACH(ptr, list_p->head)
1125	<	{
1126	<	conf = ptr->data;
1127	<
1128	<	if ((name != NULL) && !match(name, conf->name))
1129	<	return conf;
1130	<	else if ((host != NULL) && !match(host, conf->host))
1131	<	return conf;
1132	<	}
1133	<	break;
1134	<
1135	<	default:
1136	<	break;
501	>	if (compare(name, conf->name) == 0)
502	>	return conf;
503		}
504	+
505		return NULL;
506		}
507
#	Line 1148 | Line 515 | find_matching_name_conf(enum maskitem_ty
515		* side effects - looks for an exact match on name field
516		*/
517		struct MaskItem *
518	<	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
1152	<	const char *user, const char *host)
518	>	operator_find(const struct Client *client, const char *name)
519		{
520	<	dlink_node *ptr = NULL;
1155	<	struct MaskItem *conf;
1156	<	dlink_list *list_p = map_to_list(type);
520	>	dlink_node *node;
521
522	<	switch(type)
522	>	DLINK_FOREACH(node, operator_items.head)
523		{
524	<	case CONF_RXLINE:
1161	<	case CONF_XLINE:
1162	<	case CONF_ULINE:
1163	<	case CONF_NRESV:
1164	<
1165	<	DLINK_FOREACH(ptr, list_p->head)
1166	<	{
1167	<	conf = ptr->data;
524	>	struct MaskItem *conf = node->data;
525
526	<	if (EmptyString(conf->name))
1170	<	continue;
1171	<
1172	<	if (irccmp(conf->name, name) == 0)
1173	<	{
1174	<	if ((user == NULL && (host == NULL)))
1175	<	return (conf);
1176	<	if (EmptyString(conf->user) || EmptyString(conf->host))
1177	<	return (conf);
1178	<	if (!match(conf->user, user) && !match(conf->host, host))
1179	<	return (conf);
1180	<	}
1181	<	}
1182	<	break;
1183	<
1184	<	case CONF_OPER:
1185	<	DLINK_FOREACH(ptr, list_p->head)
526	>	if (irccmp(conf->name, name) == 0)
527		{
528	<	conf = ptr->data;
528	>	if (client == NULL)
529	>	return conf;
530
531	<	if (EmptyString(conf->name))
531	>	if (conf->class->max_total &&
532	>	conf->class->max_total <= conf->class->ref_count)
533		continue;
534
535	<	if (!irccmp(conf->name, name))
535	>	if (match(conf->user, client->username) == 0)
536		{
537	<	if (!who)
1195	<	return conf;
1196	<	if (EmptyString(conf->user) || EmptyString(conf->host))
1197	<	return NULL;
1198	<	if (!match(conf->user, who->username))
537	>	switch (conf->htype)
538		{
539	<	switch (conf->htype)
540	<	{
541	<	case HM_HOST:
542	<	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
543	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
544	<	return conf;
545	<	break;
546	<	case HM_IPV4:
547	<	if (who->localClient->aftype == AF_INET)
548	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
549	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
550	<	return conf;
1212	<	break;
1213	<	#ifdef IPV6
1214	<	case HM_IPV6:
1215	<	if (who->localClient->aftype == AF_INET6)
1216	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
1217	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
1218	<	return conf;
1219	<	break;
1220	<	#endif
1221	<	default:
1222	<	assert(0);
1223	<	}
539	>	case HM_HOST:
540	>	if (match(conf->host, client->realhost) == 0 ||
541	>	match(conf->host, client->sockhost) == 0 || match(conf->host, client->host) == 0)
542	>	return conf;
543	>	break;
544	>	case HM_IPV6:
545	>	case HM_IPV4:
546	>	if (address_compare(&client->ip, conf->addr, false, false, conf->bits) == true)
547	>	return conf;
548	>	break;
549	>	default:
550	>	assert(0);
551		}
552		}
553		}
1227	–
1228	–	break;
1229	–
1230	–	case CONF_SERVER:
1231	–	DLINK_FOREACH(ptr, list_p->head)
1232	–	{
1233	–	conf = ptr->data;
1234	–
1235	–	if (EmptyString(conf->name))
1236	–	continue;
1237	–
1238	–	if (name == NULL)
1239	–	{
1240	–	if (EmptyString(conf->host))
1241	–	continue;
1242	–	if (irccmp(conf->host, host) == 0)
1243	–	return(conf);
1244	–	}
1245	–	else if (irccmp(conf->name, name) == 0)
1246	–	{
1247	–	return (conf);
1248	–	}
1249	–	}
1250	–	break;
1251	–
1252	–	default:
1253	–	break;
554		}
1255	–	return(NULL);
1256	–	}
1257	–
1258	–	/* rehash()
1259	–	*
1260	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1261	–	* as a result of an operator issuing this command, else assume it has been
1262	–	* called as a result of the server receiving a HUP signal.
1263	–	*/
1264	–	int
1265	–	rehash(int sig)
1266	–	{
1267	–	if (sig != 0)
1268	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1269	–	"Got signal SIGHUP, reloading ircd.conf file");
555
556	<	restart_resolver();
1272	<
1273	<	/* don't close listeners until we know we can go ahead with the rehash */
1274	<
1275	<	/* Check to see if we magically got(or lost) IPv6 support */
1276	<	check_can_use_v6();
1277	<
1278	<	read_conf_files(0);
1279	<
1280	<	if (ServerInfo.description != NULL)
1281	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1282	<
1283	<	load_conf_modules();
1284	<
1285	<	rehashed_klines = 1;
1286	<	/* XXX */
1287	<	if (ConfigLoggingEntry.use_logging)
1288	<	log_close_all();
1289	<
1290	<	return(0);
556	>	return NULL;
557		}
558
559	<	/* set_default_conf()
559	>	/* conf_set_defaults()
560		*
561		* inputs       - NONE
562		* output       - NONE
#	Line 1300 | Line 566 | rehash(int sig)
566		*                of values later, put them in validate_conf().
567		*/
568		static void
569	<	set_default_conf(void)
569	>	conf_set_defaults(void)
570		{
571	<	/* verify init_class() ran, this should be an unnecessary check
572	<	* but its not much work.
571	>	/*
572	>	* Verify init_class() ran, this should be an unnecessary check
573	>	* but it's not much work.
574		*/
575		assert(class_default == class_get_list()->tail->data);
576
577	<	#ifdef HAVE_LIBCRYPTO
578	<	ServerInfo.rsa_private_key = NULL;
579	<	ServerInfo.rsa_private_key_file = NULL;
580	<	#endif
581	<
582	<	/* ServerInfo.name is not rehashable */
1316	<	/* ServerInfo.name = ServerInfo.name; */
1317	<	ServerInfo.description = NULL;
1318	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1319	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1320	<
1321	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
1322	<	ServerInfo.specific_ipv4_vhost = 0;
1323	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
1324	<	ServerInfo.specific_ipv6_vhost = 0;
1325	<
1326	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
1327	<	ServerInfo.max_nick_length = 9;
1328	<	ServerInfo.max_topic_length = 80;
1329	<
1330	<	ServerInfo.hub = 0;
1331	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
1332	<	ServerInfo.dns_host.sin_port = 0;
1333	<	AdminInfo.name = NULL;
1334	<	AdminInfo.email = NULL;
1335	<	AdminInfo.description = NULL;
577	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
578	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
579	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
580	>	ConfigServerInfo.max_nick_length = 9;
581	>	ConfigServerInfo.max_topic_length = 80;
582	>	ConfigServerInfo.hub = 0;
583
584	<	log_close_all();
584	>	log_iterate(log_free);
585
586	<	ConfigLoggingEntry.use_logging = 1;
586	>	ConfigLog.use_logging = 1;
587
588	+	ConfigChannel.enable_extbans = 0;
589		ConfigChannel.disable_fake_channels = 0;
590	<	ConfigChannel.restrict_channels = 0;
591	<	ConfigChannel.knock_delay = 300;
590	>	ConfigChannel.invite_client_count = 10;
591	>	ConfigChannel.invite_client_time = 300;
592	>	ConfigChannel.invite_delay_channel = 5;
593	>	ConfigChannel.invite_expire_time = 1800;
594	>	ConfigChannel.knock_client_count = 1;
595	>	ConfigChannel.knock_client_time = 300;
596		ConfigChannel.knock_delay_channel = 60;
597	<	ConfigChannel.max_chans_per_user = 25;
598	<	ConfigChannel.max_chans_per_oper = 50;
599	<	ConfigChannel.quiet_on_ban = 1;
600	<	ConfigChannel.max_bans = 25;
601	<	ConfigChannel.default_split_user_count = 0;
602	<	ConfigChannel.default_split_server_count = 0;
1351	<	ConfigChannel.no_join_on_split = 0;
1352	<	ConfigChannel.no_create_on_split = 0;
597	>	ConfigChannel.max_channels = 25;
598	>	ConfigChannel.max_invites = 20;
599	>	ConfigChannel.max_bans = 100;
600	>	ConfigChannel.max_bans_large = 500;
601	>	ConfigChannel.default_join_flood_count = 18;
602	>	ConfigChannel.default_join_flood_time = 6;
603
604		ConfigServerHide.flatten_links = 0;
605	<	ConfigServerHide.links_delay = 300;
605	>	ConfigServerHide.flatten_links_delay = 300;
606		ConfigServerHide.hidden = 0;
607		ConfigServerHide.hide_servers = 0;
608	+	ConfigServerHide.hide_services = 0;
609		ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
610		ConfigServerHide.hide_server_ips = 0;
611	+	ConfigServerHide.disable_remote_commands = 0;
612
613	<
614	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
615	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
616	<	ConfigFileEntry.glines = 0;
617	<	ConfigFileEntry.gline_time = 12 * 3600;
618	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
619	<	ConfigFileEntry.gline_min_cidr = 16;
620	<	ConfigFileEntry.gline_min_cidr6 = 48;
621	<	ConfigFileEntry.invisible_on_connect = 1;
622	<	ConfigFileEntry.tkline_expire_notices = 1;
623	<	ConfigFileEntry.hide_spoof_ips = 1;
624	<	ConfigFileEntry.ignore_bogus_ts = 0;
625	<	ConfigFileEntry.disable_auth = 0;
626	<	ConfigFileEntry.disable_remote = 0;
627	<	ConfigFileEntry.kill_chase_time_limit = 90;
628	<	ConfigFileEntry.default_floodcount = 8;
629	<	ConfigFileEntry.failed_oper_notice = 1;
630	<	ConfigFileEntry.dots_in_ident = 0;
631	<	ConfigFileEntry.min_nonwildcard = 4;
632	<	ConfigFileEntry.min_nonwildcard_simple = 3;
633	<	ConfigFileEntry.max_accept = 20;
634	<	ConfigFileEntry.anti_nick_flood = 0;
635	<	ConfigFileEntry.max_nick_time = 20;
636	<	ConfigFileEntry.max_nick_changes = 5;
637	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
638	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
639	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
640	<	ConfigFileEntry.warn_no_nline = 1;
641	<	ConfigFileEntry.stats_o_oper_only = 0;
642	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
643	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
644	<	ConfigFileEntry.stats_P_oper_only = 0;
645	<	ConfigFileEntry.caller_id_wait = 60;
646	<	ConfigFileEntry.opers_bypass_callerid = 0;
647	<	ConfigFileEntry.pace_wait = 10;
648	<	ConfigFileEntry.pace_wait_simple = 1;
649	<	ConfigFileEntry.short_motd = 0;
650	<	ConfigFileEntry.ping_cookie = 0;
651	<	ConfigFileEntry.no_oper_flood = 0;
652	<	ConfigFileEntry.true_no_oper_flood = 0;
653	<	ConfigFileEntry.oper_pass_resv = 1;
654	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
655	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
656	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
657	<	UMODE_OPERWALL | UMODE_WALLOP;
658	<	ConfigFileEntry.use_egd = 0;
659	<	ConfigFileEntry.egdpool_path = NULL;
1408	<	ConfigFileEntry.throttle_time = 10;
613	>	ConfigGeneral.away_count = 2;
614	>	ConfigGeneral.away_time = 10;
615	>	ConfigGeneral.max_watch = 50;
616	>	ConfigGeneral.whowas_history_length = 15000;
617	>	ConfigGeneral.cycle_on_host_change = 1;
618	>	ConfigGeneral.dline_min_cidr = 16;
619	>	ConfigGeneral.dline_min_cidr6 = 48;
620	>	ConfigGeneral.kline_min_cidr = 16;
621	>	ConfigGeneral.kline_min_cidr6 = 48;
622	>	ConfigGeneral.invisible_on_connect = 1;
623	>	ConfigGeneral.disable_auth = 0;
624	>	ConfigGeneral.kill_chase_time_limit = 90;
625	>	ConfigGeneral.default_floodcount = 8;
626	>	ConfigGeneral.default_floodtime = 1;
627	>	ConfigGeneral.failed_oper_notice = 1;
628	>	ConfigGeneral.dots_in_ident = 0;
629	>	ConfigGeneral.min_nonwildcard = 4;
630	>	ConfigGeneral.min_nonwildcard_simple = 3;
631	>	ConfigGeneral.max_accept = 50;
632	>	ConfigGeneral.anti_nick_flood = 0;
633	>	ConfigGeneral.max_nick_time = 20;
634	>	ConfigGeneral.max_nick_changes = 5;
635	>	ConfigGeneral.anti_spam_exit_message_time = 0;
636	>	ConfigGeneral.ts_warn_delta = 30;
637	>	ConfigGeneral.ts_max_delta = 600;
638	>	ConfigGeneral.warn_no_connect_block = 1;
639	>	ConfigGeneral.stats_e_disabled = 0;
640	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
641	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
642	>	ConfigGeneral.stats_o_oper_only = 1;
643	>	ConfigGeneral.stats_m_oper_only = 1;
644	>	ConfigGeneral.stats_P_oper_only = 0;
645	>	ConfigGeneral.stats_u_oper_only = 0;
646	>	ConfigGeneral.caller_id_wait = 60;
647	>	ConfigGeneral.opers_bypass_callerid = 1;
648	>	ConfigGeneral.pace_wait = 10;
649	>	ConfigGeneral.pace_wait_simple = 1;
650	>	ConfigGeneral.short_motd = 0;
651	>	ConfigGeneral.ping_cookie = 0;
652	>	ConfigGeneral.no_oper_flood = 0;
653	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
654	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
655	>	UMODE_EXTERNAL | UMODE_FLOOD | UMODE_NCHANGE |
656	>	UMODE_SPY | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
657	>	ConfigGeneral.oper_umodes = UMODE_FLOOD | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
658	>	ConfigGeneral.throttle_count = 1;
659	>	ConfigGeneral.throttle_time = 1;
660		}
661
662		static void
663	<	validate_conf(void)
663	>	conf_validate(void)
664		{
665	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
666	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1416	<
1417	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1418	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
665	>	if (EmptyString(ConfigServerInfo.network_name))
666	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
667
668	<	if (ServerInfo.network_name == NULL)
669	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
1422	<
1423	<	if (ServerInfo.network_desc == NULL)
1424	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1425	<
1426	<	if (ConfigFileEntry.service_name == NULL)
1427	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1428	<
1429	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
668	>	if (EmptyString(ConfigServerInfo.network_desc))
669	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
670		}
671
672	<	/* read_conf()
672	>	/* conf_read()
673		*
674		* inputs       - file descriptor pointing to config file to use
675		* output       - None
676		* side effects - Read configuration file.
677		*/
678		static void
679	<	read_conf(FILE *file)
679	>	conf_read(FILE *file)
680		{
681	<	lineno = 0;
681	>	lineno = 1;
682
683	<	set_default_conf(); /* Set default values prior to conf parsing */
683	>	conf_set_defaults();  /* Set default values prior to conf parsing */
684		conf_parser_ctx.pass = 1;
685	<	yyparse();          /* pick up the classes first */
685	>	yyparse();  /* Pick up the classes first */
686
687		rewind(file);
688
689		conf_parser_ctx.pass = 2;
690	<	yyparse();          /* Load the values from the conf */
691	<	validate_conf();    /* Check to make sure some values are still okay. */
692	<	/* Some global values are also loaded here. */
693	<	class_delete_marked();      /* Make sure classes are valid */
690	>	yyparse();  /* Load the values from the conf */
691	>	conf_validate();  /* Check to make sure some values are still okay. */
692	>	/* Some global values are also loaded here. */
693	>	whowas_trim();  /* Attempt to trim whowas list if necessary */
694	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
695		}
696
697	<	/* lookup_confhost()
697	>	/* conf_rehash()
698		*
699	<	* start DNS lookups of all hostnames in the conf
700	<	* line and convert an IP addresses in a.b.c.d number for to IP#s.
699	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
700	>	* as a result of an operator issuing this command, else assume it has been
701	>	* called as a result of the server receiving a HUP signal.
702		*/
703		void
704	<	lookup_confhost(struct MaskItem *conf)
704	>	conf_rehash(bool sig)
705		{
706	<	struct addrinfo hints, *res;
1465	<
1466	<	/* Do name lookup now on hostnames given and store the
1467	<	* ip numbers in conf structure.
1468	<	*/
1469	<	memset(&hints, 0, sizeof(hints));
1470	<
1471	<	hints.ai_family   = AF_UNSPEC;
1472	<	hints.ai_socktype = SOCK_STREAM;
1473	<
1474	<	/* Get us ready for a bind() and don't bother doing dns lookup */
1475	<	hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
1476	<
1477	<	if (getaddrinfo(conf->host, NULL, &hints, &res))
706	>	if (sig == true)
707		{
708	<	conf_dns_lookup(conf);
709	<	return;
708	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
709	>	"Got signal SIGHUP, reloading configuration file(s)");
710	>	ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
711		}
712
713	<	assert(res != NULL);
713	>	restart_resolver();
714
715	<	memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
1486	<	conf->addr.ss_len = res->ai_addrlen;
1487	<	conf->addr.ss.ss_family = res->ai_family;
715	>	/* don't close listeners until we know we can go ahead with the rehash */
716
717	<	freeaddrinfo(res);
717	>	conf_read_files(false);
718	>
719	>	load_conf_modules();
720	>	check_conf_klines();
721		}
722
723		/* conf_connect_allowed()
#	Line 1497 | Line 728 | lookup_confhost(struct MaskItem *conf)
728		* side effects - none
729		*/
730		int
731	<	conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
731	>	conf_connect_allowed(struct irc_ssaddr *addr)
732		{
733	<	struct ip_entry *ip_found;
1503	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
733	>	const struct MaskItem *conf = find_dline_conf(addr);
734
735	<	/* DLINE exempt also gets you out of static limits/pacing... */
1506	<	if (conf && (conf->type == CONF_EXEMPT))
1507	<	return 0;
1508	<
1509	<	if (conf != NULL)
1510	<	return BANNED_CLIENT;
1511	<
1512	<	ip_found = find_or_add_ip(addr);
1513	<
1514	<	if ((CurrentTime - ip_found->last_attempt) <
1515	<	ConfigFileEntry.throttle_time)
735	>	if (conf)
736		{
737	<	ip_found->last_attempt = CurrentTime;
738	<	return TOO_FAST;
737	>	/* DLINE exempt also gets you out of static limits/pacing... */
738	>	if (conf->type == CONF_EXEMPT)
739	>	return 0;
740	>	return BANNED_CLIENT;
741		}
742
743	<	ip_found->last_attempt = CurrentTime;
744	<	return 0;
1523	<	}
1524	<
1525	<	static struct MaskItem *
1526	<	find_regexp_kline(const char *uhi[])
1527	<	{
1528	<	#ifdef HAVE_LIBPCRE
1529	<	const dlink_node *ptr = NULL;
1530	<
1531	<	DLINK_FOREACH(ptr, rkconf_items.head)
743	>	struct ip_entry *ip_found = ipcache_record_find_or_add(addr);
744	>	if ((event_base->time.sec_monotonic - ip_found->last_attempt) < ConfigGeneral.throttle_time)
745		{
746	<	struct MaskItem *aptr = ptr->data;
747	<
1535	<	assert(aptr->regexuser);
1536	<	assert(aptr->regexhost);
746	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
747	>	return TOO_FAST;
748
749	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
1539	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
1540	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
1541	<	return aptr;
749	>	++ip_found->connection_count;
750		}
751	<	#endif
752	<	return NULL;
1545	<	}
1546	<
1547	<	/* find_kill()
1548	<	*
1549	<	* inputs       - pointer to client structure
1550	<	* output       - pointer to struct MaskItem if found
1551	<	* side effects - See if this user is klined already,
1552	<	*                and if so, return struct MaskItem pointer
1553	<	*/
1554	<	struct MaskItem *
1555	<	find_kill(struct Client *client_p)
1556	<	{
1557	<	struct MaskItem *conf = NULL;
1558	<	const char *uhi[3];
1559	<
1560	<	uhi[0] = client_p->username;
1561	<	uhi[1] = client_p->host;
1562	<	uhi[2] = client_p->sockhost;
1563	<
1564	<	assert(client_p != NULL);
1565	<
1566	<	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1567	<	CONF_KLINE, client_p->localClient->aftype,
1568	<	client_p->username, NULL, 1);
1569	<	if (conf == NULL)
1570	<	conf = find_regexp_kline(uhi);
1571	<
1572	<	return conf;
1573	<	}
1574	<
1575	<	struct MaskItem *
1576	<	find_gline(struct Client *client_p)
1577	<	{
1578	<	struct MaskItem *conf;
1579	<
1580	<	assert(client_p != NULL);
751	>	else
752	>	ip_found->connection_count = 1;
753
754	<	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
755	<	CONF_GLINE, client_p->localClient->aftype,
1584	<	client_p->username, NULL, 1);
1585	<	return conf;
754	>	ip_found->last_attempt = event_base->time.sec_monotonic;
755	>	return 0;
756		}
757
758		/* cleanup_tklines()
#	Line 1593 | Line 763 | find_gline(struct Client *client_p)
763		*                This is an event started off in ircd.c
764		*/
765		void
766	<	cleanup_tklines(void *notused)
766	>	cleanup_tklines(void *unused)
767		{
768		hostmask_expire_temporary();
769	<	expire_tklines(&xconf_items);
770	<	expire_tklines(&nresv_items);
1601	<	expire_tklines(&resv_channel_list);
769	>	gecos_expire();
770	>	resv_expire();
771		}
772
773	<	/* expire_tklines()
774	<	*
775	<	* inputs       - tkline list pointer
776	<	* output       - NONE
777	<	* side effects - expire tklines
773	>	/*
774	>	* Input: A client to find the active operator {} name for.
775	>	* Output: The nick!user@host{oper} of the oper.
776	>	*         "oper" is server name for remote opers
777	>	* Side effects: None.
778		*/
779	<	static void
780	<	expire_tklines(dlink_list *tklist)
779	>	const char *
780	>	get_oper_name(const struct Client *client)
781		{
782	<	dlink_node *ptr;
1614	<	dlink_node *next_ptr;
1615	<	struct MaskItem *conf;
782	>	static char buffer[IRCD_BUFSIZE];
783
784	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
785	<	{
1619	<	conf = ptr->data;
784	>	if (IsServer(client))
785	>	return client->name;
786
787	<	if (!conf->until || conf->until > CurrentTime)
788	<	continue;
787	>	if (MyConnect(client))
788	>	{
789	>	const dlink_node *const node = client->connection->confs.head;
790
791	<	if (conf->type == CONF_XLINE)
1625	<	{
1626	<	if (ConfigFileEntry.tkline_expire_notices)
1627	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1628	<	"Temporary X-line for [%s] expired", conf->name);
1629	<	conf_free(conf);
1630	<	}
1631	<	else if (conf->type == CONF_NRESV)
1632	<	{
1633	<	if (ConfigFileEntry.tkline_expire_notices)
1634	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1635	<	"Temporary RESV for [%s] expired", conf->name);
1636	<	conf_free(conf);
1637	<	}
1638	<	else if (conf->type == CONF_CRESV)
791	>	if (node)
792		{
793	<	if (ConfigFileEntry.tkline_expire_notices)
794	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
795	<	"Temporary RESV for [%s] expired", conf->name);
796	<	delete_channel_resv(conf);
793	>	const struct MaskItem *const conf = node->data;
794	>
795	>	if (conf->type == CONF_OPER)
796	>	{
797	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client->name,
798	>	client->username, client->host, conf->name);
799	>	return buffer;
800	>	}
801		}
802	+
803	+	/*
804	+	* Probably should assert here for now. If there is an oper out there
805	+	* with no operator {} conf attached, it would be good for us to know...
806	+	*/
807	+	assert(0);  /* Oper without oper conf! */
808		}
809	+
810	+	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client->name,
811	+	client->username, client->host, client->servptr->name);
812	+	return buffer;
813		}
814
815	<	/* oper_privs_as_string()
815	>	/* conf_clear()
816		*
817	<	* inputs        - pointer to client_p
818	<	* output        - pointer to static string showing oper privs
819	<	* side effects  - return as string, the oper privs as derived from port
820	<	*/
821	<	static const struct oper_privs
822	<	{
823	<	const unsigned int flag;
824	<	const unsigned char c;
825	<	} flag_list[] = {
826	<	{ OPER_FLAG_ADMIN,       'A' },
827	<	{ OPER_FLAG_REMOTEBAN,   'B' },
828	<	{ OPER_FLAG_DIE,         'D' },
829	<	{ OPER_FLAG_GLINE,       'G' },
1663	<	{ OPER_FLAG_REHASH,      'H' },
1664	<	{ OPER_FLAG_K,           'K' },
1665	<	{ OPER_FLAG_OPERWALL,    'L' },
1666	<	{ OPER_FLAG_N,           'N' },
1667	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
1668	<	{ OPER_FLAG_REMOTE,      'R' },
1669	<	{ OPER_FLAG_OPER_SPY,    'S' },
1670	<	{ OPER_FLAG_UNKLINE,     'U' },
1671	<	{ OPER_FLAG_X,           'X' },
1672	<	{ 0, '\0' }
1673	<	};
1674	<
1675	<	char *
1676	<	oper_privs_as_string(const unsigned int port)
1677	<	{
1678	<	static char privs_out[16];
1679	<	char *privs_ptr = privs_out;
1680	<	const struct oper_privs *opriv = flag_list;
817	>	* inputs       - none
818	>	* output       - none
819	>	* side effects - Clear out the old configuration
820	>	*/
821	>	static void
822	>	conf_clear(void)
823	>	{
824	>	dlink_node *node = NULL, *node_next = NULL;
825	>	dlink_list *free_items [] = {
826	>	&connect_items, &operator_items, NULL
827	>	};
828	>
829	>	dlink_list ** iterator = free_items; /* C is dumb */
830
831	<	for (; opriv->flag; ++opriv)
831	>	/* We only need to free anything allocated by yyparse() here.
832	>	* Resetting structs, etc, is taken care of by conf_set_defaults().
833	>	*/
834	>
835	>	for (; *iterator; iterator++)
836		{
837	<	if (port & opriv->flag)
838	<	*privs_ptr++ = opriv->c;
839	<	else
840	<	*privs_ptr++ = ToLower(opriv->c);
837	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
838	>	{
839	>	struct MaskItem *conf = node->data;
840	>
841	>	conf->active = false;
842	>	dlinkDelete(&conf->node, *iterator);
843	>
844	>	if (!conf->ref_count)
845	>	conf_free(conf);
846	>	}
847		}
848
849	<	*privs_ptr = '\0';
849	>	/*
850	>	* Don't delete the class table, rather mark all entries for deletion.
851	>	* The table is cleaned up by class_delete_marked. - avalon
852	>	*/
853	>	class_mark_for_deletion();
854
855	<	return privs_out;
855	>	clear_out_address_conf();
856	>
857	>	modules_conf_clear();  /* Clear modules {} items */
858	>
859	>	motd_clear();  /* Clear motd {} items and re-cache default motd */
860	>
861	>	cluster_clear();  /* Clear cluster {} items */
862	>
863	>	gecos_clear();  /* Clear gecos {} items */
864	>
865	>	resv_clear();  /* Clear resv {} items */
866	>
867	>	service_clear();  /* Clear service {} items */
868	>
869	>	shared_clear();  /* Clear shared {} items */
870	>
871	>	pseudo_clear();  /* Clear pseudo {} items */
872	>
873	>	/* Clean out ConfigServerInfo */
874	>	xfree(ConfigServerInfo.description);
875	>	ConfigServerInfo.description = NULL;
876	>	xfree(ConfigServerInfo.network_name);
877	>	ConfigServerInfo.network_name = NULL;
878	>	xfree(ConfigServerInfo.network_desc);
879	>	ConfigServerInfo.network_desc = NULL;
880	>	xfree(ConfigServerInfo.rsa_private_key_file);
881	>	ConfigServerInfo.rsa_private_key_file = NULL;
882	>	xfree(ConfigServerInfo.tls_certificate_file);
883	>	ConfigServerInfo.tls_certificate_file = NULL;
884	>	xfree(ConfigServerInfo.tls_dh_param_file);
885	>	ConfigServerInfo.tls_dh_param_file = NULL;
886	>	xfree(ConfigServerInfo.tls_supported_groups);
887	>	ConfigServerInfo.tls_supported_groups = NULL;
888	>	xfree(ConfigServerInfo.tls_cipher_list);
889	>	ConfigServerInfo.tls_cipher_list = NULL;
890	>	xfree(ConfigServerInfo.tls_cipher_suites);
891	>	ConfigServerInfo.tls_cipher_suites = NULL;
892	>	xfree(ConfigServerInfo.tls_message_digest_algorithm);
893	>	ConfigServerInfo.tls_message_digest_algorithm = NULL;
894	>
895	>	/* Clean out ConfigAdminInfo */
896	>	xfree(ConfigAdminInfo.name);
897	>	ConfigAdminInfo.name = NULL;
898	>	xfree(ConfigAdminInfo.email);
899	>	ConfigAdminInfo.email = NULL;
900	>	xfree(ConfigAdminInfo.description);
901	>	ConfigAdminInfo.description = NULL;
902	>
903	>	/* Clean out ConfigServerHide */
904	>	xfree(ConfigServerHide.flatten_links_file);
905	>	ConfigServerHide.flatten_links_file = NULL;
906	>	xfree(ConfigServerHide.hidden_name);
907	>	ConfigServerHide.hidden_name = NULL;
908	>
909	>	/* Clean out listeners */
910	>	listener_close_marked();
911		}
912
913	<	/*
914	<	* Input: A client to find the active oper{} name for.
1697	<	* Output: The nick!user@host{oper} of the oper.
1698	<	*         "oper" is server name for remote opers
1699	<	* Side effects: None.
1700	<	*/
1701	<	const char *
1702	<	get_oper_name(const struct Client *client_p)
913	>	static void
914	>	conf_handle_tls(bool cold)
915		{
916	<	dlink_node *cnode = NULL;
1705	<	/* +5 for !,@,{,} and null */
1706	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1707	<
1708	<	if (MyConnect(client_p))
916	>	if (tls_new_credentials() == false)
917		{
918	<	if ((cnode = client_p->localClient->confs.head))
918	>	if (cold == true)
919		{
920	<	struct MaskItem *conf = cnode->data;
921	<
922	<	if (IsConfOperator(conf))
923	<	{
924	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
925	<	client_p->username, client_p->host, conf->name);
926	<	return buffer;
927	<	}
920	>	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
921	>	exit(EXIT_FAILURE);
922	>	}
923	>	else
924	>	{
925	>	/* Failed to load new settings/certs, old ones remain active */
926	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
927	>	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
928		}
1721	–
1722	–	/* Probably should assert here for now. If there is an oper out there
1723	–	* with no oper{} conf attached, it would be good for us to know...
1724	–	*/
1725	–	assert(0); /* Oper without oper conf! */
929		}
1727	–
1728	–	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
1729	–	client_p->username, client_p->host, client_p->servptr->name);
1730	–	return buffer;
930		}
931
932		/* read_conf_files()
#	Line 1737 | Line 936 | get_oper_name(const struct Client *clien
936		* side effects - read all conf files needed, ircd.conf kline.conf etc.
937		*/
938		void
939	<	read_conf_files(int cold)
939	>	conf_read_files(bool cold)
940		{
941	<	const char *filename;
1743	<	char chanmodes[32];
1744	<	char chanlimit[32];
941	>	char buf[IRCD_BUFSIZE];
942
943		conf_parser_ctx.boot = cold;
944	<	filename = ConfigFileEntry.configfile;
1748	<
1749	<	/* We need to know the initial filename for the yyerror() to report
1750	<	FIXME: The full path is in conffilenamebuf first time since we
1751	<	dont know anything else
944	>	conf_parser_ctx.conf_file = fopen(ConfigGeneral.configfile, "r");
945
946	<	- Gozem 2002-07-21
1754	<	*/
1755	<	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1756	<
1757	<	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
946	>	if (conf_parser_ctx.conf_file == NULL)
947		{
948	<	if (cold)
948	>	if (cold == true)
949		{
950		ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
951	<	filename, strerror(errno));
952	<	exit(-1);
951	>	ConfigGeneral.configfile, strerror(errno));
952	>	exit(EXIT_FAILURE);
953		}
954		else
955		{
956	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
957	<	"Unable to read configuration file '%s': %s",
958	<	filename, strerror(errno));
956	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
957	>	"Unable to read configuration file '%s': %s",
958	>	ConfigGeneral.configfile, strerror(errno));
959		return;
960		}
961		}
962
1774	–	if (!cold)
1775	–	clear_out_old_conf();
1776	–
1777	–	read_conf(conf_parser_ctx.conf_file);
1778	–	fclose(conf_parser_ctx.conf_file);
1779	–
1780	–	add_isupport("NICKLEN", NULL, ServerInfo.max_nick_length);
1781	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
1782	–
1783	–	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1784	–	add_isupport("MAXLIST", chanmodes, -1);
1785	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1786	–	add_isupport("CHANTYPES", "#", -1);
1787	–
1788	–	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1789	–	ConfigChannel.max_chans_per_user);
1790	–	add_isupport("CHANLIMIT", chanlimit, -1);
1791	–	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,imnprstORS");
1792	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1793	–	add_isupport("TOPICLEN", NULL, ServerInfo.max_topic_length);
1794	–	add_isupport("EXCEPTS", "e", -1);
1795	–	add_isupport("INVEX", "I", -1);
1796	–	add_isupport("CHANMODES", chanmodes, -1);
1797	–
963		/*
964	<	* message_locale may have changed.  rebuild isupport since it relies
965	<	* on strlen(form_str(RPL_ISUPPORT))
964	>	* We need to know the initial filename for the yyerror() to report
965	>	*
966	>	*  FIXME: The full path is in conffilenamebuf first time since we
967	>	*          don't know anything else
968	>	*
969	>	*  - Gozem 2002-07-21
970		*/
971	<	rebuild_isupport_message_line();
1803	<	}
1804	<
1805	<	/* clear_out_old_conf()
1806	<	*
1807	<	* inputs       - none
1808	<	* output       - none
1809	<	* side effects - Clear out the old configuration
1810	<	*/
1811	<	static void
1812	<	clear_out_old_conf(void)
1813	<	{
1814	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1815	<	struct MaskItem *conf;
1816	<	dlink_list *free_items [] = {
1817	<	&server_items,   &oconf_items,
1818	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1819	<	&nresv_items, &cluster_items,  &service_items, NULL
1820	<	};
971	>	strlcpy(conffilebuf, ConfigGeneral.configfile, sizeof(conffilebuf));
972
973	<	dlink_list ** iterator = free_items; /* C is dumb */
973	>	if (cold == false)
974	>	conf_clear();
975
976	<	/* We only need to free anything allocated by yyparse() here.
977	<	* Resetting structs, etc, is taken care of by set_default_conf().
1826	<	*/
1827	<
1828	<	for (; *iterator != NULL; iterator++)
1829	<	{
1830	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
1831	<	{
1832	<	conf = ptr->data;
976	>	conf_read(conf_parser_ctx.conf_file);
977	>	fclose(conf_parser_ctx.conf_file);
978
979	<	dlinkDelete(&conf->node, map_to_list(conf->type));
979	>	log_iterate(log_reopen);
980	>	conf_handle_tls(cold);
981
982	<	/* XXX This is less than pretty */
983	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1838	<	{
1839	<	if (!conf->ref_count)
1840	<	conf_free(conf);
1841	<	}
1842	<	else if (conf->type == CONF_XLINE  ||
1843	<	conf->type == CONF_RXLINE ||
1844	<	conf->type == CONF_RKLINE)
1845	<	{
1846	<	if (!conf->until)
1847	<	conf_free(conf);
1848	<	}
1849	<	else
1850	<	conf_free(conf);
1851	<	}
1852	<	}
982	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
983	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
984
985	<	/*
986	<	* don't delete the class table, rather mark all entries
1856	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1857	<	*/
1858	<	class_mark_for_deletion();
985	>	snprintf(buf, sizeof(buf), "beI:%u", ConfigChannel.max_bans);
986	>	isupport_add("MAXLIST", buf, -1);
987
988	<	clear_out_address_conf();
988	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
989	>	isupport_add("CHANTYPES", "#", -1);
990
991	<	/* clean out module paths */
992	<	mod_clear_paths();
991	>	snprintf(buf, sizeof(buf), "#:%u", ConfigChannel.max_channels);
992	>	isupport_add("CHANLIMIT", buf, -1);
993
994	<	/* clean out ServerInfo */
995	<	MyFree(ServerInfo.description);
1867	<	ServerInfo.description = NULL;
1868	<	MyFree(ServerInfo.network_name);
1869	<	ServerInfo.network_name = NULL;
1870	<	MyFree(ServerInfo.network_desc);
1871	<	ServerInfo.network_desc = NULL;
1872	<	MyFree(ConfigFileEntry.egdpool_path);
1873	<	ConfigFileEntry.egdpool_path = NULL;
1874	<	#ifdef HAVE_LIBCRYPTO
1875	<	if (ServerInfo.rsa_private_key != NULL)
1876	<	{
1877	<	RSA_free(ServerInfo.rsa_private_key);
1878	<	ServerInfo.rsa_private_key = NULL;
1879	<	}
1880	<
1881	<	MyFree(ServerInfo.rsa_private_key_file);
1882	<	ServerInfo.rsa_private_key_file = NULL;
1883	<
1884	<	if (ServerInfo.server_ctx)
1885	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1886	<	SSL_OP_NO_SSLv3|
1887	<	SSL_OP_NO_TLSv1);
1888	<	if (ServerInfo.client_ctx)
1889	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1890	<	SSL_OP_NO_SSLv3|
1891	<	SSL_OP_NO_TLSv1);
1892	<	#endif
1893	<
1894	<	/* clean out old resvs from the conf */
1895	<	clear_conf_resv();
1896	<
1897	<	/* clean out AdminInfo */
1898	<	MyFree(AdminInfo.name);
1899	<	AdminInfo.name = NULL;
1900	<	MyFree(AdminInfo.email);
1901	<	AdminInfo.email = NULL;
1902	<	MyFree(AdminInfo.description);
1903	<	AdminInfo.description = NULL;
1904	<
1905	<	/* clean out listeners */
1906	<	close_listeners();
1907	<
1908	<	/* clean out general */
1909	<	MyFree(ConfigFileEntry.service_name);
1910	<	ConfigFileEntry.service_name = NULL;
994	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
995	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
996
997	<	delete_isupport("INVEX");
998	<	delete_isupport("EXCEPTS");
997	>	snprintf(buf, sizeof(buf), "%s", "beI,k,l,cimnprstuCKLMNORST");
998	>	isupport_add("CHANMODES", buf, -1);
999		}
1000
1001		/* conf_add_class_to_conf()
1002		*
1003		* inputs       - pointer to config item
1004		* output       - NONE
1005	<	* side effects - Add a class pointer to a conf
1005	>	* side effects - Add a class pointer to a conf
1006		*/
1007		void
1008	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1008	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1009		{
1010	<	if (class_name == NULL)
1010	>	if (EmptyString(name) || (conf->class = class_find(name, true)) == NULL)
1011		{
1012		conf->class = class_default;
1013
1014	<	if (conf->type == CONF_CLIENT)
1015	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1016	<	"Warning *** Defaulting to default class for %s@%s",
1017	<	conf->user, conf->host);
1014	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1015	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1016	>	"Warning *** Defaulting to default class for %s@%s",
1017	>	conf->user, conf->host);
1018		else
1019	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1020	<	"Warning *** Defaulting to default class for %s",
1021	<	conf->name);
1937	<	}
1938	<	else
1939	<	conf->class = class_find(class_name, 1);
1940	<
1941	<	if (conf->class == NULL)
1942	<	{
1943	<	if (conf->type == CONF_CLIENT)
1944	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1945	<	"Warning *** Defaulting to default class for %s@%s",
1946	<	conf->user, conf->host);
1947	<	else
1948	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1949	<	"Warning *** Defaulting to default class for %s",
1950	<	conf->name);
1951	<	conf->class = class_default;
1019	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1020	>	"Warning *** Defaulting to default class for %s",
1021	>	conf->name);
1022		}
1023		}
1024
#	Line 1961 | Line 1031 | conf_add_class_to_conf(struct MaskItem *
1031		void
1032		yyerror(const char *msg)
1033		{
1964	–	char newlinebuf[IRCD_BUFSIZE];
1965	–
1034		if (conf_parser_ctx.pass != 1)
1035		return;
1036
1037	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1038	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1037	>	const char *p = stripws(linebuf);
1038	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1039		"\"%s\", line %u: %s: %s",
1040	<	conffilebuf, lineno + 1, msg, newlinebuf);
1040	>	conffilebuf, lineno, msg, p);
1041		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1042	<	conffilebuf, lineno + 1, msg, newlinebuf);
1042	>	conffilebuf, lineno, msg, p);
1043		}
1044
1045		void
1046		conf_error_report(const char *msg)
1047		{
1048	<	char newlinebuf[IRCD_BUFSIZE];
1049	<
1982	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1983	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1048	>	const char *p = stripws(linebuf);
1049	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1050		"\"%s\", line %u: %s: %s",
1051	<	conffilebuf, lineno + 1, msg, newlinebuf);
1051	>	conffilebuf, lineno, msg, p);
1052		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1053	<	conffilebuf, lineno + 1, msg, newlinebuf);
1053	>	conffilebuf, lineno, msg, p);
1054		}
1055
1056		/*
1057		* valid_tkline()
1058	<	*
1058	>	*
1059		* inputs       - pointer to ascii string to check
1060		*              - whether the specified time is in seconds or minutes
1061		* output       - -1 not enough parameters
#	Line 1997 | Line 1063 | conf_error_report(const char *msg)
1063		* side effects - none
1064		* Originally written by Dianora (Diane, db@db.net)
1065		*/
1066	<	time_t
1067	<	valid_tkline(const char *p, int minutes)
1066	>	uintmax_t
1067	>	valid_tkline(const char *data, const int minutes)
1068		{
1069	<	time_t result = 0;
1069	>	const unsigned char *p = (const unsigned char *)data;
1070	>	unsigned char tmpch = '\0';
1071	>	uintmax_t result = 0;
1072
1073	<	for (; *p; ++p)
1073	>	while ((tmpch = *p++))
1074		{
1075	<	if (!IsDigit(*p))
1075	>	if (!IsDigit(tmpch))
1076		return 0;
1077
1078		result *= 10;
1079	<	result += ((*p) & 0xF);
1079	>	result += (tmpch & 0xF);
1080		}
1081
1082		/*
1083	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1084	<	* i.e. they specifically use 0, I am going to return 1 instead
1085	<	* as a return value of non-zero is used to flag it as a temporary kline
1083	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1084	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1085	>	* value of non-zero is used to flag it as a temporary kline
1086		*/
1087		if (result == 0)
1088		result = 1;
1089
1090	<	/*
1090	>	/*
1091		* If the incoming time is in seconds convert it to minutes for the purpose
1092		* of this calculation
1093		*/
1094	<	if (!minutes)
1095	<	result = result / (time_t)60;
1094	>	if (minutes == 0)
1095	>	result = result / 60;
1096
1097		if (result > MAX_TDKLINE_TIME)
1098		result = MAX_TDKLINE_TIME;
1099
1100	<	result = result * (time_t)60;  /* turn it into seconds */
1100	>	result = result * 60;  /* Turn it into seconds */
1101
1102		return result;
1103		}
1104
1105	+	/* valid_wild_card_simple()
1106	+	*
1107	+	* inputs       - data to check for sufficient non-wildcard characters
1108	+	* outputs      - 1 if valid, else 0
1109	+	* side effects - none
1110	+	*/
1111	+	bool
1112	+	valid_wild_card_simple(const char *data)
1113	+	{
1114	+	const unsigned char *p = (const unsigned char *)data;
1115	+	unsigned char tmpch = '\0';
1116	+	unsigned int nonwild = 0, wild = 0;
1117	+
1118	+	while ((tmpch = *p++))
1119	+	{
1120	+	if (tmpch == '\\' && *p)
1121	+	{
1122	+	++p;
1123	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1124	+	return true;
1125	+	}
1126	+	else if (!IsMWildChar(tmpch))
1127	+	{
1128	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1129	+	return true;
1130	+	}
1131	+	else
1132	+	++wild;
1133	+	}
1134	+
1135	+	return wild == 0;
1136	+	}
1137	+
1138		/* valid_wild_card()
1139		*
1140		* input        - pointer to client
1141		*              - int flag, 0 for no warning oper 1 for warning oper
1142		*              - count of following varargs to check
1143		* output       - 0 if not valid, 1 if valid
1144	<	* side effects - NOTICE is given to source_p if warn is 1
1144	>	* side effects - NOTICE is given to client if warn is 1
1145		*/
1146	<	int
1147	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1146	>	bool
1147	>	valid_wild_card(int count, ...)
1148		{
1149	<	char *p;
1150	<	char tmpch;
2050	<	int nonwild = 0;
1149	>	unsigned char tmpch = '\0';
1150	>	unsigned int nonwild = 0;
1151		va_list args;
1152
1153		/*
#	Line 2066 | Line 1166 | valid_wild_card(struct Client *source_p,
1166
1167		while (count--)
1168		{
1169	<	p = va_arg(args, char *);
1169	>	const unsigned char *p = va_arg(args, const unsigned char *);
1170		if (p == NULL)
1171		continue;
1172
#	Line 2078 | Line 1178 | valid_wild_card(struct Client *source_p,
1178		* If we find enough non-wild characters, we can
1179		* break - no point in searching further.
1180		*/
1181	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1182	<	return 1;
1181	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1182	>	{
1183	>	va_end(args);
1184	>	return true;
1185	>	}
1186		}
1187		}
1188		}
1189
1190	<	if (warn)
1191	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
2089	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
2090	<	return 0;
1190	>	va_end(args);
1191	>	return false;
1192		}
1193
1194		/* XXX should this go into a separate file ? -Dianora */
#	Line 2100 | Line 1201 | valid_wild_card(struct Client *source_p,
1201		*              - parse_flags bit map of things to test
1202		*              - pointer to user or string to parse into
1203		*              - pointer to host or NULL to parse into if non NULL
1204	<	*              - pointer to optional tkline time or NULL
1204	>	*              - pointer to optional tkline time or NULL
1205		*              - pointer to target_server to parse into if non NULL
1206		*              - pointer to reason to parse into
1207		*
1208	<	* output       - 1 if valid, -1 if not valid
1208	>	* output       - 1 if valid, 0 if not valid
1209		* side effects - A generalised k/d/x etc. line parser,
1210		*               "ALINE [time] user@host|string [ON] target :reason"
1211		*                will parse returning a parsed user, host if
#	Line 2120 | Line 1221 | valid_wild_card(struct Client *source_p,
1221		*
1222		* - Dianora
1223		*/
1224	<	int
1225	<	parse_aline(const char *cmd, struct Client *source_p,
2125	<	int parc, char **parv,
2126	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
2127	<	char **target_server, char **reason)
1224	>	bool
1225	>	parse_aline(const char *cmd, struct Client *client, int parc, char **parv, struct aline_ctx *aline)
1226		{
1227	<	int found_tkline_time=0;
1228	<	static char def_reason[] = "No Reason";
1229	<	static char user[USERLEN*4+1];
2132	<	static char host[HOSTLEN*4+1];
2133	<
2134	<	parv++;
2135	<	parc--;
1227	>	static char default_reason[] = CONF_NOREASON;
1228	>	static char user[USERLEN * 2 + 1];
1229	>	static char host[HOSTLEN * 2 + 1];
1230
1231	<	found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1231	>	++parv;
1232	>	--parc;
1233
1234	<	if (found_tkline_time != 0)
1234	>	if (aline->add == true && (aline->duration = valid_tkline(*parv, TK_MINUTES)))
1235		{
1236	<	parv++;
1237	<	parc--;
2143	<
2144	<	if (tkline_time != NULL)
2145	<	*tkline_time = found_tkline_time;
2146	<	else
2147	<	{
2148	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
2149	<	me.name, source_p->name, cmd);
2150	<	return -1;
2151	<	}
1236	>	++parv;
1237	>	--parc;
1238		}
1239
1240		if (parc == 0)
1241		{
1242	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1243	<	me.name, source_p->name, cmd);
2158	<	return -1;
1242	>	sendto_one_numeric(client, &me, ERR_NEEDMOREPARAMS, cmd);
1243	>	return false;
1244		}
1245
1246	<	if (h_p == NULL)
1247	<	*up_p = *parv;
1246	>	if (aline->simple_mask == true)
1247	>	{
1248	>	aline->mask = *parv;
1249	>	aline->user = NULL;
1250	>	aline->host = NULL;
1251	>	}
1252		else
1253		{
1254	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1255	<	return -1;
1254	>	struct split_nuh_item nuh;
1255	>
1256	>	nuh.nuhmask  = *parv;
1257	>	nuh.nickptr  = NULL;
1258	>	nuh.userptr  = user;
1259	>	nuh.hostptr  = host;
1260
1261	<	*up_p = user;
1262	<	*h_p = host;
1261	>	nuh.nicksize = 0;
1262	>	nuh.usersize = sizeof(user);
1263	>	nuh.hostsize = sizeof(host);
1264	>
1265	>	split_nuh(&nuh);
1266	>
1267	>	aline->mask = NULL;
1268	>	aline->user = user;
1269	>	aline->host = host;
1270		}
2171	–
2172	–	parc--;
2173	–	parv++;
1271
1272	<	if (parc != 0)
1272	>	++parv;
1273	>	--parc;
1274	>
1275	>	if (parc)
1276		{
1277		if (irccmp(*parv, "ON") == 0)
1278		{
1279	<	parc--;
1280	<	parv++;
2181	<
2182	<	if (target_server == NULL)
2183	<	{
2184	<	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
2185	<	me.name, source_p->name, cmd);
2186	<	return -1;
2187	<	}
1279	>	++parv;
1280	>	--parc;
1281
1282	<	if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1282	>	if (!HasOFlag(client, OPER_FLAG_REMOTEBAN))
1283		{
1284	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1285	<	me.name, source_p->name, "remoteban");
2193	<	return -1;
1284	>	sendto_one_numeric(client, &me, ERR_NOPRIVS, "remoteban");
1285	>	return false;
1286		}
1287
1288		if (parc == 0 || EmptyString(*parv))
1289		{
1290	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1291	<	me.name, source_p->name, cmd);
2200	<	return -1;
1290	>	sendto_one_numeric(client, &me, ERR_NEEDMOREPARAMS, cmd);
1291	>	return false;
1292		}
1293
1294	<	*target_server = *parv;
1295	<	parc--;
1296	<	parv++;
2206	<	}
2207	<	else
2208	<	{
2209	<	/* Make sure target_server *is* NULL if no ON server found
2210	<	* caller probably NULL'd it first, but no harm to do it again -db
2211	<	*/
2212	<	if (target_server != NULL)
2213	<	*target_server = NULL;
2214	<	}
2215	<	}
2216	<
2217	<	if (h_p != NULL)
2218	<	{
2219	<	if (strchr(user, '!') != NULL)
2220	<	{
2221	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
2222	<	me.name, source_p->name);
2223	<	return -1;
2224	<	}
2225	<
2226	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
2227	<	return -1;
2228	<	}
2229	<	else
2230	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
2231	<	return -1;
2232	<
2233	<	if (reason != NULL)
2234	<	{
2235	<	if (parc != 0 && !EmptyString(*parv))
2236	<	{
2237	<	*reason = *parv;
2238	<	if (!valid_comment(source_p, *reason, 1))
2239	<	return -1;
1294	>	aline->server = *parv;
1295	>	++parv;
1296	>	--parc;
1297		}
1298		else
1299	<	*reason = def_reason;
1299	>	aline->server = NULL;
1300		}
1301
1302	<	return 1;
2246	<	}
2247	<
2248	<	/* find_user_host()
2249	<	*
2250	<	* inputs       - pointer to client placing kline
2251	<	*              - pointer to user_host_or_nick
2252	<	*              - pointer to user buffer
2253	<	*              - pointer to host buffer
2254	<	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
2255	<	* side effects -
2256	<	*/
2257	<	static int
2258	<	find_user_host(struct Client *source_p, char *user_host_or_nick,
2259	<	char *luser, char *lhost, unsigned int flags)
2260	<	{
2261	<	struct Client *target_p = NULL;
2262	<	char *hostp = NULL;
2263	<
2264	<	if (lhost == NULL)
2265	<	{
2266	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
2267	<	return 1;
2268	<	}
2269	<
2270	<	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
2271	<	{
2272	<	/* Explicit user@host mask given */
2273	<
2274	<	if (hostp != NULL)                            /* I'm a little user@host */
2275	<	{
2276	<	*(hostp++) = '\0';                       /* short and squat */
2277	<	if (*user_host_or_nick)
2278	<	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2279	<	else
2280	<	strcpy(luser, "*");
2281	<	if (*hostp)
2282	<	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2283	<	else
2284	<	strcpy(lhost, "*");
2285	<	}
2286	<	else
2287	<	{
2288	<	luser[0] = '*';             /* no @ found, assume its *@somehost */
2289	<	luser[1] = '\0';
2290	<	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2291	<	}
2292	<
2293	<	return 1;
2294	<	}
2295	<	else
1302	>	if (aline->add == true)
1303		{
1304	<	/* Try to find user@host mask from nick */
1305	<	/* Okay to use source_p as the first param, because source_p == client_p */
2299	<	if ((target_p =
2300	<	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
2301	<	return 0;
2302	<
2303	<	if (IsExemptKline(target_p))
2304	<	{
2305	<	if (!IsServer(source_p))
2306	<	sendto_one(source_p,
2307	<	":%s NOTICE %s :%s is E-lined",
2308	<	me.name, source_p->name, target_p->name);
2309	<	return 0;
2310	<	}
2311	<
2312	<	/*
2313	<	* turn the "user" bit into "*user", blow away '~'
2314	<	* if found in original user name (non-idented)
2315	<	*/
2316	<	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2317	<
2318	<	if (target_p->username[0] == '~')
2319	<	luser[0] = '*';
2320	<
2321	<	if (target_p->sockhost[0] == '\0' ||
2322	<	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2323	<	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1304	>	if (parc == 0 || EmptyString(*parv))
1305	>	aline->reason = default_reason;
1306		else
1307	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2326	<	return 1;
1307	>	aline->reason = *parv;
1308		}
1309
1310	<	return 0;
2330	<	}
2331	<
2332	<	/* valid_comment()
2333	<	*
2334	<	* inputs       - pointer to client
2335	<	*              - pointer to comment
2336	<	* output       - 0 if no valid comment,
2337	<	*              - 1 if valid
2338	<	* side effects - truncates reason where necessary
2339	<	*/
2340	<	int
2341	<	valid_comment(struct Client *source_p, char *comment, int warn)
2342	<	{
2343	<	if (strlen(comment) > REASONLEN)
2344	<	comment[REASONLEN-1] = '\0';
2345	<
2346	<	return 1;
1310	>	return true;
1311		}
1312
1313		/* match_conf_password()
#	Line 2353 | Line 1317 | valid_comment(struct Client *source_p, c
1317		* output       - 1 or 0 if match
1318		* side effects - none
1319		*/
1320	<	int
1320	>	bool
1321		match_conf_password(const char *password, const struct MaskItem *conf)
1322		{
1323		const char *encr = NULL;
1324
1325		if (EmptyString(password) || EmptyString(conf->passwd))
1326	<	return 0;
1326	>	return false;
1327
1328		if (conf->flags & CONF_FLAGS_ENCRYPTED)
1329		encr = crypt(password, conf->passwd);
1330		else
1331		encr = password;
1332
1333	<	return !strcmp(encr, conf->passwd);
2370	<	}
2371	<
2372	<	/*
2373	<	* cluster_a_line
2374	<	*
2375	<	* inputs       - client sending the cluster
2376	<	*              - command name "KLINE" "XLINE" etc.
2377	<	*              - capab -- CAP_KLN etc. from s_serv.h
2378	<	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
2379	<	*              - pattern and args to send along
2380	<	* output       - none
2381	<	* side effects - Take source_p send the pattern with args given
2382	<	*                along to all servers that match capab and cluster type
2383	<	*/
2384	<	void
2385	<	cluster_a_line(struct Client *source_p, const char *command,
2386	<	int capab, int cluster_type, const char *pattern, ...)
2387	<	{
2388	<	va_list args;
2389	<	char buffer[IRCD_BUFSIZE];
2390	<	const dlink_node *ptr = NULL;
2391	<
2392	<	va_start(args, pattern);
2393	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
2394	<	va_end(args);
2395	<
2396	<	DLINK_FOREACH(ptr, cluster_items.head)
2397	<	{
2398	<	const struct MaskItem *conf = ptr->data;
2399	<
2400	<	if (conf->flags & cluster_type)
2401	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
2402	<	"%s %s %s", command, conf->name, buffer);
2403	<	}
1333	>	return encr && strcmp(encr, conf->passwd) == 0;
1334		}
1335
1336		/*
#	Line 2438 | Line 1368 | split_nuh(struct split_nuh_item *const i
1368
1369		if (iptr->nickptr)
1370		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1371	+
1372		if (iptr->userptr)
1373		strlcpy(iptr->userptr, "*", iptr->usersize);
1374	+
1375		if (iptr->hostptr)
1376		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1377
#	Line 2447 | Line 1379 | split_nuh(struct split_nuh_item *const i
1379		{
1380		*p = '\0';
1381
1382	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1382	>	if (iptr->nickptr && *iptr->nuhmask)
1383		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1384
1385	<	if ((q = strchr(++p, '@'))) {
1385	>	if ((q = strchr(++p, '@')))
1386	>	{
1387		*q++ = '\0';
1388
1389	<	if (*p != '\0')
1389	>	if (*p)
1390		strlcpy(iptr->userptr, p, iptr->usersize);
1391
1392	<	if (*q != '\0')
1392	>	if (*q)
1393		strlcpy(iptr->hostptr, q, iptr->hostsize);
1394		}
1395		else
1396		{
1397	<	if (*p != '\0')
1397	>	if (*p)
1398		strlcpy(iptr->userptr, p, iptr->usersize);
1399		}
1400		}
#	Line 2473 | Line 1406 | split_nuh(struct split_nuh_item *const i
1406		/* if found a @ */
1407		*p++ = '\0';
1408
1409	<	if (*iptr->nuhmask != '\0')
1409	>	if (*iptr->nuhmask)
1410		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1411
1412	<	if (*p != '\0')
1412	>	if (*p)
1413		strlcpy(iptr->hostptr, p, iptr->hostsize);
1414		}
1415		else
1416		{
1417	<	/* no @ found */
1418	<	if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1417	>	/* No @ found */
1418	>	if (iptr->nickptr == NULL || strpbrk(iptr->nuhmask, ".:"))
1419		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1420		else
1421		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);

Comparing ircd-hybrid/trunk/src/conf.c (property svn:keywords):
Revision 1751 by michael, Wed Jan 16 18:30:52 2013 UTC vs.
Revision 9638 by michael, Tue Sep 29 12:49:07 2020 UTC

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

Diff Legend

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