ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/conf.c

Comparing:
ircd-hybrid/trunk/src/conf.c (file contents), Revision 1646 by michael, Wed Nov 7 21:02:43 2012 UTC vs.
ircd-hybrid/branches/8.2.x/src/conf.c (file contents), Revision 7725 by michael, Mon Sep 26 14:59:44 2016 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-2016 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 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"
28	–	#include "balloc.h"
30		#include "conf.h"
31	<	#include "s_serv.h"
32	<	#include "resv.h"
31	>	#include "conf_cluster.h"
32	>	#include "conf_gecos.h"
33	>	#include "conf_pseudo.h"
34	>	#include "conf_resv.h"
35	>	#include "conf_service.h"
36	>	#include "conf_shared.h"
37	>	#include "server.h"
38		#include "channel.h"
39		#include "client.h"
40		#include "event.h"
35	–	#include "hook.h"
41		#include "irc_string.h"
42		#include "s_bsd.h"
43		#include "ircd.h"
#	Line 43 | Line 48
48		#include "fdlist.h"
49		#include "log.h"
50		#include "send.h"
46	–	#include "s_gline.h"
51		#include "memory.h"
52	<	#include "irc_res.h"
52	>	#include "res.h"
53		#include "userhost.h"
54	<	#include "s_user.h"
54	>	#include "user.h"
55		#include "channel_mode.h"
56		#include "parse.h"
57	<	#include "s_misc.h"
57	>	#include "misc.h"
58		#include "conf_db.h"
59		#include "conf_class.h"
60	+	#include "motd.h"
61	+	#include "ipcache.h"
62	+	#include "isupport.h"
63	+	#include "whowas.h"
64
65	<	struct config_server_hide ConfigServerHide;
65	>
66	>	struct config_channel_entry ConfigChannel;
67	>	struct config_serverhide_entry ConfigServerHide;
68	>	struct config_general_entry ConfigGeneral;
69	>	struct config_log_entry ConfigLog = { .use_logging = 1 };
70	>	struct config_serverinfo_entry ConfigServerInfo;
71	>	struct config_admin_entry ConfigAdminInfo;
72	>	struct conf_parser_context conf_parser_ctx;
73
74		/* general conf items link list root, other than k lines etc. */
75	<	dlink_list service_items = { NULL, NULL, 0 };
76	<	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 };
75	>	dlink_list connect_items;
76	>	dlink_list operator_items;
77
78		extern unsigned int lineno;
79		extern char linebuf[];
80		extern char conffilebuf[IRCD_BUFSIZE];
81		extern int yyparse(); /* defined in y.tab.c */
82
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 BlockHeap *ip_entry_heap = NULL;
108	–	static int ip_entries_count = 0;
109	–
83
84		/* conf_dns_callback()
85		*
#	Line 119 | Line 92 | static int ip_entries_count = 0;
92		* if successful save hp in the conf item it was called with
93		*/
94		static void
95	<	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
95	>	conf_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name, size_t namelength)
96		{
97	<	struct MaskItem *conf = vptr;
97	>	struct MaskItem *const conf = vptr;
98
99		conf->dns_pending = 0;
100
101	<	if (addr != NULL)
101	>	if (addr)
102		memcpy(&conf->addr, addr, sizeof(conf->addr));
103		else
104		conf->dns_failed = 1;
#	Line 140 | Line 113 | conf_dns_callback(void *vptr, const stru
113		static void
114		conf_dns_lookup(struct MaskItem *conf)
115		{
116	<	if (!conf->dns_pending)
116	>	if (conf->dns_pending)
117	>	return;
118	>
119	>	conf->dns_pending = 1;
120	>
121	>	if (conf->aftype == AF_INET)
122	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
123	>	else
124	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
125	>	}
126	>
127	>	/* map_to_list()
128	>	*
129	>	* inputs       - ConfType conf
130	>	* output       - pointer to dlink_list to use
131	>	* side effects - none
132	>	*/
133	>	static dlink_list *
134	>	map_to_list(enum maskitem_type type)
135	>	{
136	>	switch (type)
137		{
138	<	conf->dns_pending = 1;
139	<	gethost_byname(conf_dns_callback, conf, conf->host);
138	>	case CONF_OPER:
139	>	return &operator_items;
140	>	break;
141	>	case CONF_SERVER:
142	>	return &connect_items;
143	>	break;
144	>	default:
145	>	return NULL;
146		}
147		}
148
149		struct MaskItem *
150		conf_make(enum maskitem_type type)
151		{
152	<	struct MaskItem *conf = MyMalloc(sizeof(*conf));
152	>	struct MaskItem *const conf = xcalloc(sizeof(*conf));
153		dlink_list *list = NULL;
154
155		conf->type   = type;
#	Line 165 | Line 164 | conf_make(enum maskitem_type type)
164		void
165		conf_free(struct MaskItem *conf)
166		{
167	<	dlink_node *ptr = NULL, *ptr_next = NULL;
167	>	dlink_node *node = NULL, *node_next = NULL;
168		dlink_list *list = NULL;
169
170	<	if (conf->node.next)
171	<	if ((list = map_to_list(conf->type)))
173	<	dlinkDelete(&conf->node, list);
170	>	if ((list = map_to_list(conf->type)))
171	>	dlinkFindDelete(list, conf);
172
173	<	MyFree(conf->name);
173	>	xfree(conf->name);
174
175		if (conf->dns_pending)
176		delete_resolver_queries(conf);
177	<	if (conf->passwd != NULL)
177	>	if (conf->passwd)
178		memset(conf->passwd, 0, strlen(conf->passwd));
179	<	if (conf->spasswd != NULL)
179	>	if (conf->spasswd)
180		memset(conf->spasswd, 0, strlen(conf->spasswd));
181
182		conf->class = NULL;
183
184	<	MyFree(conf->passwd);
185	<	MyFree(conf->spasswd);
186	<	MyFree(conf->reason);
187	<	MyFree(conf->user);
188	<	MyFree(conf->host);
189	<	MyFree(conf->regexuser);
190	<	MyFree(conf->regexhost);
191	<	#ifdef HAVE_LIBCRYPTO
194	<	MyFree(conf->cipher_list);
195	<
196	<	if (conf->rsa_public_key)
197	<	RSA_free(conf->rsa_public_key);
184	>	xfree(conf->passwd);
185	>	xfree(conf->spasswd);
186	>	xfree(conf->reason);
187	>	xfree(conf->certfp);
188	>	xfree(conf->whois);
189	>	xfree(conf->user);
190	>	xfree(conf->host);
191	>	xfree(conf->cipher_list);
192
193	<	MyFree(conf->rsa_public_key_file);
200	<	#endif
201	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->hub_list.head)
193	>	DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
194		{
195	<	MyFree(ptr->data);
196	<	free_dlink_node(ptr);
195	>	xfree(node->data);
196	>	dlinkDelete(node, &conf->hub_list);
197	>	free_dlink_node(node);
198		}
199
200	<	DLINK_FOREACH_SAFE(ptr, ptr_next, conf->leaf_list.head)
200	>	DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
201		{
202	<	MyFree(ptr->data);
203	<	free_dlink_node(ptr);
202	>	xfree(node->data);
203	>	dlinkDelete(node, &conf->leaf_list);
204	>	free_dlink_node(node);
205		}
206
207	<	MyFree(conf);
207	>	xfree(conf);
208		}
209
210	<	static const struct shared_flags
211	<	{
212	<	const unsigned int type;
213	<	const unsigned char letter;
214	<	} flag_table[] = {
215	<	{ SHARED_KLINE,   'K' },
222	<	{ SHARED_UNKLINE, 'U' },
223	<	{ SHARED_XLINE,   'X' },
224	<	{ SHARED_UNXLINE, 'Y' },
225	<	{ SHARED_RESV,    'Q' },
226	<	{ SHARED_UNRESV,  'R' },
227	<	{ SHARED_LOCOPS,  'L' },
228	<	{ SHARED_DLINE,   'D' },
229	<	{ SHARED_UNDLINE, 'E' },
230	<	{ 0, '\0' }
231	<	};
232	<
233	<	/*
234	<	* inputs       - pointer to client requesting confitem report
235	<	*              - ConfType to report
236	<	* output       - none
237	<	* side effects -
210	>	/* attach_iline()
211	>	*
212	>	* inputs       - client pointer
213	>	*              - conf pointer
214	>	* output       -
215	>	* side effects - do actual attach
216		*/
217	<	void
218	<	report_confitem_types(struct Client *source_p, enum maskitem_type type)
217	>	static int
218	>	attach_iline(struct Client *client_p, struct MaskItem *conf)
219		{
220	<	dlink_node *ptr = NULL, *dptr = NULL;
221	<	struct MaskItem *conf = NULL;
222	<	const struct ClassItem *class = NULL;
223	<	const struct shared_flags *shared = NULL;
246	<	char buf[12];
247	<	char *p = NULL;
248	<
249	<	switch (type)
250	<	{
251	<	case CONF_XLINE:
252	<	DLINK_FOREACH(ptr, xconf_items.head)
253	<	{
254	<	conf = ptr->data;
255	<
256	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
257	<	me.name, source_p->name,
258	<	conf->hold ? "x": "X", conf->count,
259	<	conf->name, conf->reason);
260	<	}
261	<	break;
262	<
263	<	#ifdef HAVE_LIBPCRE
264	<	case CONF_RXLINE:
265	<	DLINK_FOREACH(ptr, rxconf_items.head)
266	<	{
267	<	conf = ptr->data;
268	<
269	<	sendto_one(source_p, form_str(RPL_STATSXLINE),
270	<	me.name, source_p->name,
271	<	"XR", conf->count,
272	<	conf->name, conf->reason);
273	<	}
274	<	break;
275	<
276	<	case CONF_RKLINE:
277	<	DLINK_FOREACH(ptr, rkconf_items.head)
278	<	{
279	<	conf = ptr->data;
280	<
281	<	sendto_one(source_p, form_str(RPL_STATSKLINE), me.name,
282	<	source_p->name, "KR", conf->host, conf->user,
283	<	conf->reason);
284	<	}
285	<	break;
286	<	#endif
287	<
288	<	case CONF_ULINE:
289	<	shared = flag_table;
290	<	DLINK_FOREACH(ptr, uconf_items.head)
291	<	{
292	<	conf = ptr->data;
293	<
294	<	p = buf;
220	>	const struct ClassItem *const class = conf->class;
221	>	struct ip_entry *ip_found;
222	>	int a_limit_reached = 0;
223	>	unsigned int local = 0, global = 0;
224
225	<	*p++ = 'c';
226	<	for (; shared->type; ++shared)
227	<	if (shared->type & conf->flags)
299	<	*p++ = shared->letter;
300	<	else
301	<	*p++ = ToLower(shared->letter);
225	>	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
226	>	ip_found->count++;
227	>	AddFlag(client_p, FLAGS_IPHASH);
228
229	<	sendto_one(source_p, form_str(RPL_STATSULINE),
304	<	me.name, source_p->name, conf->name,
305	<	conf->user?conf->user: "*",
306	<	conf->host?conf->host: "*", buf);
307	<	}
229	>	userhost_count(client_p->sockhost, &global, &local);
230
231	<	shared = flag_table;
232	<	DLINK_FOREACH(ptr, cluster_items.head)
233	<	{
234	<	conf = ptr->data;
231	>	/* XXX blah. go down checking the various silly limits
232	>	* setting a_limit_reached if any limit is reached.
233	>	* - Dianora
234	>	*/
235	>	if (class->max_total && class->ref_count >= class->max_total)
236	>	a_limit_reached = 1;
237	>	else if (class->max_perip && ip_found->count > class->max_perip)
238	>	a_limit_reached = 1;
239	>	else if (class->max_local && local >= class->max_local) /* XXX: redundant */
240	>	a_limit_reached = 1;
241	>	else if (class->max_global && global >= class->max_global)
242	>	a_limit_reached = 1;
243
244	<	p = buf;
244	>	if (a_limit_reached)
245	>	{
246	>	if (!IsConfExemptLimits(conf))
247	>	return TOO_MANY;   /* Already at maximum allowed */
248
249	<	*p++ = 'C';
250	<	for (; shared->type; ++shared)
251	<	if (shared->type & conf->flags)
319	<	*p++ = shared->letter;
320	<	else
321	<	*p++ = ToLower(shared->letter);
249	>	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
250	>	"but you have exceed_limit = yes;");
251	>	}
252
253	<	sendto_one(source_p, form_str(RPL_STATSULINE),
254	<	me.name, source_p->name, conf->name,
325	<	"*", "*", buf);
326	<	}
253	>	return attach_conf(client_p, conf);
254	>	}
255
256	<	break;
256	>	/* verify_access()
257	>	*
258	>	* inputs       - pointer to client to verify
259	>	* output       - 0 if success -'ve if not
260	>	* side effect  - find the first (best) I line to attach.
261	>	*/
262	>	static int
263	>	verify_access(struct Client *client_p)
264	>	{
265	>	struct MaskItem *conf = NULL;
266
267	<	case CONF_OPER:
268	<	DLINK_FOREACH(ptr, oconf_items.head)
269	<	{
270	<	conf = ptr->data;
267	>	if (HasFlag(client_p, FLAGS_GOTID))
268	>	{
269	>	conf = find_address_conf(client_p->host, client_p->username,
270	>	&client_p->connection->ip,
271	>	client_p->connection->aftype,
272	>	client_p->connection->password);
273	>	}
274	>	else
275	>	{
276	>	char non_ident[USERLEN + 1] = "~";
277
278	<	/* Don't allow non opers to see oper privs */
279	<	if (HasUMode(source_p, UMODE_OPER))
280	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
281	<	me.name, source_p->name, 'O', conf->user, conf->host,
282	<	conf->name, oper_privs_as_string(conf->port),
283	<	conf->class ? conf->class->name : "<default>");
341	<	else
342	<	sendto_one(source_p, form_str(RPL_STATSOLINE),
343	<	me.name, source_p->name, 'O', conf->user, conf->host,
344	<	conf->name, "0",
345	<	conf->class ? conf->class->name : "<default>");
346	<	}
347	<	break;
348	<
349	<	case CONF_CLASS:
350	<	DLINK_FOREACH(ptr, class_get_list()->head)
351	<	{
352	<	class = ptr->data;
353	<	sendto_one(source_p, form_str(RPL_STATSYLINE),
354	<	me.name, source_p->name, 'Y',
355	<	class->name, class->ping_freq,
356	<	class->con_freq,
357	<	class->max_total, class->max_sendq,
358	<	class->max_recvq,
359	<	class->ref_count,
360	<	class->number_per_cidr, class->cidr_bitlen_ipv4,
361	<	class->number_per_cidr, class->cidr_bitlen_ipv6,
362	<	class->active ? "active" : "disabled");
363	<	}
364	<	break;
365	<
366	<	case CONF_SERVICE:
367	<	DLINK_FOREACH(ptr, service_items.head)
368	<	{
369	<	conf = ptr->data;
370	<	sendto_one(source_p, form_str(RPL_STATSSERVICE),
371	<	me.name, source_p->name, 'S', "*", conf->name, 0, 0);
372	<	}
373	<	break;
374	<
375	<	case CONF_SERVER:
376	<	DLINK_FOREACH(ptr, server_items.head)
377	<	{
378	<	p = buf;
379	<	conf = ptr->data;
380	<
381	<	buf[0] = '\0';
382	<
383	<	if (IsConfAllowAutoConn(conf))
384	<	*p++ = 'A';
385	<	if (IsConfSSL(conf))
386	<	*p++ = 'S';
387	<	if (buf[0] == '\0')
388	<	*p++ = '*';
278	>	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
279	>	conf = find_address_conf(client_p->host, non_ident,
280	>	&client_p->connection->ip,
281	>	client_p->connection->aftype,
282	>	client_p->connection->password);
283	>	}
284
285	<	*p = '\0';
285	>	if (!conf)
286	>	return NOT_AUTHORIZED;
287
288	<	/*
393	<	* Allow admins to see actual ips unless hide_server_ips is enabled
394	<	*/
395	<	if (!ConfigServerHide.hide_server_ips && HasUMode(source_p, UMODE_ADMIN))
396	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
397	<	me.name, source_p->name, 'C', conf->host,
398	<	buf, conf->name, conf->port,
399	<	conf->class ? conf->class->name : "<default>");
400	<	else
401	<	sendto_one(source_p, form_str(RPL_STATSCLINE),
402	<	me.name, source_p->name, 'C',
403	<	"*@127.0.0.1", buf, conf->name, conf->port,
404	<	conf->class ? conf->class->name : "<default>");
405	<	}
406	<	break;
288	>	assert(IsConfClient(conf) || IsConfKill(conf));
289
290	<	case CONF_HUB:
291	<	DLINK_FOREACH(ptr, server_items.head)
290	>	if (IsConfClient(conf))
291	>	{
292	>	if (IsConfRedir(conf))
293		{
294	<	conf = ptr->data;
295	<
296	<	DLINK_FOREACH(dptr, conf->hub_list.head)
297	<	sendto_one(source_p, form_str(RPL_STATSHLINE), me.name,
415	<	source_p->name, 'H', dptr->data, conf->name, 0, "*");
294	>	sendto_one_numeric(client_p, &me, RPL_REDIR,
295	>	conf->name ? conf->name : "",
296	>	conf->port);
297	>	return NOT_AUTHORIZED;
298		}
299
300	<	DLINK_FOREACH(ptr, server_items.head)
300	>	if (IsConfDoSpoofIp(conf))
301		{
302	<	conf = ptr->data;
302	>	if (IsConfSpoofNotice(conf))
303	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
304	>	client_p->name, client_p->host, conf->name);
305
306	<	DLINK_FOREACH(dptr, conf->leaf_list.head)
423	<	sendto_one(source_p, form_str(RPL_STATSLLINE), me.name,
424	<	source_p->name, 'L', dptr->data, conf->name, 0, "*");
306	>	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
307		}
308
309	<	break;
428	<
429	<	default:
430	<	break;
309	>	return attach_iline(client_p, conf);
310		}
311	+
312	+	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
313	+	return BANNED_CLIENT;
314		}
315
316		/* check_client()
#	Line 448 | Line 330 | int
330		check_client(struct Client *source_p)
331		{
332		int i;
333	<
333	>
334		if ((i = verify_access(source_p)))
335	<	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
335	>	ilog(LOG_TYPE_IRCD, "Access denied: %s[%s]",
336		source_p->name, source_p->sockhost);
337
338		switch (i)
#	Line 458 | Line 340 | check_client(struct Client *source_p)
340		case TOO_MANY:
341		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
342		"Too many on IP for %s (%s).",
343	<	get_client_name(source_p, SHOW_IP),
344	<	source_p->sockhost);
343	>	get_client_name(source_p, SHOW_IP),
344	>	source_p->sockhost);
345		ilog(LOG_TYPE_IRCD, "Too many connections on IP from %s.",
346	<	get_client_name(source_p, SHOW_IP));
346	>	get_client_name(source_p, SHOW_IP));
347		++ServerStats.is_ref;
348	<	exit_client(source_p, &me, "No more connections allowed on that IP");
348	>	exit_client(source_p, "No more connections allowed on that IP");
349		break;
350
351		case I_LINE_FULL:
352		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
353	<	"auth{} block is full for %s (%s).",
354	<	get_client_name(source_p, SHOW_IP),
355	<	source_p->sockhost);
353	>	"auth {} block is full for %s (%s).",
354	>	get_client_name(source_p, SHOW_IP),
355	>	source_p->sockhost);
356		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
357	<	get_client_name(source_p, SHOW_IP));
357	>	get_client_name(source_p, SHOW_IP));
358		++ServerStats.is_ref;
359	<	exit_client(source_p, &me,
478	<	"No more connections allowed in your connection class");
359	>	exit_client(source_p, "No more connections allowed in your connection class");
360		break;
361
362		case NOT_AUTHORIZED:
482	–	++ServerStats.is_ref;
363		/* jdc - lists server name & port connections are on */
364		/*       a purely cosmetical change */
365		sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
366	<	"Unauthorized client connection from %s [%s] on [%s/%u].",
367	<	get_client_name(source_p, SHOW_IP),
368	<	source_p->sockhost,
369	<	source_p->localClient->listener->name,
370	<	source_p->localClient->listener->port);
371	<	ilog(LOG_TYPE_IRCD,
372	<	"Unauthorized client connection from %s on [%s/%u].",
373	<	get_client_name(source_p, SHOW_IP),
494	<	source_p->localClient->listener->name,
495	<	source_p->localClient->listener->port);
366	>	"Unauthorized client connection from %s on [%s/%u].",
367	>	get_client_name(source_p, SHOW_IP),
368	>	source_p->connection->listener->name,
369	>	source_p->connection->listener->port);
370	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
371	>	get_client_name(source_p, SHOW_IP),
372	>	source_p->connection->listener->name,
373	>	source_p->connection->listener->port);
374
375	<	exit_client(source_p, &me, "You are not authorized to use this server");
375	>	++ServerStats.is_ref;
376	>	exit_client(source_p, "You are not authorized to use this server");
377		break;
378
379	<	case BANNED_CLIENT:
380	<	exit_client(source_p, &me, "Banned");
381	<	++ServerStats.is_ref;
382	<	break;
504	<
505	<	case 0:
506	<	default:
507	<	break;
508	<	}
509	<
510	<	return (i < 0 ? 0 : 1);
511	<	}
512	<
513	<	/* verify_access()
514	<	*
515	<	* inputs       - pointer to client to verify
516	<	* output       - 0 if success -'ve if not
517	<	* side effect  - find the first (best) I line to attach.
518	<	*/
519	<	static int
520	<	verify_access(struct Client *client_p)
521	<	{
522	<	struct MaskItem *conf = NULL, *rkconf = NULL;
523	<	char non_ident[USERLEN + 1] = { '~', '\0' };
524	<	const char *uhi[3];
525	<
526	<	if (IsGotId(client_p))
527	<	{
528	<	conf = find_address_conf(client_p->host, client_p->username,
529	<	&client_p->localClient->ip,
530	<	client_p->localClient->aftype,
531	<	client_p->localClient->passwd);
532	<	}
533	<	else
534	<	{
535	<	strlcpy(non_ident+1, client_p->username, sizeof(non_ident)-1);
536	<	conf = find_address_conf(client_p->host,non_ident,
537	<	&client_p->localClient->ip,
538	<	client_p->localClient->aftype,
539	<	client_p->localClient->passwd);
540	<	}
541	<
542	<	uhi[0] = IsGotId(client_p) ? client_p->username : non_ident;
543	<	uhi[1] = client_p->host;
544	<	uhi[2] = client_p->sockhost;
545	<
546	<	rkconf = find_regexp_kline(uhi);
547	<
548	<	if (conf != NULL)
549	<	{
550	<	if (IsConfClient(conf) && !rkconf)
551	<	{
552	<	if (IsConfRedir(conf))
553	<	{
554	<	sendto_one(client_p, form_str(RPL_REDIR),
555	<	me.name, client_p->name,
556	<	conf->name ? conf->name : "",
557	<	conf->port);
558	<	return(NOT_AUTHORIZED);
559	<	}
560	<
561	<	if (IsConfDoIdentd(conf))
562	<	SetNeedId(client_p);
563	<
564	<	/* Thanks for spoof idea amm */
565	<	if (IsConfDoSpoofIp(conf))
566	<	{
567	<	if (!ConfigFileEntry.hide_spoof_ips && IsConfSpoofNotice(conf))
568	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
569	<	"%s spoofing: %s as %s",
570	<	client_p->name, client_p->host, conf->name);
571	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
572	<	SetIPSpoof(client_p);
573	<	}
574	<
575	<	return(attach_iline(client_p, conf));
576	<	}
577	<	else if (rkconf || IsConfKill(conf) || (ConfigFileEntry.glines && IsConfGline(conf)))
578	<	{
579	<	/* XXX */
580	<	conf = rkconf ? rkconf : conf;
581	<	if (IsConfGline(conf))
582	<	sendto_one(client_p, ":%s NOTICE %s :*** G-lined", me.name,
583	<	client_p->name);
584	<	sendto_one(client_p, ":%s NOTICE %s :*** Banned: %s",
585	<	me.name, client_p->name, conf->reason);
586	<	return(BANNED_CLIENT);
587	<	}
588	<	}
589	<
590	<	return(NOT_AUTHORIZED);
591	<	}
592	<
593	<	/* attach_iline()
594	<	*
595	<	* inputs       - client pointer
596	<	*              - conf pointer
597	<	* output       -
598	<	* side effects - do actual attach
599	<	*/
600	<	static int
601	<	attach_iline(struct Client *client_p, struct MaskItem *conf)
602	<	{
603	<	struct ClassItem *class = NULL;
604	<	struct ip_entry *ip_found;
605	<	int a_limit_reached = 0;
606	<	unsigned int local = 0, global = 0, ident = 0;
607	<
608	<	ip_found = find_or_add_ip(&client_p->localClient->ip);
609	<	ip_found->count++;
610	<	SetIpHash(client_p);
611	<
612	<	if (conf->class == NULL)
613	<	return NOT_AUTHORIZED;  /* If class is missing, this is best */
614	<
615	<	class = conf->class;
616	<
617	<	count_user_host(client_p->username, client_p->host,
618	<	&global, &local, &ident);
619	<
620	<	/* XXX blah. go down checking the various silly limits
621	<	* setting a_limit_reached if any limit is reached.
622	<	* - Dianora
623	<	*/
624	<	if (class->max_total != 0 && class->ref_count >= class->max_total)
625	<	a_limit_reached = 1;
626	<	else if (class->max_perip != 0 && ip_found->count > class->max_perip)
627	<	a_limit_reached = 1;
628	<	else if (class->max_local != 0 && local >= class->max_local)
629	<	a_limit_reached = 1;
630	<	else if (class->max_global != 0 && global >= class->max_global)
631	<	a_limit_reached = 1;
632	<	else if (class->max_ident != 0 && ident >= class->max_ident &&
633	<	client_p->username[0] != '~')
634	<	a_limit_reached = 1;
635	<
636	<	if (a_limit_reached)
637	<	{
638	<	if (!IsConfExemptLimits(conf))
639	<	return TOO_MANY;   /* Already at maximum allowed */
640	<
641	<	sendto_one(client_p,
642	<	":%s NOTICE %s :*** Your connection class is full, "
643	<	"but you have exceed_limit = yes;", me.name, client_p->name);
644	<	}
645	<
646	<	return attach_conf(client_p, conf);
647	<	}
648	<
649	<	/* init_ip_hash_table()
650	<	*
651	<	* inputs               - NONE
652	<	* output               - NONE
653	<	* side effects         - allocate memory for ip_entry(s)
654	<	*                      - clear the ip hash table
655	<	*/
656	<	void
657	<	init_ip_hash_table(void)
658	<	{
659	<	ip_entry_heap = BlockHeapCreate("ip", sizeof(struct ip_entry),
660	<	2 * hard_fdlimit);
661	<	memset(ip_hash_table, 0, sizeof(ip_hash_table));
662	<	}
663	<
664	<	/* find_or_add_ip()
665	<	*
666	<	* inputs       - pointer to struct irc_ssaddr
667	<	* output       - pointer to a struct ip_entry
668	<	* side effects -
669	<	*
670	<	* If the ip # was not found, a new struct ip_entry is created, and the ip
671	<	* count set to 0.
672	<	*/
673	<	static struct ip_entry *
674	<	find_or_add_ip(struct irc_ssaddr *ip_in)
675	<	{
676	<	struct ip_entry *ptr, *newptr;
677	<	int hash_index = hash_ip(ip_in), res;
678	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
679	<	#ifdef IPV6
680	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
681	<	#endif
682	<
683	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
684	<	{
685	<	#ifdef IPV6
686	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
687	<	continue;
688	<	if (ip_in->ss.ss_family == AF_INET6)
689	<	{
690	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
691	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
692	<	}
693	<	else
694	<	#endif
695	<	{
696	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
697	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
698	<	}
699	<	if (res == 0)
700	<	{
701	<	/* Found entry already in hash, return it. */
702	<	return ptr;
703	<	}
704	<	}
705	<
706	<	if (ip_entries_count >= 2 * hard_fdlimit)
707	<	garbage_collect_ip_entries();
708	<
709	<	newptr = BlockHeapAlloc(ip_entry_heap);
710	<	ip_entries_count++;
711	<	memcpy(&newptr->ip, ip_in, sizeof(struct irc_ssaddr));
712	<
713	<	newptr->next = ip_hash_table[hash_index];
714	<	ip_hash_table[hash_index] = newptr;
715	<
716	<	return newptr;
717	<	}
718	<
719	<	/* remove_one_ip()
720	<	*
721	<	* inputs        - unsigned long IP address value
722	<	* output        - NONE
723	<	* side effects  - The ip address given, is looked up in ip hash table
724	<	*                 and number of ip#'s for that ip decremented.
725	<	*                 If ip # count reaches 0 and has expired,
726	<	*                 the struct ip_entry is returned to the ip_entry_heap
727	<	*/
728	<	void
729	<	remove_one_ip(struct irc_ssaddr *ip_in)
730	<	{
731	<	struct ip_entry *ptr;
732	<	struct ip_entry *last_ptr = NULL;
733	<	int hash_index = hash_ip(ip_in), res;
734	<	struct sockaddr_in *v4 = (struct sockaddr_in *)ip_in, *ptr_v4;
735	<	#ifdef IPV6
736	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)ip_in, *ptr_v6;
737	<	#endif
738	<
739	<	for (ptr = ip_hash_table[hash_index]; ptr; ptr = ptr->next)
740	<	{
741	<	#ifdef IPV6
742	<	if (ptr->ip.ss.ss_family != ip_in->ss.ss_family)
743	<	continue;
744	<	if (ip_in->ss.ss_family == AF_INET6)
745	<	{
746	<	ptr_v6 = (struct sockaddr_in6 *)&ptr->ip;
747	<	res = memcmp(&v6->sin6_addr, &ptr_v6->sin6_addr, sizeof(struct in6_addr));
748	<	}
749	<	else
750	<	#endif
751	<	{
752	<	ptr_v4 = (struct sockaddr_in *)&ptr->ip;
753	<	res = memcmp(&v4->sin_addr, &ptr_v4->sin_addr, sizeof(struct in_addr));
754	<	}
755	<	if (res)
756	<	continue;
757	<	if (ptr->count > 0)
758	<	ptr->count--;
759	<	if (ptr->count == 0 &&
760	<	(CurrentTime-ptr->last_attempt) >= ConfigFileEntry.throttle_time)
761	<	{
762	<	if (last_ptr != NULL)
763	<	last_ptr->next = ptr->next;
764	<	else
765	<	ip_hash_table[hash_index] = ptr->next;
766	<
767	<	BlockHeapFree(ip_entry_heap, ptr);
768	<	ip_entries_count--;
769	<	return;
770	<	}
771	<	last_ptr = ptr;
772	<	}
773	<	}
774	<
775	<	/* hash_ip()
776	<	*
777	<	* input        - pointer to an irc_inaddr
778	<	* output       - integer value used as index into hash table
779	<	* side effects - hopefully, none
780	<	*/
781	<	static int
782	<	hash_ip(struct irc_ssaddr *addr)
783	<	{
784	<	if (addr->ss.ss_family == AF_INET)
785	<	{
786	<	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
787	<	int hash;
788	<	uint32_t ip;
789	<
790	<	ip   = ntohl(v4->sin_addr.s_addr);
791	<	hash = ((ip >> 12) + ip) & (IP_HASH_SIZE-1);
792	<	return hash;
793	<	}
794	<	#ifdef IPV6
795	<	else
796	<	{
797	<	int hash;
798	<	struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
799	<	uint32_t *ip = (uint32_t *)&v6->sin6_addr.s6_addr;
800	<
801	<	hash  = ip[0] ^ ip[3];
802	<	hash ^= hash >> 16;
803	<	hash ^= hash >> 8;
804	<	hash  = hash & (IP_HASH_SIZE - 1);
805	<	return hash;
806	<	}
807	<	#else
808	<	return 0;
809	<	#endif
810	<	}
811	<
812	<	/* count_ip_hash()
813	<	*
814	<	* inputs        - pointer to counter of number of ips hashed
815	<	*               - pointer to memory used for ip hash
816	<	* output        - returned via pointers input
817	<	* side effects  - NONE
818	<	*
819	<	* number of hashed ip #'s is counted up, plus the amount of memory
820	<	* used in the hash.
821	<	*/
822	<	void
823	<	count_ip_hash(unsigned int *number_ips_stored, uint64_t *mem_ips_stored)
824	<	{
825	<	struct ip_entry *ptr;
826	<	int i;
827	<
828	<	*number_ips_stored = 0;
829	<	*mem_ips_stored    = 0;
379	>	case BANNED_CLIENT:
380	>	++ServerStats.is_ref;
381	>	exit_client(source_p, "Banned");
382	>	break;
383
384	<	for (i = 0; i < IP_HASH_SIZE; i++)
385	<	{
386	<	for (ptr = ip_hash_table[i]; ptr; ptr = ptr->next)
834	<	{
835	<	*number_ips_stored += 1;
836	<	*mem_ips_stored += sizeof(struct ip_entry);
837	<	}
384	>	case 0:
385	>	default:
386	>	break;
387		}
839	–	}
840	–
841	–	/* garbage_collect_ip_entries()
842	–	*
843	–	* input        - NONE
844	–	* output       - NONE
845	–	* side effects - free up all ip entries with no connections
846	–	*/
847	–	static void
848	–	garbage_collect_ip_entries(void)
849	–	{
850	–	struct ip_entry *ptr;
851	–	struct ip_entry *last_ptr;
852	–	struct ip_entry *next_ptr;
853	–	int i;
854	–
855	–	for (i = 0; i < IP_HASH_SIZE; i++)
856	–	{
857	–	last_ptr = NULL;
388
389	<	for (ptr = ip_hash_table[i]; ptr; ptr = next_ptr)
860	<	{
861	<	next_ptr = ptr->next;
862	<
863	<	if (ptr->count == 0 &&
864	<	(CurrentTime - ptr->last_attempt) >= ConfigFileEntry.throttle_time)
865	<	{
866	<	if (last_ptr != NULL)
867	<	last_ptr->next = ptr->next;
868	<	else
869	<	ip_hash_table[i] = ptr->next;
870	<	BlockHeapFree(ip_entry_heap, ptr);
871	<	ip_entries_count--;
872	<	}
873	<	else
874	<	last_ptr = ptr;
875	<	}
876	<	}
389	>	return !(i < 0);
390		}
391
392		/* detach_conf()
#	Line 887 | Line 400 | garbage_collect_ip_entries(void)
400		void
401		detach_conf(struct Client *client_p, enum maskitem_type type)
402		{
403	<	dlink_node *ptr = NULL, *next_ptr = NULL;
403	>	dlink_node *node = NULL, *node_next = NULL;
404
405	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->confs.head)
405	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->confs.head)
406		{
407	<	struct MaskItem *conf = ptr->data;
407	>	struct MaskItem *conf = node->data;
408
409		assert(conf->type & (CONF_CLIENT | CONF_OPER | CONF_SERVER));
410		assert(conf->ref_count > 0);
#	Line 900 | Line 413 | detach_conf(struct Client *client_p, enu
413		if (!(conf->type & type))
414		continue;
415
416	<	dlinkDelete(ptr, &client_p->localClient->confs);
417	<	free_dlink_node(ptr);
416	>	dlinkDelete(node, &client_p->connection->confs);
417	>	free_dlink_node(node);
418
419		if (conf->type == CONF_CLIENT)
420	<	remove_from_cidr_check(&client_p->localClient->ip, conf->class);
420	>	remove_from_cidr_check(&client_p->connection->ip, conf->class);
421
422		if (--conf->class->ref_count == 0 && conf->class->active == 0)
423		{
#	Line 930 | Line 443 | detach_conf(struct Client *client_p, enu
443		int
444		attach_conf(struct Client *client_p, struct MaskItem *conf)
445		{
446	<	if (dlinkFind(&client_p->localClient->confs, conf) != NULL)
446	>	if (dlinkFind(&client_p->connection->confs, conf))
447		return 1;
448
449		if (conf->type == CONF_CLIENT)
450		if (cidr_limit_reached(IsConfExemptLimits(conf),
451	<	&client_p->localClient->ip, conf->class))
451	>	&client_p->connection->ip, conf->class))
452		return TOO_MANY;    /* Already at maximum allowed */
453
454		conf->class->ref_count++;
455		conf->ref_count++;
456
457	<	dlinkAdd(conf, make_dlink_node(), &client_p->localClient->confs);
457	>	dlinkAdd(conf, make_dlink_node(), &client_p->connection->confs);
458
459		return 0;
460		}
#	Line 958 | Line 471 | int
471		attach_connect_block(struct Client *client_p, const char *name,
472		const char *host)
473		{
474	<	dlink_node *ptr;
962	<	struct MaskItem *conf = NULL;
963	<
964	<	assert(client_p != NULL);
965	<	assert(host != NULL);
474	>	dlink_node *node = NULL;
475
476	<	if (client_p == NULL || host == NULL)
968	<	return 0;
476	>	assert(host);
477
478	<	DLINK_FOREACH(ptr, server_items.head)
478	>	DLINK_FOREACH(node, connect_items.head)
479		{
480	<	conf = ptr->data;
480	>	struct MaskItem *conf = node->data;
481
482	<	if (match(conf->name, name) == 0 || match(conf->host, host) == 0)
482	>	if (irccmp(conf->name, name) ||
483	>	irccmp(conf->host, host))
484		continue;
485
486		attach_conf(client_p, conf);
487	<	return -1;
487	>	return 1;
488		}
489
490		return 0;
#	Line 993 | Line 502 | attach_connect_block(struct Client *clie
502		struct MaskItem *
503		find_conf_name(dlink_list *list, const char *name, enum maskitem_type type)
504		{
505	<	dlink_node *ptr;
997	<	struct MaskItem* conf;
505	>	dlink_node *node = NULL;
506
507	<	DLINK_FOREACH(ptr, list->head)
507	>	DLINK_FOREACH(node, list->head)
508		{
509	<	conf = ptr->data;
510	<
509	>	struct MaskItem *conf = node->data;
510	>
511		if (conf->type == type)
512		{
513	<	if (conf->name && (irccmp(conf->name, name) == 0 ||
514	<	match(conf->name, name)))
1007	<	return conf;
513	>	if (conf->name && !irccmp(conf->name, name))
514	>	return conf;
515		}
516		}
517
518		return NULL;
519		}
520
1014	–	/* map_to_list()
1015	–	*
1016	–	* inputs       - ConfType conf
1017	–	* output       - pointer to dlink_list to use
1018	–	* side effects - none
1019	–	*/
1020	–	static dlink_list *
1021	–	map_to_list(enum maskitem_type type)
1022	–	{
1023	–	switch(type)
1024	–	{
1025	–	case CONF_RKLINE:
1026	–	return(&rkconf_items);
1027	–	break;
1028	–	case CONF_RXLINE:
1029	–	return(&rxconf_items);
1030	–	break;
1031	–	case CONF_XLINE:
1032	–	return(&xconf_items);
1033	–	break;
1034	–	case CONF_ULINE:
1035	–	return(&uconf_items);
1036	–	break;
1037	–	case CONF_NRESV:
1038	–	return(&nresv_items);
1039	–	break;
1040	–	case CONF_OPER:
1041	–	return(&oconf_items);
1042	–	break;
1043	–	case CONF_SERVER:
1044	–	return(&server_items);
1045	–	break;
1046	–	case CONF_SERVICE:
1047	–	return(&service_items);
1048	–	break;
1049	–	case CONF_CLUSTER:
1050	–	return(&cluster_items);
1051	–	break;
1052	–	default:
1053	–	return NULL;
1054	–	}
1055	–	}
1056	–
521		/* find_matching_name_conf()
522		*
523		* inputs       - type of link list to look in
#	Line 1065 | Line 529 | map_to_list(enum maskitem_type type)
529		* side effects - looks for a match on name field
530		*/
531		struct MaskItem *
532	<	find_matching_name_conf(enum maskitem_type type, const char *name, const char *user,
1069	<	const char *host, unsigned int flags)
532	>	connect_find(const char *name, const char *host, int (*compare)(const char *, const char *))
533		{
534	<	dlink_node *ptr=NULL;
1072	<	struct MaskItem *conf=NULL;
1073	<	dlink_list *list_p = map_to_list(type);
534	>	dlink_node *node = NULL;
535
536	<	switch (type)
536	>	DLINK_FOREACH(node, connect_items.head)
537		{
538	<	#ifdef HAVE_LIBPCRE
1078	<	case CONF_RXLINE:
1079	<	DLINK_FOREACH(ptr, list_p->head)
1080	<	{
1081	<	conf = ptr->data;
1082	<	assert(conf->regexpname);
1083	<
1084	<	if (!ircd_pcre_exec(conf->regexuser, name))
1085	<	return conf;
1086	<	}
1087	<	break;
1088	<	#endif
1089	<	case CONF_SERVICE:
1090	<	DLINK_FOREACH(ptr, list_p->head)
1091	<	{
1092	<	conf = ptr->data;
1093	<
1094	<	if (EmptyString(conf->name))
1095	<	continue;
1096	<	if ((name != NULL) && !irccmp(name, conf->name))
1097	<	return conf;
1098	<	}
1099	<	break;
1100	<
1101	<	case CONF_XLINE:
1102	<	case CONF_ULINE:
1103	<	case CONF_NRESV:
1104	<	DLINK_FOREACH(ptr, list_p->head)
1105	<	{
1106	<	conf = ptr->data;
1107	<
1108	<	if (EmptyString(conf->name))
1109	<	continue;
1110	<	if ((name != NULL) && match_esc(conf->name, name))
1111	<	{
1112	<	if ((user == NULL && (host == NULL)))
1113	<	return conf;
1114	<	if ((conf->flags & flags) != flags)
1115	<	continue;
1116	<	if (EmptyString(conf->user) || EmptyString(conf->host))
1117	<	return conf;
1118	<	if (match(conf->user, user) && match(conf->host, host))
1119	<	return conf;
1120	<	}
1121	<	}
1122	<	break;
1123	<
1124	<	case CONF_SERVER:
1125	<	DLINK_FOREACH(ptr, list_p->head)
1126	<	{
1127	<	conf = ptr->data;
538	>	struct MaskItem *conf = node->data;
539
540	<	if ((name != NULL) && match(name, conf->name))
541	<	return conf;
542	<	else if ((host != NULL) && match(host, conf->host))
543	<	return conf;
1133	<	}
1134	<	break;
1135	<
1136	<	default:
1137	<	break;
540	>	if (name && !compare(name, conf->name))
541	>	return conf;
542	>	if (host && !compare(host, conf->host))
543	>	return conf;
544		}
545	+
546		return NULL;
547		}
548
#	Line 1149 | Line 556 | find_matching_name_conf(enum maskitem_ty
556		* side effects - looks for an exact match on name field
557		*/
558		struct MaskItem *
559	<	find_exact_name_conf(enum maskitem_type type, const struct Client *who, const char *name,
1153	<	const char *user, const char *host)
559	>	operator_find(const struct Client *who, const char *name)
560		{
561	<	dlink_node *ptr = NULL;
1156	<	struct MaskItem *conf;
1157	<	dlink_list *list_p = map_to_list(type);
561	>	dlink_node *node = NULL;
562
563	<	switch(type)
563	>	DLINK_FOREACH(node, operator_items.head)
564		{
565	<	case CONF_RXLINE:
1162	<	case CONF_XLINE:
1163	<	case CONF_ULINE:
1164	<	case CONF_NRESV:
1165	<
1166	<	DLINK_FOREACH(ptr, list_p->head)
1167	<	{
1168	<	conf = ptr->data;
1169	<
1170	<	if (EmptyString(conf->name))
1171	<	continue;
1172	<
1173	<	if (irccmp(conf->name, name) == 0)
1174	<	{
1175	<	if ((user == NULL && (host == NULL)))
1176	<	return (conf);
1177	<	if (EmptyString(conf->user) || EmptyString(conf->host))
1178	<	return (conf);
1179	<	if (match(conf->user, user) && match(conf->host, host))
1180	<	return (conf);
1181	<	}
1182	<	}
1183	<	break;
565	>	struct MaskItem *conf = node->data;
566
567	<	case CONF_OPER:
1186	<	DLINK_FOREACH(ptr, list_p->head)
567	>	if (!irccmp(conf->name, name))
568		{
569	<	conf = ptr->data;
570	<
1190	<	if (EmptyString(conf->name))
1191	<	continue;
569	>	if (!who)
570	>	return conf;
571
572	<	if (!irccmp(conf->name, name))
572	>	if (!match(conf->user, who->username))
573		{
574	<	if (!who)
1196	<	return conf;
1197	<	if (EmptyString(conf->user) || EmptyString(conf->host))
1198	<	return NULL;
1199	<	if (match(conf->user, who->username))
574	>	switch (conf->htype)
575		{
576	<	switch (conf->htype)
577	<	{
578	<	case HM_HOST:
579	<	if (match(conf->host, who->host) || match(conf->host, who->sockhost))
576	>	case HM_HOST:
577	>	if (!match(conf->host, who->host) || !match(conf->host, who->sockhost))
578	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
579	>	return conf;
580	>	break;
581	>	case HM_IPV4:
582	>	if (who->connection->aftype == AF_INET)
583	>	if (match_ipv4(&who->connection->ip, &conf->addr, conf->bits))
584		if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
585		return conf;
586	<	break;
587	<	case HM_IPV4:
588	<	if (who->localClient->aftype == AF_INET)
589	<	if (match_ipv4(&who->localClient->ip, &conf->addr, conf->bits))
590	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
591	<	return conf;
592	<	break;
593	<	#ifdef IPV6
594	<	case HM_IPV6:
1216	<	if (who->localClient->aftype == AF_INET6)
1217	<	if (match_ipv6(&who->localClient->ip, &conf->addr, conf->bits))
1218	<	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
1219	<	return conf;
1220	<	break;
1221	<	#endif
1222	<	default:
1223	<	assert(0);
1224	<	}
586	>	break;
587	>	case HM_IPV6:
588	>	if (who->connection->aftype == AF_INET6)
589	>	if (match_ipv6(&who->connection->ip, &conf->addr, conf->bits))
590	>	if (!conf->class->max_total || conf->class->ref_count < conf->class->max_total)
591	>	return conf;
592	>	break;
593	>	default:
594	>	assert(0);
595		}
596		}
597		}
1228	–
1229	–	break;
1230	–
1231	–	case CONF_SERVER:
1232	–	DLINK_FOREACH(ptr, list_p->head)
1233	–	{
1234	–	conf = ptr->data;
1235	–
1236	–	if (EmptyString(conf->name))
1237	–	continue;
1238	–
1239	–	if (name == NULL)
1240	–	{
1241	–	if (EmptyString(conf->host))
1242	–	continue;
1243	–	if (irccmp(conf->host, host) == 0)
1244	–	return(conf);
1245	–	}
1246	–	else if (irccmp(conf->name, name) == 0)
1247	–	{
1248	–	return (conf);
1249	–	}
1250	–	}
1251	–	break;
1252	–
1253	–	default:
1254	–	break;
598		}
1256	–	return(NULL);
1257	–	}
1258	–
1259	–	/* rehash()
1260	–	*
1261	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
1262	–	* as a result of an operator issuing this command, else assume it has been
1263	–	* called as a result of the server receiving a HUP signal.
1264	–	*/
1265	–	int
1266	–	rehash(int sig)
1267	–	{
1268	–	if (sig != 0)
1269	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1270	–	"Got signal SIGHUP, reloading ircd.conf file");
1271	–
1272	–	restart_resolver();
1273	–
1274	–	/* don't close listeners until we know we can go ahead with the rehash */
1275	–
1276	–	/* Check to see if we magically got(or lost) IPv6 support */
1277	–	check_can_use_v6();
1278	–
1279	–	read_conf_files(0);
1280	–
1281	–	if (ServerInfo.description != NULL)
1282	–	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
1283	–
1284	–	load_conf_modules();
1285	–
1286	–	rehashed_klines = 1;
1287	–	/* XXX */
1288	–	if (ConfigLoggingEntry.use_logging)
1289	–	log_close_all();
599
600	<	return(0);
600	>	return NULL;
601		}
602
603		/* set_default_conf()
#	Line 1308 | Line 617 | set_default_conf(void)
617		*/
618		assert(class_default == class_get_list()->tail->data);
619
620	<	#ifdef HAVE_LIBCRYPTO
621	<	ServerInfo.rsa_private_key = NULL;
1313	<	ServerInfo.rsa_private_key_file = NULL;
1314	<	#endif
620	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
621	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
622
623	<	/* ServerInfo.name is not rehashable */
624	<	/* ServerInfo.name = ServerInfo.name; */
625	<	ServerInfo.description = NULL;
626	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
627	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
628	<
629	<	memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip));
630	<	ServerInfo.specific_ipv4_vhost = 0;
631	<	memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6));
632	<	ServerInfo.specific_ipv6_vhost = 0;
1326	<
1327	<	ServerInfo.max_clients = MAXCLIENTS_MAX;
1328	<
1329	<	ServerInfo.hub = 0;
1330	<	ServerInfo.dns_host.sin_addr.s_addr = 0;
1331	<	ServerInfo.dns_host.sin_port = 0;
1332	<	AdminInfo.name = NULL;
1333	<	AdminInfo.email = NULL;
1334	<	AdminInfo.description = NULL;
623	>	memset(&ConfigServerInfo.ip, 0, sizeof(ConfigServerInfo.ip));
624	>	ConfigServerInfo.specific_ipv4_vhost = 0;
625	>	memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
626	>	ConfigServerInfo.specific_ipv6_vhost = 0;
627	>
628	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
629	>	ConfigServerInfo.max_nick_length = 9;
630	>	ConfigServerInfo.max_topic_length = 80;
631	>	ConfigServerInfo.hub = 0;
632	>	ConfigServerInfo.libgeoip_database_options = 0;
633
634	<	log_close_all();
634	>	log_del_all();
635
636	<	ConfigLoggingEntry.use_logging = 1;
636	>	ConfigLog.use_logging = 1;
637
638		ConfigChannel.disable_fake_channels = 0;
639	<	ConfigChannel.restrict_channels = 0;
640	<	ConfigChannel.knock_delay = 300;
639	>	ConfigChannel.invite_client_count = 10;
640	>	ConfigChannel.invite_client_time = 300;
641	>	ConfigChannel.invite_delay_channel = 5;
642	>	ConfigChannel.knock_client_count = 1;
643	>	ConfigChannel.knock_client_time = 300;
644		ConfigChannel.knock_delay_channel = 60;
645	<	ConfigChannel.max_chans_per_user = 25;
1345	<	ConfigChannel.max_chans_per_oper = 50;
1346	<	ConfigChannel.quiet_on_ban = 1;
645	>	ConfigChannel.max_channels = 25;
646		ConfigChannel.max_bans = 25;
647	<	ConfigChannel.default_split_user_count = 0;
648	<	ConfigChannel.default_split_server_count = 0;
1350	<	ConfigChannel.no_join_on_split = 0;
1351	<	ConfigChannel.no_create_on_split = 0;
647	>	ConfigChannel.default_join_flood_count = 18;
648	>	ConfigChannel.default_join_flood_time = 6;
649
650		ConfigServerHide.flatten_links = 0;
651	<	ConfigServerHide.links_delay = 300;
651	>	ConfigServerHide.flatten_links_delay = 300;
652		ConfigServerHide.hidden = 0;
653		ConfigServerHide.hide_servers = 0;
654	+	ConfigServerHide.hide_services = 0;
655		ConfigServerHide.hidden_name = xstrdup(NETWORK_NAME_DEFAULT);
656		ConfigServerHide.hide_server_ips = 0;
657	+	ConfigServerHide.disable_remote_commands = 0;
658
659	<
660	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
661	<	ConfigFileEntry.max_watch = WATCHSIZE_DEFAULT;
662	<	ConfigFileEntry.glines = 0;
663	<	ConfigFileEntry.gline_time = 12 * 3600;
664	<	ConfigFileEntry.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
665	<	ConfigFileEntry.gline_min_cidr = 16;
666	<	ConfigFileEntry.gline_min_cidr6 = 48;
667	<	ConfigFileEntry.invisible_on_connect = 1;
668	<	ConfigFileEntry.tkline_expire_notices = 1;
669	<	ConfigFileEntry.hide_spoof_ips = 1;
670	<	ConfigFileEntry.ignore_bogus_ts = 0;
671	<	ConfigFileEntry.disable_auth = 0;
672	<	ConfigFileEntry.disable_remote = 0;
673	<	ConfigFileEntry.kill_chase_time_limit = 90;
674	<	ConfigFileEntry.default_floodcount = 8;
675	<	ConfigFileEntry.failed_oper_notice = 1;
676	<	ConfigFileEntry.dots_in_ident = 0;
677	<	ConfigFileEntry.min_nonwildcard = 4;
678	<	ConfigFileEntry.min_nonwildcard_simple = 3;
679	<	ConfigFileEntry.max_accept = 20;
680	<	ConfigFileEntry.anti_nick_flood = 0;
681	<	ConfigFileEntry.max_nick_time = 20;
682	<	ConfigFileEntry.max_nick_changes = 5;
683	<	ConfigFileEntry.anti_spam_exit_message_time = 0;
684	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
685	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
686	<	ConfigFileEntry.warn_no_nline = 1;
687	<	ConfigFileEntry.stats_o_oper_only = 0;
688	<	ConfigFileEntry.stats_k_oper_only = 1;  /* masked */
689	<	ConfigFileEntry.stats_i_oper_only = 1;  /* masked */
690	<	ConfigFileEntry.stats_P_oper_only = 0;
691	<	ConfigFileEntry.caller_id_wait = 60;
692	<	ConfigFileEntry.opers_bypass_callerid = 0;
693	<	ConfigFileEntry.pace_wait = 10;
694	<	ConfigFileEntry.pace_wait_simple = 1;
695	<	ConfigFileEntry.short_motd = 0;
696	<	ConfigFileEntry.ping_cookie = 0;
697	<	ConfigFileEntry.no_oper_flood = 0;
698	<	ConfigFileEntry.true_no_oper_flood = 0;
699	<	ConfigFileEntry.oper_pass_resv = 1;
700	<	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
701	<	ConfigFileEntry.oper_only_umodes = UMODE_DEBUG;
702	<	ConfigFileEntry.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE |
703	<	UMODE_OPERWALL | UMODE_WALLOP;
704	<	ConfigFileEntry.use_egd = 0;
705	<	ConfigFileEntry.egdpool_path = NULL;
706	<	ConfigFileEntry.throttle_time = 10;
659	>	ConfigGeneral.away_count = 2;
660	>	ConfigGeneral.away_time = 10;
661	>	ConfigGeneral.max_watch = 50;
662	>	ConfigGeneral.whowas_history_length = 15000;
663	>	ConfigGeneral.cycle_on_host_change = 1;
664	>	ConfigGeneral.dline_min_cidr = 16;
665	>	ConfigGeneral.dline_min_cidr6 = 48;
666	>	ConfigGeneral.kline_min_cidr = 16;
667	>	ConfigGeneral.kline_min_cidr6 = 48;
668	>	ConfigGeneral.invisible_on_connect = 1;
669	>	ConfigGeneral.tkline_expire_notices = 1;
670	>	ConfigGeneral.ignore_bogus_ts = 0;
671	>	ConfigGeneral.disable_auth = 0;
672	>	ConfigGeneral.kill_chase_time_limit = 90;
673	>	ConfigGeneral.default_floodcount = 8;
674	>	ConfigGeneral.failed_oper_notice = 1;
675	>	ConfigGeneral.dots_in_ident = 0;
676	>	ConfigGeneral.min_nonwildcard = 4;
677	>	ConfigGeneral.min_nonwildcard_simple = 3;
678	>	ConfigGeneral.max_accept = 50;
679	>	ConfigGeneral.anti_nick_flood = 0;
680	>	ConfigGeneral.max_nick_time = 20;
681	>	ConfigGeneral.max_nick_changes = 5;
682	>	ConfigGeneral.anti_spam_exit_message_time = 0;
683	>	ConfigGeneral.ts_warn_delta = 30;
684	>	ConfigGeneral.ts_max_delta = 600;
685	>	ConfigGeneral.warn_no_connect_block = 1;
686	>	ConfigGeneral.stats_e_disabled = 0;
687	>	ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
688	>	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
689	>	ConfigGeneral.stats_o_oper_only = 1;
690	>	ConfigGeneral.stats_m_oper_only = 1;
691	>	ConfigGeneral.stats_P_oper_only = 0;
692	>	ConfigGeneral.stats_u_oper_only = 0;
693	>	ConfigGeneral.caller_id_wait = 60;
694	>	ConfigGeneral.opers_bypass_callerid = 0;
695	>	ConfigGeneral.pace_wait = 10;
696	>	ConfigGeneral.pace_wait_simple = 1;
697	>	ConfigGeneral.short_motd = 0;
698	>	ConfigGeneral.ping_cookie = 0;
699	>	ConfigGeneral.no_oper_flood = 0;
700	>	ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
701	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
702	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
703	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
704	>	ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
705	>	ConfigGeneral.throttle_count = 1;
706	>	ConfigGeneral.throttle_time = 1;
707		}
708
709		static void
710		validate_conf(void)
711		{
712	<	if (ConfigFileEntry.ts_warn_delta < TS_WARN_DELTA_MIN)
713	<	ConfigFileEntry.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
1415	<
1416	<	if (ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
1417	<	ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
1418	<
1419	<	if (ServerInfo.network_name == NULL)
1420	<	ServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
712	>	if (EmptyString(ConfigServerInfo.network_name))
713	>	ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
714
715	<	if (ServerInfo.network_desc == NULL)
716	<	ServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
1424	<
1425	<	if (ConfigFileEntry.service_name == NULL)
1426	<	ConfigFileEntry.service_name = xstrdup(SERVICE_NAME_DEFAULT);
1427	<
1428	<	ConfigFileEntry.max_watch = IRCD_MAX(ConfigFileEntry.max_watch, WATCHSIZE_MIN);
715	>	if (EmptyString(ConfigServerInfo.network_desc))
716	>	ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
717		}
718
719	<	/* read_conf()
719	>	/* read_conf()
720		*
721		* inputs       - file descriptor pointing to config file to use
722		* output       - None
#	Line 1439 | Line 727 | read_conf(FILE *file)
727		{
728		lineno = 0;
729
730	<	set_default_conf(); /* Set default values prior to conf parsing */
730	>	set_default_conf();  /* Set default values prior to conf parsing */
731		conf_parser_ctx.pass = 1;
732	<	yyparse();          /* pick up the classes first */
732	>	yyparse();  /* Pick up the classes first */
733
734		rewind(file);
735
736		conf_parser_ctx.pass = 2;
737	<	yyparse();          /* Load the values from the conf */
738	<	validate_conf();    /* Check to make sure some values are still okay. */
739	<	/* Some global values are also loaded here. */
740	<	class_delete_marked();      /* Make sure classes are valid */
737	>	yyparse();  /* Load the values from the conf */
738	>	validate_conf();  /* Check to make sure some values are still okay. */
739	>	/* Some global values are also loaded here. */
740	>	whowas_trim();  /* Attempt to trim whowas list if necessary */
741	>	class_delete_marked();  /* Delete unused classes that are marked for deletion */
742	>	}
743	>
744	>	/* conf_rehash()
745	>	*
746	>	* Actual REHASH service routine. Called with sig == 0 if it has been called
747	>	* as a result of an operator issuing this command, else assume it has been
748	>	* called as a result of the server receiving a HUP signal.
749	>	*/
750	>	void
751	>	conf_rehash(int sig)
752	>	{
753	>	if (sig)
754	>	{
755	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
756	>	"Got signal SIGHUP, reloading configuration file(s)");
757	>	ilog(LOG_TYPE_IRCD, "Got signal SIGHUP, reloading configuration file(s)");
758	>	}
759	>
760	>	restart_resolver();
761	>
762	>	/* don't close listeners until we know we can go ahead with the rehash */
763	>
764	>	read_conf_files(0);
765	>
766	>	load_conf_modules();
767	>	check_conf_klines();
768		}
769
770		/* lookup_confhost()
#	Line 1457 | Line 772 | read_conf(FILE *file)
772		* start DNS lookups of all hostnames in the conf
773		* line and convert an IP addresses in a.b.c.d number for to IP#s.
774		*/
775	<	static void
775	>	void
776		lookup_confhost(struct MaskItem *conf)
777		{
778		struct addrinfo hints, *res;
779
780	<	if (has_wildcards(conf->host))
781	<	{
1467	<	ilog(LOG_TYPE_IRCD, "Host/server name error: (%s) (%s)",
1468	<	conf->host, conf->name);
1469	<	return;
1470	<	}
1471	<
1472	<	/* Do name lookup now on hostnames given and store the
780	>	/*
781	>	* Do name lookup now on hostnames given and store the
782		* ip numbers in conf structure.
783		*/
784		memset(&hints, 0, sizeof(hints));
#	Line 1486 | Line 795 | lookup_confhost(struct MaskItem *conf)
795		return;
796		}
797
798	<	assert(res != NULL);
798	>	assert(res);
799
800		memcpy(&conf->addr, res->ai_addr, res->ai_addrlen);
801		conf->addr.ss_len = res->ai_addrlen;
#	Line 1505 | Line 814 | lookup_confhost(struct MaskItem *conf)
814		int
815		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
816		{
817	<	struct ip_entry *ip_found;
818	<	struct MaskItem *conf = find_dline_conf(addr, aftype);
817	>	struct ip_entry *ip_found = NULL;
818	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
819
820	<	/* DLINE exempt also gets you out of static limits/pacing... */
1512	<	if (conf && (conf->type == CONF_EXEMPT))
1513	<	return 0;
1514	<
1515	<	if (conf != NULL)
1516	<	return BANNED_CLIENT;
1517	<
1518	<	ip_found = find_or_add_ip(addr);
1519	<
1520	<	if ((CurrentTime - ip_found->last_attempt) <
1521	<	ConfigFileEntry.throttle_time)
820	>	if (conf)
821		{
822	<	ip_found->last_attempt = CurrentTime;
823	<	return TOO_FAST;
822	>	/* DLINE exempt also gets you out of static limits/pacing... */
823	>	if (conf->type == CONF_EXEMPT)
824	>	return 0;
825	>	return BANNED_CLIENT;
826		}
827
828	<	ip_found->last_attempt = CurrentTime;
1528	<	return 0;
1529	<	}
1530	<
1531	<	static struct MaskItem *
1532	<	find_regexp_kline(const char *uhi[])
1533	<	{
1534	<	#ifdef HAVE_LIBPCRE
1535	<	const dlink_node *ptr = NULL;
828	>	ip_found = ipcache_find_or_add_address(addr);
829
830	<	DLINK_FOREACH(ptr, rkconf_items.head)
830	>	if ((CurrentTime - ip_found->last_attempt) < ConfigGeneral.throttle_time)
831		{
832	<	struct MaskItem *aptr = ptr->data;
832	>	if (ip_found->connection_count >= ConfigGeneral.throttle_count)
833	>	return TOO_FAST;
834
835	<	assert(aptr->regexuser);
1542	<	assert(aptr->regexhost);
1543	<
1544	<	if (!ircd_pcre_exec(aptr->regexuser, uhi[0]) &&
1545	<	(!ircd_pcre_exec(aptr->regexhost, uhi[1]) ||
1546	<	!ircd_pcre_exec(aptr->regexhost, uhi[2])))
1547	<	return aptr;
835	>	++ip_found->connection_count;
836		}
837	<	#endif
838	<	return NULL;
1551	<	}
1552	<
1553	<	/* find_kill()
1554	<	*
1555	<	* inputs       - pointer to client structure
1556	<	* output       - pointer to struct MaskItem if found
1557	<	* side effects - See if this user is klined already,
1558	<	*                and if so, return struct MaskItem pointer
1559	<	*/
1560	<	struct MaskItem *
1561	<	find_kill(struct Client *client_p)
1562	<	{
1563	<	struct MaskItem *conf = NULL;
1564	<	const char *uhi[3];
1565	<
1566	<	uhi[0] = client_p->username;
1567	<	uhi[1] = client_p->host;
1568	<	uhi[2] = client_p->sockhost;
1569	<
1570	<	assert(client_p != NULL);
1571	<
1572	<	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
1573	<	CONF_KLINE, client_p->localClient->aftype,
1574	<	client_p->username, NULL, 1);
1575	<	if (conf == NULL)
1576	<	conf = find_regexp_kline(uhi);
1577	<
1578	<	return conf;
1579	<	}
1580	<
1581	<	struct MaskItem *
1582	<	find_gline(struct Client *client_p)
1583	<	{
1584	<	struct MaskItem *conf;
1585	<
1586	<	assert(client_p != NULL);
837	>	else
838	>	ip_found->connection_count = 1;
839
840	<	conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
841	<	CONF_GLINE, client_p->localClient->aftype,
1590	<	client_p->username, NULL, 1);
1591	<	return conf;
840	>	ip_found->last_attempt = CurrentTime;
841	>	return 0;
842		}
843
844		/* cleanup_tklines()
#	Line 1599 | Line 849 | find_gline(struct Client *client_p)
849		*                This is an event started off in ircd.c
850		*/
851		void
852	<	cleanup_tklines(void *notused)
852	>	cleanup_tklines(void *unused)
853		{
854		hostmask_expire_temporary();
855	<	expire_tklines(&xconf_items);
856	<	expire_tklines(&nresv_items);
1607	<	expire_tklines(&resv_channel_list);
1608	<	}
1609	<
1610	<	/* expire_tklines()
1611	<	*
1612	<	* inputs       - tkline list pointer
1613	<	* output       - NONE
1614	<	* side effects - expire tklines
1615	<	*/
1616	<	static void
1617	<	expire_tklines(dlink_list *tklist)
1618	<	{
1619	<	dlink_node *ptr;
1620	<	dlink_node *next_ptr;
1621	<	struct MaskItem *conf;
1622	<
1623	<	DLINK_FOREACH_SAFE(ptr, next_ptr, tklist->head)
1624	<	{
1625	<	conf = ptr->data;
1626	<
1627	<	if (!conf->hold || conf->hold > CurrentTime)
1628	<	continue;
1629	<
1630	<	if (conf->type == CONF_XLINE)
1631	<	{
1632	<	if (ConfigFileEntry.tkline_expire_notices)
1633	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1634	<	"Temporary X-line for [%s] expired", conf->name);
1635	<	conf_free(conf);
1636	<	}
1637	<	else if (conf->type == CONF_NRESV)
1638	<	{
1639	<	if (ConfigFileEntry.tkline_expire_notices)
1640	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1641	<	"Temporary RESV for [%s] expired", conf->name);
1642	<	conf_free(conf);
1643	<	}
1644	<	else if (conf->type == CONF_CRESV)
1645	<	{
1646	<	if (ConfigFileEntry.tkline_expire_notices)
1647	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1648	<	"Temporary RESV for [%s] expired", conf->name);
1649	<	delete_channel_resv(conf);
1650	<	}
1651	<	}
855	>	gecos_expire();
856	>	resv_expire();
857		}
858
859		/* oper_privs_as_string()
#	Line 1657 | Line 862 | expire_tklines(dlink_list *tklist)
862		* output        - pointer to static string showing oper privs
863		* side effects  - return as string, the oper privs as derived from port
864		*/
865	<	static const struct oper_privs
865	>	static const struct oper_flags
866		{
867		const unsigned int flag;
868		const unsigned char c;
869	<	} flag_list[] = {
870	<	{ OPER_FLAG_ADMIN,       'A' },
871	<	{ OPER_FLAG_REMOTEBAN,   'B' },
872	<	{ OPER_FLAG_DIE,         'D' },
873	<	{ OPER_FLAG_GLINE,       'G' },
874	<	{ OPER_FLAG_REHASH,      'H' },
875	<	{ OPER_FLAG_K,           'K' },
876	<	{ OPER_FLAG_OPERWALL,    'L' },
877	<	{ OPER_FLAG_N,           'N' },
878	<	{ OPER_FLAG_GLOBAL_KILL, 'O' },
879	<	{ OPER_FLAG_REMOTE,      'R' },
880	<	{ OPER_FLAG_OPER_SPY,    'S' },
881	<	{ OPER_FLAG_UNKLINE,     'U' },
882	<	{ OPER_FLAG_X,           'X' },
869	>	} flag_table[] = {
870	>	{ OPER_FLAG_ADMIN,          'A' },
871	>	{ OPER_FLAG_CLOSE,          'B' },
872	>	{ OPER_FLAG_CONNECT,        'C' },
873	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
874	>	{ OPER_FLAG_DIE,            'E' },
875	>	{ OPER_FLAG_DLINE,          'F' },
876	>	{ OPER_FLAG_GLOBOPS,        'G' },
877	>	{ OPER_FLAG_JOIN_RESV,      'H' },
878	>	{ OPER_FLAG_KILL,           'I' },
879	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
880	>	{ OPER_FLAG_KLINE,          'K' },
881	>	{ OPER_FLAG_LOCOPS,         'L' },
882	>	{ OPER_FLAG_MODULE,         'M' },
883	>	{ OPER_FLAG_NICK_RESV,      'N' },
884	>	{ OPER_FLAG_OPME,           'O' },
885	>	{ OPER_FLAG_REHASH,         'P' },
886	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
887	>	{ OPER_FLAG_RESTART,        'R' },
888	>	{ OPER_FLAG_RESV,           'S' },
889	>	{ OPER_FLAG_SET,            'T' },
890	>	{ OPER_FLAG_SQUIT,          'U' },
891	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
892	>	{ OPER_FLAG_UNDLINE,        'W' },
893	>	{ OPER_FLAG_UNKLINE,        'X' },
894	>	{ OPER_FLAG_UNRESV,         'Y' },
895	>	{ OPER_FLAG_UNXLINE,        'Z' },
896	>	{ OPER_FLAG_WALLOPS,        'a' },
897	>	{ OPER_FLAG_XLINE,          'b' },
898		{ 0, '\0' }
899		};
900
901	<	char *
902	<	oper_privs_as_string(const unsigned int port)
901	>	const char *
902	>	oper_privs_as_string(const unsigned int flags)
903		{
904	<	static char privs_out[16];
905	<	char *privs_ptr = privs_out;
1686	<	const struct oper_privs *opriv = flag_list;
904	>	static char buf[sizeof(flag_table) / sizeof(struct oper_flags)];
905	>	char *p = buf;
906
907	<	for (; opriv->flag; ++opriv)
908	<	{
909	<	if (port & opriv->flag)
1691	<	*privs_ptr++ = opriv->c;
1692	<	else
1693	<	*privs_ptr++ = ToLower(opriv->c);
1694	<	}
907	>	for (const struct oper_flags *tab = flag_table; tab->flag; ++tab)
908	>	if (flags & tab->flag)
909	>	*p++ = tab->c;
910
911	<	*privs_ptr = '\0';
911	>	if (p == buf)
912	>	*p++ = '0';
913
914	<	return privs_out;
914	>	*p = '\0';
915	>
916	>	return buf;
917		}
918
919		/*
920	<	* Input: A client to find the active oper{} name for.
920	>	* Input: A client to find the active operator {} name for.
921		* Output: The nick!user@host{oper} of the oper.
922		*         "oper" is server name for remote opers
923		* Side effects: None.
#	Line 1707 | Line 925 | oper_privs_as_string(const unsigned int
925		const char *
926		get_oper_name(const struct Client *client_p)
927		{
928	<	dlink_node *cnode = NULL;
929	<	/* +5 for !,@,{,} and null */
930	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
928	>	static char buffer[IRCD_BUFSIZE];
929	>
930	>	if (IsServer(client_p))
931	>	return client_p->name;
932
933		if (MyConnect(client_p))
934		{
935	<	if ((cnode = client_p->localClient->confs.head))
935	>	const dlink_node *const node = client_p->connection->confs.head;
936	>
937	>	if (node)
938		{
939	<	struct MaskItem *conf = cnode->data;
939	>	const struct MaskItem *const conf = node->data;
940
941	<	if (IsConfOperator(conf))
941	>	if (conf->type == CONF_OPER)
942		{
943	<	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
943	>	snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
944		client_p->username, client_p->host, conf->name);
945	<	return buffer;
945	>	return buffer;
946		}
947		}
948
949	<	/* Probably should assert here for now. If there is an oper out there
950	<	* with no oper{} conf attached, it would be good for us to know...
949	>	/*
950	>	* Probably should assert here for now. If there is an oper out there
951	>	* with no operator {} conf attached, it would be good for us to know...
952		*/
953	<	assert(0); /* Oper without oper conf! */
953	>	assert(0);  /* Oper without oper conf! */
954		}
955
956		snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name,
957	<	client_p->username, client_p->host, client_p->servptr->name);
957	>	client_p->username, client_p->host, client_p->servptr->name);
958		return buffer;
959		}
960
1739	–	/* read_conf_files()
1740	–	*
1741	–	* inputs       - cold start YES or NO
1742	–	* output       - none
1743	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1744	–	*/
1745	–	void
1746	–	read_conf_files(int cold)
1747	–	{
1748	–	const char *filename;
1749	–	char chanmodes[32];
1750	–	char chanlimit[32];
1751	–
1752	–	conf_parser_ctx.boot = cold;
1753	–	filename = ConfigFileEntry.configfile;
1754	–
1755	–	/* We need to know the initial filename for the yyerror() to report
1756	–	FIXME: The full path is in conffilenamebuf first time since we
1757	–	dont know anything else
1758	–
1759	–	- Gozem 2002-07-21
1760	–	*/
1761	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1762	–
1763	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1764	–	{
1765	–	if (cold)
1766	–	{
1767	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1768	–	filename, strerror(errno));
1769	–	exit(-1);
1770	–	}
1771	–	else
1772	–	{
1773	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1774	–	"Unable to read configuration file '%s': %s",
1775	–	filename, strerror(errno));
1776	–	return;
1777	–	}
1778	–	}
1779	–
1780	–	if (!cold)
1781	–	clear_out_old_conf();
1782	–
1783	–	read_conf(conf_parser_ctx.conf_file);
1784	–	fclose(conf_parser_ctx.conf_file);
1785	–
1786	–	add_isupport("NETWORK", ServerInfo.network_name, -1);
1787	–	snprintf(chanmodes, sizeof(chanmodes), "beI:%d",
1788	–	ConfigChannel.max_bans);
1789	–	add_isupport("MAXLIST", chanmodes, -1);
1790	–	add_isupport("MAXTARGETS", NULL, ConfigFileEntry.max_targets);
1791	–
1792	–	add_isupport("CHANTYPES", "#", -1);
1793	–
1794	–	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1795	–	ConfigChannel.max_chans_per_user);
1796	–	add_isupport("CHANLIMIT", chanlimit, -1);
1797	–	snprintf(chanmodes, sizeof(chanmodes), "%s",
1798	–	"beI,k,l,imnprstORS");
1799	–	add_isupport("CHANNELLEN", NULL, LOCAL_CHANNELLEN);
1800	–
1801	–	add_isupport("EXCEPTS", "e", -1);
1802	–	add_isupport("INVEX", "I", -1);
1803	–	add_isupport("CHANMODES", chanmodes, -1);
1804	–
1805	–	/*
1806	–	* message_locale may have changed.  rebuild isupport since it relies
1807	–	* on strlen(form_str(RPL_ISUPPORT))
1808	–	*/
1809	–	rebuild_isupport_message_line();
1810	–	}
1811	–
961		/* clear_out_old_conf()
962		*
963		* inputs       - none
#	Line 1818 | Line 967 | read_conf_files(int cold)
967		static void
968		clear_out_old_conf(void)
969		{
970	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1822	<	struct MaskItem *conf;
970	>	dlink_node *node = NULL, *node_next = NULL;
971		dlink_list *free_items [] = {
972	<	&server_items,   &oconf_items,
1825	<	&uconf_items,   &xconf_items, &rxconf_items, &rkconf_items,
1826	<	&nresv_items, &cluster_items,  &service_items, NULL
972	>	&connect_items, &operator_items, NULL
973		};
974
975		dlink_list ** iterator = free_items; /* C is dumb */
#	Line 1831 | Line 977 | clear_out_old_conf(void)
977		/* We only need to free anything allocated by yyparse() here.
978		* Resetting structs, etc, is taken care of by set_default_conf().
979		*/
980	<
981	<	for (; *iterator != NULL; iterator++)
980	>
981	>	for (; *iterator; iterator++)
982		{
983	<	DLINK_FOREACH_SAFE(ptr, next_ptr, (*iterator)->head)
983	>	DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
984		{
985	<	conf = ptr->data;
985	>	struct MaskItem *conf = node->data;
986
987	<	dlinkDelete(&conf->node, map_to_list(conf->type));
987	>	conf->active = 0;
988	>	dlinkDelete(&conf->node, *iterator);
989
990	<	/* XXX This is less than pretty */
1844	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1845	<	{
1846	<	if (!conf->ref_count)
1847	<	conf_free(conf);
1848	<	}
1849	<	else if (conf->type == CONF_XLINE  ||
1850	<	conf->type == CONF_RXLINE ||
1851	<	conf->type == CONF_RKLINE)
1852	<	{
1853	<	if (!conf->hold)
1854	<	conf_free(conf);
1855	<	}
1856	<	else
990	>	if (!conf->ref_count)
991		conf_free(conf);
992		}
993		}
994
995		/*
996	<	* don't delete the class table, rather mark all entries
997	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
996	>	* Don't delete the class table, rather mark all entries for deletion.
997	>	* The table is cleaned up by class_delete_marked. - avalon
998		*/
999		class_mark_for_deletion();
1000
1001		clear_out_address_conf();
1002
1003	<	/* clean out module paths */
1004	<	mod_clear_paths();
1003	>	modules_conf_clear();  /* Clear modules {} items */
1004	>
1005	>	motd_clear();  /* Clear motd {} items and re-cache default motd */
1006	>
1007	>	cluster_clear();  /* Clear cluster {} items */
1008
1009	<	/* clean out ServerInfo */
1010	<	MyFree(ServerInfo.description);
1011	<	ServerInfo.description = NULL;
1012	<	MyFree(ServerInfo.network_name);
1013	<	ServerInfo.network_name = NULL;
1014	<	MyFree(ServerInfo.network_desc);
1015	<	ServerInfo.network_desc = NULL;
1016	<	MyFree(ConfigFileEntry.egdpool_path);
1017	<	ConfigFileEntry.egdpool_path = NULL;
1018	<	#ifdef HAVE_LIBCRYPTO
1019	<	if (ServerInfo.rsa_private_key != NULL)
1020	<	{
1021	<	RSA_free(ServerInfo.rsa_private_key);
1022	<	ServerInfo.rsa_private_key = NULL;
1023	<	}
1887	<
1888	<	MyFree(ServerInfo.rsa_private_key_file);
1889	<	ServerInfo.rsa_private_key_file = NULL;
1890	<
1891	<	if (ServerInfo.server_ctx)
1892	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|
1893	<	SSL_OP_NO_SSLv3|
1894	<	SSL_OP_NO_TLSv1);
1895	<	if (ServerInfo.client_ctx)
1896	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|
1897	<	SSL_OP_NO_SSLv3|
1898	<	SSL_OP_NO_TLSv1);
1009	>	gecos_clear();  /* Clear gecos {} items */
1010	>
1011	>	resv_clear();  /* Clear resv {} items */
1012	>
1013	>	service_clear();  /* Clear service {} items */
1014	>
1015	>	shared_clear();  /* Clear shared {} items */
1016	>
1017	>	pseudo_clear();  /* Clear pseudo {} items */
1018	>
1019	>	#ifdef HAVE_LIBGEOIP
1020	>	GeoIP_delete(GeoIPv4_ctx);
1021	>	GeoIPv4_ctx = NULL;
1022	>	GeoIP_delete(GeoIPv6_ctx);
1023	>	GeoIPv6_ctx = NULL;
1024		#endif
1025
1026	<	/* clean out old resvs from the conf */
1027	<	clear_conf_resv();
1026	>	/* Clean out ConfigServerInfo */
1027	>	xfree(ConfigServerInfo.description);
1028	>	ConfigServerInfo.description = NULL;
1029	>	xfree(ConfigServerInfo.network_name);
1030	>	ConfigServerInfo.network_name = NULL;
1031	>	xfree(ConfigServerInfo.network_desc);
1032	>	ConfigServerInfo.network_desc = NULL;
1033	>	xfree(ConfigServerInfo.libgeoip_ipv6_database_file);
1034	>	ConfigServerInfo.libgeoip_ipv6_database_file = NULL;
1035	>	xfree(ConfigServerInfo.libgeoip_ipv4_database_file);
1036	>	ConfigServerInfo.libgeoip_ipv4_database_file = NULL;
1037	>	xfree(ConfigServerInfo.rsa_private_key_file);
1038	>	ConfigServerInfo.rsa_private_key_file = NULL;
1039	>	xfree(ConfigServerInfo.ssl_certificate_file);
1040	>	ConfigServerInfo.ssl_certificate_file = NULL;
1041	>	xfree(ConfigServerInfo.ssl_dh_param_file);
1042	>	ConfigServerInfo.ssl_dh_param_file = NULL;
1043	>	xfree(ConfigServerInfo.ssl_dh_elliptic_curve);
1044	>	ConfigServerInfo.ssl_dh_elliptic_curve = NULL;
1045	>	xfree(ConfigServerInfo.ssl_cipher_list);
1046	>	ConfigServerInfo.ssl_cipher_list = NULL;
1047	>	xfree(ConfigServerInfo.ssl_message_digest_algorithm);
1048	>	ConfigServerInfo.ssl_message_digest_algorithm = NULL;
1049	>
1050	>	/* Clean out ConfigAdminInfo */
1051	>	xfree(ConfigAdminInfo.name);
1052	>	ConfigAdminInfo.name = NULL;
1053	>	xfree(ConfigAdminInfo.email);
1054	>	ConfigAdminInfo.email = NULL;
1055	>	xfree(ConfigAdminInfo.description);
1056	>	ConfigAdminInfo.description = NULL;
1057
1058	<	/* clean out AdminInfo */
1059	<	MyFree(AdminInfo.name);
1906	<	AdminInfo.name = NULL;
1907	<	MyFree(AdminInfo.email);
1908	<	AdminInfo.email = NULL;
1909	<	MyFree(AdminInfo.description);
1910	<	AdminInfo.description = NULL;
1911	<
1912	<	/* clean out listeners */
1913	<	close_listeners();
1914	<
1915	<	/* clean out general */
1916	<	MyFree(ConfigFileEntry.service_name);
1917	<	ConfigFileEntry.service_name = NULL;
1058	>	xfree(ConfigServerHide.flatten_links_file);
1059	>	ConfigServerHide.flatten_links_file = NULL;
1060
1061	<	delete_isupport("INVEX");
1062	<	delete_isupport("EXCEPTS");
1061	>	/* Clean out listeners */
1062	>	listener_close_marked();
1063		}
1064
1065	<	/* conf_add_class_to_conf()
1065	>	static void
1066	>	conf_handle_tls(int cold)
1067	>	{
1068	>	if (!tls_new_cred())
1069	>	{
1070	>	if (cold)
1071	>	{
1072	>	ilog(LOG_TYPE_IRCD, "Error while initializing TLS");
1073	>	exit(EXIT_FAILURE);
1074	>	}
1075	>	else
1076	>	{
1077	>	/* Failed to load new settings/certs, old ones remain active */
1078	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
1079	>	"Error reloading TLS settings, check the ircd log"); // report_crypto_errors logs this
1080	>	}
1081	>	}
1082	>	}
1083	>
1084	>	/* read_conf_files()
1085		*
1086	<	* inputs       - pointer to config item
1087	<	* output       - NONE
1088	<	* side effects - Add a class pointer to a conf
1086	>	* inputs       - cold start YES or NO
1087	>	* output       - none
1088	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1089		*/
1090		void
1091	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1091	>	read_conf_files(int cold)
1092		{
1093	<	struct ClassItem *class = NULL;
1093	>	const char *filename = NULL;
1094	>	char chanmodes[IRCD_BUFSIZE] = "";
1095	>	char chanlimit[IRCD_BUFSIZE] = "";
1096
1097	<	if (class_name == NULL)
1098	<	{
1936	<	conf->class = class_default;
1097	>	conf_parser_ctx.boot = cold;
1098	>	filename = ConfigGeneral.configfile;
1099
1100	<	if (conf->type == CONF_CLIENT)
1101	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1102	<	"Warning *** Defaulting to default class for %s@%s",
1103	<	conf->user, conf->host);
1104	<	else
1105	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1106	<	"Warning *** Defaulting to default class for %s",
1945	<	conf->name);
1946	<	}
1947	<	else
1948	<	conf->class = class_find(class_name, 1);
1100	>	/* We need to know the initial filename for the yyerror() to report
1101	>	FIXME: The full path is in conffilenamebuf first time since we
1102	>	don't know anything else
1103	>
1104	>	- Gozem 2002-07-21
1105	>	*/
1106	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1107
1108	<	if (conf->class == NULL)
1108	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1109		{
1110	<	if (conf->type == CONF_CLIENT)
1111	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1112	<	"Warning *** Defaulting to default class for %s@%s",
1113	<	conf->user, conf->host);
1110	>	if (cold)
1111	>	{
1112	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1113	>	filename, strerror(errno));
1114	>	exit(EXIT_FAILURE);
1115	>	}
1116		else
1117	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1118	<	"Warning *** Defaulting to default class for %s",
1119	<	conf->name);
1120	<	conf->class = class_default;
1117	>	{
1118	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1119	>	"Unable to read configuration file '%s': %s",
1120	>	filename, strerror(errno));
1121	>	return;
1122	>	}
1123		}
1124	+
1125	+	if (!cold)
1126	+	clear_out_old_conf();
1127	+
1128	+	read_conf(conf_parser_ctx.conf_file);
1129	+	fclose(conf_parser_ctx.conf_file);
1130	+
1131	+	log_reopen_all();
1132	+	conf_handle_tls(cold);
1133	+
1134	+	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1135	+	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1136	+
1137	+	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1138	+	isupport_add("MAXLIST", chanmodes, -1);
1139	+	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1140	+	isupport_add("CHANTYPES", "#", -1);
1141	+
1142	+	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1143	+	ConfigChannel.max_channels);
1144	+	isupport_add("CHANLIMIT", chanlimit, -1);
1145	+	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1146	+	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1147	+	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1148	+	isupport_add("CHANMODES", chanmodes, -1);
1149		}
1150
1151	<	/* conf_add_server()
1151	>	/* conf_add_class_to_conf()
1152		*
1153		* inputs       - pointer to config item
1967	–	*              - pointer to link count already on this conf
1154		* output       - NONE
1155	<	* side effects - Add a connect block
1155	>	* side effects - Add a class pointer to a conf
1156		*/
1157	<	int
1158	<	conf_add_server(struct MaskItem *conf, const char *class_name)
1157	>	void
1158	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1159		{
1160	<	conf_add_class_to_conf(conf, class_name);
1975	<
1976	<	if (EmptyString(conf->host) || EmptyString(conf->name))
1160	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1161		{
1162	<	sendto_realops_flags(UMODE_ALL, L_ALL,  SEND_NOTICE,
1979	<	"Bad connect block");
1980	<	ilog(LOG_TYPE_IRCD, "Bad connect block");
1981	<	return -1;
1982	<	}
1162	>	conf->class = class_default;
1163
1164	<	if (EmptyString(conf->passwd))
1165	<	{
1166	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1167	<	"Bad connect block, name %s",
1168	<	conf->name);
1169	<	ilog(LOG_TYPE_IRCD, "Bad connect block, host %s", conf->name);
1170	<	return -1;
1164	>	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1165	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1166	>	"Warning *** Defaulting to default class for %s@%s",
1167	>	conf->user, conf->host);
1168	>	else
1169	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1170	>	"Warning *** Defaulting to default class for %s",
1171	>	conf->name);
1172		}
1992	–
1993	–	lookup_confhost(conf);
1994	–
1995	–	return 0;
1173		}
1174
1175		/* yyerror()
#	Line 2004 | Line 1181 | conf_add_server(struct MaskItem *conf, c
1181		void
1182		yyerror(const char *msg)
1183		{
2007	–	char newlinebuf[IRCD_BUFSIZE];
2008	–
1184		if (conf_parser_ctx.pass != 1)
1185		return;
1186
1187	<	strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1188	<	sendto_realops_flags(UMODE_ALL, L_ALL,  SEND_NOTICE,
1187	>	char *p = stripws(linebuf);
1188	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1189	>	"\"%s\", line %u: %s: %s",
1190	>	conffilebuf, lineno + 1, msg, p);
1191	>	ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1192	>	conffilebuf, lineno + 1, msg, p);
1193	>	}
1194	>
1195	>	void
1196	>	conf_error_report(const char *msg)
1197	>	{
1198	>	char *p = stripws(linebuf);
1199	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1200		"\"%s\", line %u: %s: %s",
1201	<	conffilebuf, lineno + 1, msg, newlinebuf);
1201	>	conffilebuf, lineno + 1, msg, linebuf);
1202		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
1203	<	conffilebuf, lineno + 1, msg, newlinebuf);
1203	>	conffilebuf, lineno + 1, msg, linebuf);
1204		}
1205
1206		/*
1207		* valid_tkline()
1208	<	*
1208	>	*
1209		* inputs       - pointer to ascii string to check
1210		*              - whether the specified time is in seconds or minutes
1211		* output       - -1 not enough parameters
#	Line 2027 | Line 1213 | yyerror(const char *msg)
1213		* side effects - none
1214		* Originally written by Dianora (Diane, db@db.net)
1215		*/
1216	<	time_t
1217	<	valid_tkline(const char *p, int minutes)
1216	>	uintmax_t
1217	>	valid_tkline(const char *data, const int minutes)
1218		{
1219	<	time_t result = 0;
1219	>	const unsigned char *p = (const unsigned char *)data;
1220	>	unsigned char tmpch = '\0';
1221	>	uintmax_t result = 0;
1222
1223	<	for (; *p; ++p)
1223	>	while ((tmpch = *p++))
1224		{
1225	<	if (!IsDigit(*p))
1225	>	if (!IsDigit(tmpch))
1226		return 0;
1227
1228		result *= 10;
1229	<	result += ((*p) & 0xF);
1229	>	result += (tmpch & 0xF);
1230		}
1231
1232		/*
1233	<	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1234	<	* i.e. they specifically use 0, I am going to return 1 instead
1235	<	* as a return value of non-zero is used to flag it as a temporary kline
1233	>	* In the degenerate case where oper does a /quote kline 0 user@host :reason
1234	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1235	>	* value of non-zero is used to flag it as a temporary kline
1236		*/
1237		if (result == 0)
1238		result = 1;
1239
1240	<	/*
1240	>	/*
1241		* If the incoming time is in seconds convert it to minutes for the purpose
1242		* of this calculation
1243		*/
1244		if (!minutes)
1245	<	result = result / (time_t)60;
1245	>	result = result / 60;
1246
1247		if (result > MAX_TDKLINE_TIME)
1248		result = MAX_TDKLINE_TIME;
1249
1250	<	result = result * (time_t)60;  /* turn it into seconds */
1250	>	result = result * 60;  /* Turn it into seconds */
1251
1252		return result;
1253		}
1254
1255	+	/* valid_wild_card_simple()
1256	+	*
1257	+	* inputs       - data to check for sufficient non-wildcard characters
1258	+	* outputs      - 1 if valid, else 0
1259	+	* side effects - none
1260	+	*/
1261	+	int
1262	+	valid_wild_card_simple(const char *data)
1263	+	{
1264	+	const unsigned char *p = (const unsigned char *)data;
1265	+	unsigned char tmpch = '\0';
1266	+	unsigned int nonwild = 0, wild = 0;
1267	+
1268	+	while ((tmpch = *p++))
1269	+	{
1270	+	if (tmpch == '\\' && *p)
1271	+	{
1272	+	++p;
1273	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1274	+	return 1;
1275	+	}
1276	+	else if (!IsMWildChar(tmpch))
1277	+	{
1278	+	if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1279	+	return 1;
1280	+	}
1281	+	else
1282	+	++wild;
1283	+	}
1284	+
1285	+	return !wild;
1286	+	}
1287	+
1288		/* valid_wild_card()
1289		*
1290		* input        - pointer to client
#	Line 2073 | Line 1294 | valid_tkline(const char *p, int minutes)
1294		* side effects - NOTICE is given to source_p if warn is 1
1295		*/
1296		int
1297	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1297	>	valid_wild_card(int count, ...)
1298		{
1299	<	char *p;
1300	<	char tmpch;
2080	<	int nonwild = 0;
1299	>	unsigned char tmpch = '\0';
1300	>	unsigned int nonwild = 0;
1301		va_list args;
1302
1303		/*
#	Line 2096 | Line 1316 | valid_wild_card(struct Client *source_p,
1316
1317		while (count--)
1318		{
1319	<	p = va_arg(args, char *);
1319	>	const unsigned char *p = va_arg(args, const unsigned char *);
1320		if (p == NULL)
1321		continue;
1322
#	Line 2108 | Line 1328 | valid_wild_card(struct Client *source_p,
1328		* If we find enough non-wild characters, we can
1329		* break - no point in searching further.
1330		*/
1331	<	if (++nonwild >= ConfigFileEntry.min_nonwildcard)
1331	>	if (++nonwild >= ConfigGeneral.min_nonwildcard)
1332	>	{
1333	>	va_end(args);
1334		return 1;
1335	+	}
1336		}
1337		}
1338		}
1339
1340	<	if (warn)
1341	<	sendto_one(source_p, ":%s NOTICE %s :Please include at least %d non-wildcard characters with the mask",
1342	<	me.name, source_p->name, ConfigFileEntry.min_nonwildcard);
1340	>	va_end(args);
1341	>	return 0;
1342	>	}
1343	>
1344	>	/* find_user_host()
1345	>	*
1346	>	* inputs       - pointer to client placing kline
1347	>	*              - pointer to user_host_or_nick
1348	>	*              - pointer to user buffer
1349	>	*              - pointer to host buffer
1350	>	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1351	>	* side effects -
1352	>	*/
1353	>	static int
1354	>	find_user_host(struct Client *source_p, char *user_host_or_nick,
1355	>	char *luser, char *lhost)
1356	>	{
1357	>	struct Client *target_p = NULL;
1358	>	char *hostp = NULL;
1359	>
1360	>	if (lhost == NULL)
1361	>	{
1362	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1363	>	return 1;
1364	>	}
1365	>
1366	>	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1367	>	{
1368	>	/* Explicit user@host mask given */
1369	>	if (hostp)                            /* I'm a little user@host */
1370	>	{
1371	>	*(hostp++) = '\0';                       /* short and squat */
1372	>
1373	>	if (*user_host_or_nick)
1374	>	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1375	>	else
1376	>	strcpy(luser, "*");
1377	>
1378	>	if (*hostp)
1379	>	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1380	>	else
1381	>	strcpy(lhost, "*");
1382	>	}
1383	>	else
1384	>	{
1385	>	luser[0] = '*';             /* no @ found, assume its *@somehost */
1386	>	luser[1] = '\0';
1387	>	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1388	>	}
1389	>
1390	>	return 1;
1391	>	}
1392	>	else
1393	>	{
1394	>	/* Try to find user@host mask from nick */
1395	>	/* Okay to use source_p as the first param, because source_p == client_p */
1396	>	if ((target_p =
1397	>	find_chasing(source_p, user_host_or_nick)) == NULL)
1398	>	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1399	>
1400	>	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1401	>	{
1402	>	if (IsClient(source_p))
1403	>	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1404	>	return 0;
1405	>	}
1406	>
1407	>	/*
1408	>	* Turn the "user" bit into "*user", blow away '~'
1409	>	* if found in original user name (non-idented)
1410	>	*/
1411	>	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1412	>
1413	>	if (target_p->username[0] == '~')
1414	>	luser[0] = '*';
1415	>
1416	>	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1417	>	return 1;
1418	>	}
1419	>
1420		return 0;
1421		}
1422
#	Line 2130 | Line 1430 | valid_wild_card(struct Client *source_p,
1430		*              - parse_flags bit map of things to test
1431		*              - pointer to user or string to parse into
1432		*              - pointer to host or NULL to parse into if non NULL
1433	<	*              - pointer to optional tkline time or NULL
1433	>	*              - pointer to optional tkline time or NULL
1434		*              - pointer to target_server to parse into if non NULL
1435		*              - pointer to reason to parse into
1436		*
1437	<	* output       - 1 if valid, -1 if not valid
1437	>	* output       - 1 if valid, 0 if not valid
1438		* side effects - A generalised k/d/x etc. line parser,
1439		*               "ALINE [time] user@host|string [ON] target :reason"
1440		*                will parse returning a parsed user, host if
#	Line 2152 | Line 1452 | valid_wild_card(struct Client *source_p,
1452		*/
1453		int
1454		parse_aline(const char *cmd, struct Client *source_p,
1455	<	int parc, char **parv,
1456	<	int parse_flags, char **up_p, char **h_p, time_t *tkline_time,
1457	<	char **target_server, char **reason)
1455	>	int parc, char **parv,
1456	>	char **up_p, char **h_p, uintmax_t *tkline_time,
1457	>	char **target_server, char **reason)
1458		{
1459	<	int found_tkline_time=0;
1460	<	static char def_reason[] = "No Reason";
1459	>	uintmax_t found_tkline_time=0;
1460	>	static char default_reason[] = CONF_NOREASON;
1461		static char user[USERLEN*4+1];
1462		static char host[HOSTLEN*4+1];
1463
#	Line 2166 | Line 1466 | parse_aline(const char *cmd, struct Clie
1466
1467		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1468
1469	<	if (found_tkline_time != 0)
1469	>	if (found_tkline_time)
1470		{
1471		parv++;
1472		parc--;
1473
1474	<	if (tkline_time != NULL)
1474	>	if (tkline_time)
1475		*tkline_time = found_tkline_time;
1476		else
1477		{
1478	<	sendto_one(source_p, ":%s NOTICE %s :temp_line not supported by %s",
1479	<	me.name, source_p->name, cmd);
2180	<	return -1;
1478	>	sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1479	>	return 0;
1480		}
1481		}
1482
1483		if (parc == 0)
1484		{
1485	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1486	<	me.name, source_p->name, cmd);
2188	<	return -1;
1485	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1486	>	return 0;
1487		}
1488
1489		if (h_p == NULL)
1490		*up_p = *parv;
1491		else
1492		{
1493	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1494	<	return -1;
1493	>	if (find_user_host(source_p, *parv, user, host) == 0)
1494	>	return 0;
1495
1496		*up_p = user;
1497		*h_p = host;
1498		}
1499	<
1499	>
1500		parc--;
1501		parv++;
1502
1503	<	if (parc != 0)
1503	>	if (parc)
1504		{
1505		if (irccmp(*parv, "ON") == 0)
1506		{
1507		parc--;
1508		parv++;
1509
2212	–	if (target_server == NULL)
2213	–	{
2214	–	sendto_one(source_p, ":%s NOTICE %s :ON server not supported by %s",
2215	–	me.name, source_p->name, cmd);
2216	–	return -1;
2217	–	}
2218	–
1510		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1511		{
1512	<	sendto_one(source_p, form_str(ERR_NOPRIVS),
1513	<	me.name, source_p->name, "remoteban");
2223	<	return -1;
1512	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1513	>	return 0;
1514		}
1515
1516		if (parc == 0 || EmptyString(*parv))
1517		{
1518	<	sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
1519	<	me.name, source_p->name, cmd);
2230	<	return -1;
1518	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1519	>	return 0;
1520		}
1521
1522		*target_server = *parv;
#	Line 2239 | Line 1528 | parse_aline(const char *cmd, struct Clie
1528		/* Make sure target_server *is* NULL if no ON server found
1529		* caller probably NULL'd it first, but no harm to do it again -db
1530		*/
1531	<	if (target_server != NULL)
1532	<	*target_server = NULL;
1531	>	if (target_server)
1532	>	*target_server = NULL;
1533		}
1534		}
1535
1536	<	if (h_p != NULL)
1536	>	if (reason)
1537		{
1538	<	if (strchr(user, '!') != NULL)
2250	<	{
2251	<	sendto_one(source_p, ":%s NOTICE %s :Invalid character '!' in kline",
2252	<	me.name, source_p->name);
2253	<	return -1;
2254	<	}
2255	<
2256	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
2257	<	return -1;
2258	<	}
2259	<	else
2260	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
2261	<	return -1;
2262	<
2263	<	if (reason != NULL)
2264	<	{
2265	<	if (parc != 0 && !EmptyString(*parv))
2266	<	{
1538	>	if (parc && !EmptyString(*parv))
1539		*reason = *parv;
2268	–	if (!valid_comment(source_p, *reason, 1))
2269	–	return -1;
2270	–	}
1540		else
1541	<	*reason = def_reason;
1541	>	*reason = default_reason;
1542		}
1543
1544		return 1;
1545		}
1546
2278	–	/* find_user_host()
2279	–	*
2280	–	* inputs       - pointer to client placing kline
2281	–	*              - pointer to user_host_or_nick
2282	–	*              - pointer to user buffer
2283	–	*              - pointer to host buffer
2284	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
2285	–	* side effects -
2286	–	*/
2287	–	static int
2288	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
2289	–	char *luser, char *lhost, unsigned int flags)
2290	–	{
2291	–	struct Client *target_p = NULL;
2292	–	char *hostp = NULL;
2293	–
2294	–	if (lhost == NULL)
2295	–	{
2296	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
2297	–	return 1;
2298	–	}
2299	–
2300	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
2301	–	{
2302	–	/* Explicit user@host mask given */
2303	–
2304	–	if (hostp != NULL)                            /* I'm a little user@host */
2305	–	{
2306	–	*(hostp++) = '\0';                       /* short and squat */
2307	–	if (*user_host_or_nick)
2308	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
2309	–	else
2310	–	strcpy(luser, "*");
2311	–	if (*hostp)
2312	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
2313	–	else
2314	–	strcpy(lhost, "*");
2315	–	}
2316	–	else
2317	–	{
2318	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
2319	–	luser[1] = '\0';
2320	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
2321	–	}
2322	–
2323	–	return 1;
2324	–	}
2325	–	else
2326	–	{
2327	–	/* Try to find user@host mask from nick */
2328	–	/* Okay to use source_p as the first param, because source_p == client_p */
2329	–	if ((target_p =
2330	–	find_chasing(source_p, source_p, user_host_or_nick, NULL)) == NULL)
2331	–	return 0;
2332	–
2333	–	if (IsExemptKline(target_p))
2334	–	{
2335	–	if (!IsServer(source_p))
2336	–	sendto_one(source_p,
2337	–	":%s NOTICE %s :%s is E-lined",
2338	–	me.name, source_p->name, target_p->name);
2339	–	return 0;
2340	–	}
2341	–
2342	–	/*
2343	–	* turn the "user" bit into "*user", blow away '~'
2344	–	* if found in original user name (non-idented)
2345	–	*/
2346	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
2347	–
2348	–	if (target_p->username[0] == '~')
2349	–	luser[0] = '*';
2350	–
2351	–	if (target_p->sockhost[0] == '\0' ||
2352	–	(target_p->sockhost[0] == '0' && target_p->sockhost[1] == '\0'))
2353	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
2354	–	else
2355	–	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
2356	–	return 1;
2357	–	}
2358	–
2359	–	return 0;
2360	–	}
2361	–
2362	–	/* valid_comment()
2363	–	*
2364	–	* inputs       - pointer to client
2365	–	*              - pointer to comment
2366	–	* output       - 0 if no valid comment,
2367	–	*              - 1 if valid
2368	–	* side effects - truncates reason where necessary
2369	–	*/
2370	–	int
2371	–	valid_comment(struct Client *source_p, char *comment, int warn)
2372	–	{
2373	–	if (strlen(comment) > REASONLEN)
2374	–	comment[REASONLEN-1] = '\0';
2375	–
2376	–	return 1;
2377	–	}
2378	–
1547		/* match_conf_password()
1548		*
1549		* inputs       - pointer to given password
#	Line 2396 | Line 1564 | match_conf_password(const char *password
1564		else
1565		encr = password;
1566
1567	<	return !strcmp(encr, conf->passwd);
2400	<	}
2401	<
2402	<	/*
2403	<	* cluster_a_line
2404	<	*
2405	<	* inputs       - client sending the cluster
2406	<	*              - command name "KLINE" "XLINE" etc.
2407	<	*              - capab -- CAP_KLN etc. from s_serv.h
2408	<	*              - cluster type -- CLUSTER_KLINE etc. from conf.h
2409	<	*              - pattern and args to send along
2410	<	* output       - none
2411	<	* side effects - Take source_p send the pattern with args given
2412	<	*                along to all servers that match capab and cluster type
2413	<	*/
2414	<	void
2415	<	cluster_a_line(struct Client *source_p, const char *command,
2416	<	int capab, int cluster_type, const char *pattern, ...)
2417	<	{
2418	<	va_list args;
2419	<	char buffer[IRCD_BUFSIZE];
2420	<	const dlink_node *ptr = NULL;
2421	<
2422	<	va_start(args, pattern);
2423	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
2424	<	va_end(args);
2425	<
2426	<	DLINK_FOREACH(ptr, cluster_items.head)
2427	<	{
2428	<	const struct MaskItem *conf = ptr->data;
2429	<
2430	<	if (conf->flags & cluster_type)
2431	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
2432	<	"%s %s %s", command, conf->name, buffer);
2433	<	}
1567	>	return encr && !strcmp(encr, conf->passwd);
1568		}
1569
1570		/*
#	Line 2468 | Line 1602 | split_nuh(struct split_nuh_item *const i
1602
1603		if (iptr->nickptr)
1604		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1605	+
1606		if (iptr->userptr)
1607		strlcpy(iptr->userptr, "*", iptr->usersize);
1608	+
1609		if (iptr->hostptr)
1610		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1611
#	Line 2477 | Line 1613 | split_nuh(struct split_nuh_item *const i
1613		{
1614		*p = '\0';
1615
1616	<	if (iptr->nickptr && *iptr->nuhmask != '\0')
1616	>	if (iptr->nickptr && *iptr->nuhmask)
1617		strlcpy(iptr->nickptr, iptr->nuhmask, iptr->nicksize);
1618
1619	<	if ((q = strchr(++p, '@'))) {
1619	>	if ((q = strchr(++p, '@')))
1620	>	{
1621		*q++ = '\0';
1622
1623	<	if (*p != '\0')
1623	>	if (*p)
1624		strlcpy(iptr->userptr, p, iptr->usersize);
1625
1626	<	if (*q != '\0')
1626	>	if (*q)
1627		strlcpy(iptr->hostptr, q, iptr->hostsize);
1628		}
1629		else
1630		{
1631	<	if (*p != '\0')
1631	>	if (*p)
1632		strlcpy(iptr->userptr, p, iptr->usersize);
1633		}
1634		}
#	Line 2503 | Line 1640 | split_nuh(struct split_nuh_item *const i
1640		/* if found a @ */
1641		*p++ = '\0';
1642
1643	<	if (*iptr->nuhmask != '\0')
1643	>	if (*iptr->nuhmask)
1644		strlcpy(iptr->userptr, iptr->nuhmask, iptr->usersize);
1645
1646	<	if (*p != '\0')
1646	>	if (*p)
1647		strlcpy(iptr->hostptr, p, iptr->hostsize);
1648		}
1649		else
1650		{
1651	<	/* no @ found */
1651	>	/* No @ found */
1652		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1653		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1654		else

Comparing:
ircd-hybrid/trunk/src/conf.c (property svn:keywords), Revision 1646 by michael, Wed Nov 7 21:02:43 2012 UTC vs.
ircd-hybrid/branches/8.2.x/src/conf.c (property svn:keywords), Revision 7725 by michael, Mon Sep 26 14:59:44 2016 UTC

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

Diff Legend

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