ViewVC Help

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

root/svn/ircd-hybrid/trunk/src/conf.c

Comparing ircd-hybrid/trunk/src/conf.c (file contents):
Revision 4977 by michael, Thu Dec 4 15:12:24 2014 UTC vs.
Revision 6956 by michael, Thu Dec 17 10:54:07 2015 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 55 | Line 55
55		#include "conf_class.h"
56		#include "motd.h"
57		#include "ipcache.h"
58	+	#include "isupport.h"
59
60
61	+	struct config_channel_entry ConfigChannel;
62	+	struct config_serverhide_entry ConfigServerHide;
63	+	struct config_general_entry ConfigGeneral;
64	+	struct config_log_entry ConfigLog = { .use_logging = 1 };
65	+	struct config_serverinfo_entry ConfigServerInfo;
66	+	struct config_admin_entry ConfigAdminInfo;
67	+	struct conf_parser_context conf_parser_ctx;
68	+
69		/* general conf items link list root, other than k lines etc. */
70	<	dlink_list service_items = { NULL, NULL, 0 };
71	<	dlink_list server_items  = { NULL, NULL, 0 };
72	<	dlink_list cluster_items = { NULL, NULL, 0 };
73	<	dlink_list oconf_items   = { NULL, NULL, 0 };
74	<	dlink_list uconf_items   = { NULL, NULL, 0 };
75	<	dlink_list xconf_items   = { NULL, NULL, 0 };
76	<	dlink_list nresv_items   = { NULL, NULL, 0 };
77	<	dlink_list cresv_items   = { NULL, NULL, 0 };
70	>	dlink_list service_items;
71	>	dlink_list server_items;
72	>	dlink_list cluster_items;
73	>	dlink_list operator_items;
74	>	dlink_list shared_items;
75	>	dlink_list gecos_items;
76	>	dlink_list nresv_items;
77	>	dlink_list cresv_items;
78
79		extern unsigned int lineno;
80		extern char linebuf[];
81		extern char conffilebuf[IRCD_BUFSIZE];
82		extern int yyparse(); /* defined in y.tab.c */
83
75	–	/* internally defined functions */
76	–	static void read_conf(FILE *);
77	–	static void clear_out_old_conf(void);
78	–	static void expire_tklines(dlink_list *);
79	–	static int verify_access(struct Client *);
80	–	static int attach_iline(struct Client *, struct MaskItem *);
81	–	static dlink_list *map_to_list(enum maskitem_type);
82	–	static int find_user_host(struct Client *, char *, char *, char *, unsigned int);
83	–
84
85		/* conf_dns_callback()
86		*
#	Line 114 | Line 114 | conf_dns_callback(void *vptr, const stru
114		static void
115		conf_dns_lookup(struct MaskItem *conf)
116		{
117	<	if (!conf->dns_pending)
118	<	{
119	<	conf->dns_pending = 1;
117	>	if (conf->dns_pending)
118	>	return;
119
120	<	if (conf->aftype == AF_INET)
121	<	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
122	<	else
123	<	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
120	>	conf->dns_pending = 1;
121	>
122	>	if (conf->aftype == AF_INET)
123	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_A);
124	>	else
125	>	gethost_byname_type(conf_dns_callback, conf, conf->host, T_AAAA);
126	>	}
127	>
128	>	/* map_to_list()
129	>	*
130	>	* inputs       - ConfType conf
131	>	* output       - pointer to dlink_list to use
132	>	* side effects - none
133	>	*/
134	>	static dlink_list *
135	>	map_to_list(enum maskitem_type type)
136	>	{
137	>	switch (type)
138	>	{
139	>	case CONF_XLINE:
140	>	return &gecos_items;
141	>	break;
142	>	case CONF_SHARED:
143	>	return &shared_items;
144	>	break;
145	>	case CONF_NRESV:
146	>	return &nresv_items;
147	>	break;
148	>	case CONF_CRESV:
149	>	return &cresv_items;
150	>	break;
151	>	case CONF_OPER:
152	>	return &operator_items;
153	>	break;
154	>	case CONF_SERVER:
155	>	return &server_items;
156	>	break;
157	>	case CONF_SERVICE:
158	>	return &service_items;
159	>	break;
160	>	case CONF_CLUSTER:
161	>	return &cluster_items;
162	>	break;
163	>	default:
164	>	return NULL;
165		}
166		}
167
#	Line 164 | Line 204 | conf_free(struct MaskItem *conf)
204		MyFree(conf->spasswd);
205		MyFree(conf->reason);
206		MyFree(conf->certfp);
207	+	MyFree(conf->whois);
208		MyFree(conf->user);
209		MyFree(conf->host);
210		#ifdef HAVE_LIBCRYPTO
#	Line 200 | Line 241 | conf_free(struct MaskItem *conf)
241		MyFree(conf);
242		}
243
244	+	/* attach_iline()
245	+	*
246	+	* inputs       - client pointer
247	+	*              - conf pointer
248	+	* output       -
249	+	* side effects - do actual attach
250	+	*/
251	+	static int
252	+	attach_iline(struct Client *client_p, struct MaskItem *conf)
253	+	{
254	+	const struct ClassItem *const class = conf->class;
255	+	struct ip_entry *ip_found;
256	+	int a_limit_reached = 0;
257	+	unsigned int local = 0, global = 0, ident = 0;
258	+
259	+	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
260	+	ip_found->count++;
261	+	AddFlag(client_p, FLAGS_IPHASH);
262	+
263	+	userhost_count(client_p->username, client_p->host,
264	+	&global, &local, &ident);
265	+
266	+	/* XXX blah. go down checking the various silly limits
267	+	* setting a_limit_reached if any limit is reached.
268	+	* - Dianora
269	+	*/
270	+	if (class->max_total && class->ref_count >= class->max_total)
271	+	a_limit_reached = 1;
272	+	else if (class->max_perip && ip_found->count > class->max_perip)
273	+	a_limit_reached = 1;
274	+	else if (class->max_local && local >= class->max_local)
275	+	a_limit_reached = 1;
276	+	else if (class->max_global && global >= class->max_global)
277	+	a_limit_reached = 1;
278	+	else if (class->max_ident && ident >= class->max_ident &&
279	+	client_p->username[0] != '~')
280	+	a_limit_reached = 1;
281	+
282	+	if (a_limit_reached)
283	+	{
284	+	if (!IsConfExemptLimits(conf))
285	+	return TOO_MANY;   /* Already at maximum allowed */
286	+
287	+	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
288	+	"but you have exceed_limit = yes;");
289	+	}
290	+
291	+	return attach_conf(client_p, conf);
292	+	}
293	+
294	+	/* verify_access()
295	+	*
296	+	* inputs       - pointer to client to verify
297	+	* output       - 0 if success -'ve if not
298	+	* side effect  - find the first (best) I line to attach.
299	+	*/
300	+	static int
301	+	verify_access(struct Client *client_p)
302	+	{
303	+	struct MaskItem *conf = NULL;
304	+
305	+	if (HasFlag(client_p, FLAGS_GOTID))
306	+	{
307	+	conf = find_address_conf(client_p->host, client_p->username,
308	+	&client_p->connection->ip,
309	+	client_p->connection->aftype,
310	+	client_p->connection->password);
311	+	}
312	+	else
313	+	{
314	+	char non_ident[USERLEN + 1] = "~";
315	+
316	+	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
317	+	conf = find_address_conf(client_p->host, non_ident,
318	+	&client_p->connection->ip,
319	+	client_p->connection->aftype,
320	+	client_p->connection->password);
321	+	}
322	+
323	+	if (!conf)
324	+	return NOT_AUTHORIZED;
325	+
326	+	assert(IsConfClient(conf) || IsConfKill(conf));
327	+
328	+	if (IsConfClient(conf))
329	+	{
330	+	if (IsConfRedir(conf))
331	+	{
332	+	sendto_one_numeric(client_p, &me, RPL_REDIR,
333	+	conf->name ? conf->name : "",
334	+	conf->port);
335	+	return NOT_AUTHORIZED;
336	+	}
337	+
338	+	if (IsConfDoSpoofIp(conf))
339	+	{
340	+	if (IsConfSpoofNotice(conf))
341	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE, "%s spoofing: %s as %s",
342	+	client_p->name, client_p->host, conf->name);
343	+
344	+	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
345	+	}
346	+
347	+	return attach_iline(client_p, conf);
348	+	}
349	+
350	+	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
351	+	return BANNED_CLIENT;
352	+	}
353	+
354		/* check_client()
355		*
356		* inputs       - pointer to client
#	Line 237 | Line 388 | check_client(struct Client *source_p)
388
389		case I_LINE_FULL:
390		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
391	<	"auth{} block is full for %s (%s).",
391	>	"auth {} block is full for %s (%s).",
392		get_client_name(source_p, SHOW_IP),
393		source_p->sockhost);
394		ilog(LOG_TYPE_IRCD, "Too many connections from %s.",
#	Line 247 | Line 398 | check_client(struct Client *source_p)
398		break;
399
400		case NOT_AUTHORIZED:
250	–	++ServerStats.is_ref;
401		/* jdc - lists server name & port connections are on */
402		/*       a purely cosmetical change */
403		sendto_realops_flags(UMODE_UNAUTH, L_ALL, SEND_NOTICE,
#	Line 256 | Line 406 | check_client(struct Client *source_p)
406		source_p->sockhost,
407		source_p->connection->listener->name,
408		source_p->connection->listener->port);
409	<	ilog(LOG_TYPE_IRCD,
260	<	"Unauthorized client connection from %s on [%s/%u].",
409	>	ilog(LOG_TYPE_IRCD, "Unauthorized client connection from %s on [%s/%u].",
410		get_client_name(source_p, SHOW_IP),
411		source_p->connection->listener->name,
412		source_p->connection->listener->port);
413
414	+	++ServerStats.is_ref;
415		exit_client(source_p, "You are not authorized to use this server");
416		break;
417
418	<	case BANNED_CLIENT:
419	<	exit_client(source_p, "Banned");
420	<	++ServerStats.is_ref;
421	<	break;
272	<
273	<	case 0:
274	<	default:
275	<	break;
276	<	}
277	<
278	<	return (i < 0 ? 0 : 1);
279	<	}
280	<
281	<	/* verify_access()
282	<	*
283	<	* inputs       - pointer to client to verify
284	<	* output       - 0 if success -'ve if not
285	<	* side effect  - find the first (best) I line to attach.
286	<	*/
287	<	static int
288	<	verify_access(struct Client *client_p)
289	<	{
290	<	struct MaskItem *conf = NULL;
291	<	char non_ident[USERLEN + 1] = "~";
292	<
293	<	if (IsGotId(client_p))
294	<	{
295	<	conf = find_address_conf(client_p->host, client_p->username,
296	<	&client_p->connection->ip,
297	<	client_p->connection->aftype,
298	<	client_p->connection->password);
299	<	}
300	<	else
301	<	{
302	<	strlcpy(non_ident + 1, client_p->username, sizeof(non_ident) - 1);
303	<	conf = find_address_conf(client_p->host,non_ident,
304	<	&client_p->connection->ip,
305	<	client_p->connection->aftype,
306	<	client_p->connection->password);
307	<	}
308	<
309	<	if (conf)
310	<	{
311	<	if (IsConfClient(conf))
312	<	{
313	<	if (IsConfRedir(conf))
314	<	{
315	<	sendto_one_numeric(client_p, &me, RPL_REDIR,
316	<	conf->name ? conf->name : "",
317	<	conf->port);
318	<	return NOT_AUTHORIZED;
319	<	}
320	<
321	<	/* Thanks for spoof idea amm */
322	<	if (IsConfDoSpoofIp(conf))
323	<	{
324	<	if (IsConfSpoofNotice(conf))
325	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
326	<	"%s spoofing: %s as %s",
327	<	client_p->name, client_p->host, conf->name);
328	<	strlcpy(client_p->host, conf->name, sizeof(client_p->host));
329	<	}
330	<
331	<	return attach_iline(client_p, conf);
332	<	}
333	<	else if (IsConfKill(conf) || (ConfigGeneral.glines && IsConfGline(conf)))
334	<	{
335	<	if (IsConfGline(conf))
336	<	sendto_one_notice(client_p, &me, ":*** G-lined");
337	<	sendto_one_notice(client_p, &me, ":*** Banned: %s", conf->reason);
338	<	return BANNED_CLIENT;
339	<	}
340	<	}
341	<
342	<	return NOT_AUTHORIZED;
343	<	}
344	<
345	<	/* attach_iline()
346	<	*
347	<	* inputs       - client pointer
348	<	*              - conf pointer
349	<	* output       -
350	<	* side effects - do actual attach
351	<	*/
352	<	static int
353	<	attach_iline(struct Client *client_p, struct MaskItem *conf)
354	<	{
355	<	const struct ClassItem *const class = conf->class;
356	<	struct ip_entry *ip_found;
357	<	int a_limit_reached = 0;
358	<	unsigned int local = 0, global = 0, ident = 0;
359	<
360	<	ip_found = ipcache_find_or_add_address(&client_p->connection->ip);
361	<	ip_found->count++;
362	<	AddFlag(client_p, FLAGS_IPHASH);
363	<
364	<	count_user_host(client_p->username, client_p->host,
365	<	&global, &local, &ident);
366	<
367	<	/* XXX blah. go down checking the various silly limits
368	<	* setting a_limit_reached if any limit is reached.
369	<	* - Dianora
370	<	*/
371	<	if (class->max_total && class->ref_count >= class->max_total)
372	<	a_limit_reached = 1;
373	<	else if (class->max_perip && ip_found->count > class->max_perip)
374	<	a_limit_reached = 1;
375	<	else if (class->max_local && local >= class->max_local)
376	<	a_limit_reached = 1;
377	<	else if (class->max_global && global >= class->max_global)
378	<	a_limit_reached = 1;
379	<	else if (class->max_ident && ident >= class->max_ident &&
380	<	client_p->username[0] != '~')
381	<	a_limit_reached = 1;
382	<
383	<	if (a_limit_reached)
384	<	{
385	<	if (!IsConfExemptLimits(conf))
386	<	return TOO_MANY;   /* Already at maximum allowed */
418	>	case BANNED_CLIENT:
419	>	++ServerStats.is_ref;
420	>	exit_client(source_p, "Banned");
421	>	break;
422
423	<	sendto_one_notice(client_p, &me, ":*** Your connection class is full, "
424	<	"but you have exceed_limit = yes;");
423	>	case 0:
424	>	default:
425	>	break;
426		}
427
428	<	return attach_conf(client_p, conf);
428	>	return !(i < 0);
429		}
430
431		/* detach_conf()
#	Line 476 | Line 512 | attach_connect_block(struct Client *clie
512		{
513		dlink_node *node = NULL;
514
515	<	assert(client_p != NULL);
480	<	assert(host != NULL);
481	<
482	<	if (client_p == NULL || host == NULL)
483	<	return 0;
515	>	assert(host);
516
517		DLINK_FOREACH(node, server_items.head)
518		{
#	Line 490 | Line 522 | attach_connect_block(struct Client *clie
522		continue;
523
524		attach_conf(client_p, conf);
525	<	return -1;
525	>	return 1;
526		}
527
528		return 0;
#	Line 524 | Line 556 | find_conf_name(dlink_list *list, const c
556		return NULL;
557		}
558
527	–	/* map_to_list()
528	–	*
529	–	* inputs       - ConfType conf
530	–	* output       - pointer to dlink_list to use
531	–	* side effects - none
532	–	*/
533	–	static dlink_list *
534	–	map_to_list(enum maskitem_type type)
535	–	{
536	–	switch(type)
537	–	{
538	–	case CONF_XLINE:
539	–	return(&xconf_items);
540	–	break;
541	–	case CONF_ULINE:
542	–	return(&uconf_items);
543	–	break;
544	–	case CONF_NRESV:
545	–	return(&nresv_items);
546	–	break;
547	–	case CONF_CRESV:
548	–	return(&cresv_items);
549	–	case CONF_OPER:
550	–	return(&oconf_items);
551	–	break;
552	–	case CONF_SERVER:
553	–	return(&server_items);
554	–	break;
555	–	case CONF_SERVICE:
556	–	return(&service_items);
557	–	break;
558	–	case CONF_CLUSTER:
559	–	return(&cluster_items);
560	–	break;
561	–	default:
562	–	return NULL;
563	–	}
564	–	}
565	–
559		/* find_matching_name_conf()
560		*
561		* inputs       - type of link list to look in
#	Line 590 | Line 583 | find_matching_name_conf(enum maskitem_ty
583
584		if (EmptyString(conf->name))
585		continue;
586	<	if ((name != NULL) && !irccmp(name, conf->name))
586	>	if (name && !irccmp(name, conf->name))
587		return conf;
588		}
589		break;
590
591		case CONF_XLINE:
592	<	case CONF_ULINE:
592	>	case CONF_SHARED:
593		case CONF_NRESV:
594		case CONF_CRESV:
595		DLINK_FOREACH(node, list->head)
#	Line 605 | Line 598 | find_matching_name_conf(enum maskitem_ty
598
599		if (EmptyString(conf->name))
600		continue;
601	<	if ((name != NULL) && !match(conf->name, name))
601	>	if (name && !match(conf->name, name))
602		{
603		if ((user == NULL && (host == NULL)))
604		return conf;
#	Line 624 | Line 617 | find_matching_name_conf(enum maskitem_ty
617		{
618		conf = node->data;
619
620	<	if ((name != NULL) && !match(name, conf->name))
620	>	if (name && !match(name, conf->name))
621		return conf;
622	<	else if ((host != NULL) && !match(host, conf->host))
622	>	if (host && !match(host, conf->host))
623		return conf;
624		}
625		break;
#	Line 657 | Line 650 | find_exact_name_conf(enum maskitem_type
650		switch(type)
651		{
652		case CONF_XLINE:
653	<	case CONF_ULINE:
653	>	case CONF_SHARED:
654		case CONF_NRESV:
655		case CONF_CRESV:
656
#	Line 752 | Line 745 | find_exact_name_conf(enum maskitem_type
745		return NULL;
746		}
747
755	–	/* rehash()
756	–	*
757	–	* Actual REHASH service routine. Called with sig == 0 if it has been called
758	–	* as a result of an operator issuing this command, else assume it has been
759	–	* called as a result of the server receiving a HUP signal.
760	–	*/
761	–	int
762	–	rehash(int sig)
763	–	{
764	–	if (sig)
765	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
766	–	"Got signal SIGHUP, reloading configuration file(s)");
767	–
768	–	restart_resolver();
769	–
770	–	/* don't close listeners until we know we can go ahead with the rehash */
771	–
772	–	read_conf_files(0);
773	–
774	–	load_conf_modules();
775	–	check_conf_klines();
776	–
777	–	return 0;
778	–	}
779	–
748		/* set_default_conf()
749		*
750		* inputs       - NONE
#	Line 811 | Line 779 | set_default_conf(void)
779
780		SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
781		ConfigServerInfo.message_digest_algorithm = EVP_sha256();
814	–	ConfigServerInfo.rsa_private_key = NULL;
815	–	ConfigServerInfo.rsa_private_key_file = NULL;
782		#endif
783
818	–	/* ConfigServerInfo.name is not rehashable */
819	–	/* ConfigServerInfo.name = ConfigServerInfo.name; */
820	–	ConfigServerInfo.description = NULL;
784		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
785		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
786
#	Line 826 | Line 789 | set_default_conf(void)
789		memset(&ConfigServerInfo.ip6, 0, sizeof(ConfigServerInfo.ip6));
790		ConfigServerInfo.specific_ipv6_vhost = 0;
791
792	<	ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
792	>	ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
793		ConfigServerInfo.max_nick_length = 9;
794		ConfigServerInfo.max_topic_length = 80;
795		ConfigServerInfo.hub = 0;
796
834	–	ConfigAdminInfo.name = NULL;
835	–	ConfigAdminInfo.email = NULL;
836	–	ConfigAdminInfo.description = NULL;
837	–
797		log_del_all();
798
799		ConfigLog.use_logging = 1;
#	Line 842 | Line 801 | set_default_conf(void)
801		ConfigChannel.disable_fake_channels = 0;
802		ConfigChannel.invite_client_count = 10;
803		ConfigChannel.invite_client_time = 300;
804	+	ConfigChannel.invite_delay_channel = 5;
805		ConfigChannel.knock_client_count = 1;
806		ConfigChannel.knock_client_time = 300;
807		ConfigChannel.knock_delay_channel = 60;
808		ConfigChannel.max_channels = 25;
809		ConfigChannel.max_bans = 25;
810	<	ConfigChannel.default_split_user_count = 0;
811	<	ConfigChannel.default_split_server_count = 0;
852	<	ConfigChannel.no_join_on_split = 0;
853	<	ConfigChannel.no_create_on_split = 0;
810	>	ConfigChannel.default_join_flood_count = 18;
811	>	ConfigChannel.default_join_flood_time = 6;
812
813		ConfigServerHide.flatten_links = 0;
814	<	ConfigServerHide.links_delay = 300;
814	>	ConfigServerHide.flatten_links_delay = 300;
815		ConfigServerHide.hidden = 0;
816		ConfigServerHide.hide_servers = 0;
817		ConfigServerHide.hide_services = 0;
#	Line 863 | Line 821 | set_default_conf(void)
821
822		ConfigGeneral.away_count = 2;
823		ConfigGeneral.away_time = 10;
824	<	ConfigGeneral.max_watch = WATCHSIZE_DEFAULT;
824	>	ConfigGeneral.max_watch = 50;
825		ConfigGeneral.cycle_on_host_change = 1;
826	<	ConfigGeneral.glines = 0;
827	<	ConfigGeneral.gline_time = 12 * 3600;
828	<	ConfigGeneral.gline_request_time = GLINE_REQUEST_EXPIRE_DEFAULT;
829	<	ConfigGeneral.gline_min_cidr = 16;
872	<	ConfigGeneral.gline_min_cidr6 = 48;
826	>	ConfigGeneral.dline_min_cidr = 16;
827	>	ConfigGeneral.dline_min_cidr6 = 48;
828	>	ConfigGeneral.kline_min_cidr = 16;
829	>	ConfigGeneral.kline_min_cidr6 = 48;
830		ConfigGeneral.invisible_on_connect = 1;
831		ConfigGeneral.tkline_expire_notices = 1;
832		ConfigGeneral.ignore_bogus_ts = 0;
#	Line 880 | Line 837 | set_default_conf(void)
837		ConfigGeneral.dots_in_ident = 0;
838		ConfigGeneral.min_nonwildcard = 4;
839		ConfigGeneral.min_nonwildcard_simple = 3;
840	<	ConfigGeneral.max_accept = 20;
840	>	ConfigGeneral.max_accept = 50;
841		ConfigGeneral.anti_nick_flood = 0;
842		ConfigGeneral.max_nick_time = 20;
843		ConfigGeneral.max_nick_changes = 5;
844		ConfigGeneral.anti_spam_exit_message_time = 0;
845	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
846	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
845	>	ConfigGeneral.ts_warn_delta = 30;
846	>	ConfigGeneral.ts_max_delta = 600;
847		ConfigGeneral.warn_no_connect_block = 1;
848		ConfigGeneral.stats_e_disabled = 0;
892	–	ConfigGeneral.stats_o_oper_only = 0;
893	–	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
849		ConfigGeneral.stats_i_oper_only = 1;  /* 1 = masked */
850	+	ConfigGeneral.stats_k_oper_only = 1;  /* 1 = masked */
851	+	ConfigGeneral.stats_o_oper_only = 1;
852	+	ConfigGeneral.stats_m_oper_only = 1;
853		ConfigGeneral.stats_P_oper_only = 0;
854		ConfigGeneral.stats_u_oper_only = 0;
855		ConfigGeneral.caller_id_wait = 60;
#	Line 901 | Line 859 | set_default_conf(void)
859		ConfigGeneral.short_motd = 0;
860		ConfigGeneral.ping_cookie = 0;
861		ConfigGeneral.no_oper_flood = 0;
904	–	ConfigGeneral.true_no_oper_flood = 0;
905	–	ConfigGeneral.oper_pass_resv = 1;
862		ConfigGeneral.max_targets = MAX_TARGETS_DEFAULT;
863	<	ConfigGeneral.oper_only_umodes = UMODE_DEBUG;
863	>	ConfigGeneral.oper_only_umodes = UMODE_DEBUG | UMODE_LOCOPS | UMODE_HIDDEN | UMODE_FARCONNECT |
864	>	UMODE_UNAUTH | UMODE_EXTERNAL | UMODE_BOTS | UMODE_NCHANGE |
865	>	UMODE_SPY | UMODE_FULL | UMODE_SKILL | UMODE_REJ | UMODE_CCONN;
866		ConfigGeneral.oper_umodes = UMODE_BOTS | UMODE_LOCOPS | UMODE_SERVNOTICE | UMODE_WALLOP;
867		ConfigGeneral.throttle_count = 1;
868		ConfigGeneral.throttle_time = 1;
#	Line 913 | Line 871 | set_default_conf(void)
871		static void
872		validate_conf(void)
873		{
874	<	if (ConfigGeneral.ts_warn_delta < TS_WARN_DELTA_MIN)
917	<	ConfigGeneral.ts_warn_delta = TS_WARN_DELTA_DEFAULT;
918	<
919	<	if (ConfigGeneral.ts_max_delta < TS_MAX_DELTA_MIN)
920	<	ConfigGeneral.ts_max_delta = TS_MAX_DELTA_DEFAULT;
921	<
922	<	if (ConfigServerInfo.network_name == NULL)
874	>	if (EmptyString(ConfigServerInfo.network_name))
875		ConfigServerInfo.network_name = xstrdup(NETWORK_NAME_DEFAULT);
876
877	<	if (ConfigServerInfo.network_desc == NULL)
877	>	if (EmptyString(ConfigServerInfo.network_desc))
878		ConfigServerInfo.network_desc = xstrdup(NETWORK_DESC_DEFAULT);
927	–
928	–	ConfigGeneral.max_watch = IRCD_MAX(ConfigGeneral.max_watch, WATCHSIZE_MIN);
879		}
880
881		/* read_conf()
#	Line 952 | Line 902 | read_conf(FILE *file)
902		class_delete_marked();  /* Delete unused classes that are marked for deletion */
903		}
904
905	+	/* conf_rehash()
906	+	*
907	+	* Actual REHASH service routine. Called with sig == 0 if it has been called
908	+	* as a result of an operator issuing this command, else assume it has been
909	+	* called as a result of the server receiving a HUP signal.
910	+	*/
911	+	void
912	+	conf_rehash(int sig)
913	+	{
914	+	if (sig)
915	+	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
916	+	"Got signal SIGHUP, reloading configuration file(s)");
917	+
918	+	restart_resolver();
919	+
920	+	/* don't close listeners until we know we can go ahead with the rehash */
921	+
922	+	read_conf_files(0);
923	+
924	+	load_conf_modules();
925	+	check_conf_klines();
926	+	}
927	+
928		/* lookup_confhost()
929		*
930		* start DNS lookups of all hostnames in the conf
#	Line 1000 | Line 973 | int
973		conf_connect_allowed(struct irc_ssaddr *addr, int aftype)
974		{
975		struct ip_entry *ip_found = NULL;
976	<	struct MaskItem *const conf = find_dline_conf(addr, aftype);
1004	<
1005	<	/* DLINE exempt also gets you out of static limits/pacing... */
1006	<	if (conf && (conf->type == CONF_EXEMPT))
1007	<	return 0;
976	>	const struct MaskItem *conf = find_dline_conf(addr, aftype);
977
978		if (conf)
979	+	{
980	+	/* DLINE exempt also gets you out of static limits/pacing... */
981	+	if (conf->type == CONF_EXEMPT)
982	+	return 0;
983		return BANNED_CLIENT;
984	+	}
985
986		ip_found = ipcache_find_or_add_address(addr);
987
#	Line 1025 | Line 999 | conf_connect_allowed(struct irc_ssaddr *
999		return 0;
1000		}
1001
1028	–	/* cleanup_tklines()
1029	–	*
1030	–	* inputs       - NONE
1031	–	* output       - NONE
1032	–	* side effects - call function to expire temporary k/d lines
1033	–	*                This is an event started off in ircd.c
1034	–	*/
1035	–	void
1036	–	cleanup_tklines(void *unused)
1037	–	{
1038	–	hostmask_expire_temporary();
1039	–	expire_tklines(&xconf_items);
1040	–	expire_tklines(&nresv_items);
1041	–	expire_tklines(&cresv_items);
1042	–	}
1043	–
1002		/* expire_tklines()
1003		*
1004		* inputs       - tkline list pointer
#	Line 1059 | Line 1017 | expire_tklines(dlink_list *list)
1017		if (!conf->until || conf->until > CurrentTime)
1018		continue;
1019
1020	<	if (conf->type == CONF_XLINE)
1021	<	{
1022	<	if (ConfigGeneral.tkline_expire_notices)
1023	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1066	<	"Temporary X-line for [%s] expired", conf->name);
1067	<	conf_free(conf);
1068	<	}
1069	<	else if (conf->type == CONF_NRESV || conf->type == CONF_CRESV)
1070	<	{
1071	<	if (ConfigGeneral.tkline_expire_notices)
1072	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1073	<	"Temporary RESV for [%s] expired", conf->name);
1074	<	conf_free(conf);
1075	<	}
1020	>	if (ConfigGeneral.tkline_expire_notices)
1021	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "Temporary %s for [%s] expired",
1022	>	(conf->type == CONF_XLINE) ? "X-line" : "RESV", conf->name);
1023	>	conf_free(conf);
1024		}
1025		}
1026
1027	+	/* cleanup_tklines()
1028	+	*
1029	+	* inputs       - NONE
1030	+	* output       - NONE
1031	+	* side effects - call function to expire temporary k/d lines
1032	+	*                This is an event started off in ircd.c
1033	+	*/
1034	+	void
1035	+	cleanup_tklines(void *unused)
1036	+	{
1037	+	hostmask_expire_temporary();
1038	+	expire_tklines(&gecos_items);
1039	+	expire_tklines(&nresv_items);
1040	+	expire_tklines(&cresv_items);
1041	+	}
1042	+
1043		/* oper_privs_as_string()
1044		*
1045		* inputs        - pointer to client_p
#	Line 1088 | Line 1052 | static const struct oper_privs
1052		const unsigned char c;
1053		} flag_list[] = {
1054		{ OPER_FLAG_ADMIN,          'A' },
1055	<	{ OPER_FLAG_REMOTEBAN,      'B' },
1056	<	{ OPER_FLAG_DIE,            'D' },
1057	<	{ OPER_FLAG_GLINE,          'G' },
1058	<	{ OPER_FLAG_REHASH,         'H' },
1055	>	{ OPER_FLAG_CLOSE,          'B' },
1056	>	{ OPER_FLAG_CONNECT,        'C' },
1057	>	{ OPER_FLAG_CONNECT_REMOTE, 'D' },
1058	>	{ OPER_FLAG_DIE,            'E' },
1059	>	{ OPER_FLAG_DLINE,          'F' },
1060	>	{ OPER_FLAG_GLOBOPS,        'G' },
1061	>	{ OPER_FLAG_JOIN_RESV,      'H' },
1062	>	{ OPER_FLAG_KILL,           'I' },
1063	>	{ OPER_FLAG_KILL_REMOTE,    'J' },
1064		{ OPER_FLAG_KLINE,          'K' },
1065	<	{ OPER_FLAG_KILL,           'N' },
1066	<	{ OPER_FLAG_KILL_REMOTE,    'O' },
1067	<	{ OPER_FLAG_CONNECT,        'P' },
1068	<	{ OPER_FLAG_CONNECT_REMOTE, 'Q' },
1069	<	{ OPER_FLAG_SQUIT,          'R' },
1070	<	{ OPER_FLAG_SQUIT_REMOTE,   'S' },
1071	<	{ OPER_FLAG_UNKLINE,        'U' },
1072	<	{ OPER_FLAG_XLINE,          'X' },
1065	>	{ OPER_FLAG_LOCOPS,         'L' },
1066	>	{ OPER_FLAG_MODULE,         'M' },
1067	>	{ OPER_FLAG_NICK_RESV,      'N' },
1068	>	{ OPER_FLAG_OPME,           'O' },
1069	>	{ OPER_FLAG_REHASH,         'P' },
1070	>	{ OPER_FLAG_REMOTEBAN,      'Q' },
1071	>	{ OPER_FLAG_RESTART,        'R' },
1072	>	{ OPER_FLAG_RESV,           'S' },
1073	>	{ OPER_FLAG_SET,            'T' },
1074	>	{ OPER_FLAG_SQUIT,          'U' },
1075	>	{ OPER_FLAG_SQUIT_REMOTE,   'V' },
1076	>	{ OPER_FLAG_UNDLINE,        'W' },
1077	>	{ OPER_FLAG_UNKLINE,        'X' },
1078	>	{ OPER_FLAG_UNRESV,         'Y' },
1079	>	{ OPER_FLAG_UNXLINE,        'Z' },
1080	>	{ OPER_FLAG_WALLOPS,        'a' },
1081	>	{ OPER_FLAG_XLINE,          'b' },
1082		{ 0, '\0' }
1083		};
1084
1085	<	char *
1085	>	const char *
1086		oper_privs_as_string(const unsigned int port)
1087		{
1088		static char privs_out[IRCD_BUFSIZE];
1089		char *privs_ptr = privs_out;
1090
1091		for (const struct oper_privs *opriv = flag_list; opriv->flag; ++opriv)
1114	–	{
1092		if (port & opriv->flag)
1093		*privs_ptr++ = opriv->c;
1094	<	else
1095	<	*privs_ptr++ = ToLower(opriv->c);
1096	<	}
1094	>
1095	>	if (privs_ptr == privs_out)
1096	>	*privs_ptr++ = '0';
1097
1098		*privs_ptr = '\0';
1099
#	Line 1132 | Line 1109 | oper_privs_as_string(const unsigned int
1109		const char *
1110		get_oper_name(const struct Client *client_p)
1111		{
1112	<	/* +5 for !,@,{,} and null */
1136	<	static char buffer[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
1112	>	static char buffer[IRCD_BUFSIZE];
1113
1114		if (IsServer(client_p))
1115		return client_p->name;
#	Line 1166 | Line 1142 | get_oper_name(const struct Client *clien
1142		return buffer;
1143		}
1144
1169	–	/* read_conf_files()
1170	–	*
1171	–	* inputs       - cold start YES or NO
1172	–	* output       - none
1173	–	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1174	–	*/
1175	–	void
1176	–	read_conf_files(int cold)
1177	–	{
1178	–	const char *filename = NULL;
1179	–	char chanmodes[IRCD_BUFSIZE] = "";
1180	–	char chanlimit[IRCD_BUFSIZE] = "";
1181	–
1182	–	conf_parser_ctx.boot = cold;
1183	–	filename = ConfigGeneral.configfile;
1184	–
1185	–	/* We need to know the initial filename for the yyerror() to report
1186	–	FIXME: The full path is in conffilenamebuf first time since we
1187	–	don't know anything else
1188	–
1189	–	- Gozem 2002-07-21
1190	–	*/
1191	–	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1192	–
1193	–	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1194	–	{
1195	–	if (cold)
1196	–	{
1197	–	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1198	–	filename, strerror(errno));
1199	–	exit(-1);
1200	–	}
1201	–	else
1202	–	{
1203	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1204	–	"Unable to read configuration file '%s': %s",
1205	–	filename, strerror(errno));
1206	–	return;
1207	–	}
1208	–	}
1209	–
1210	–	if (!cold)
1211	–	clear_out_old_conf();
1212	–
1213	–	read_conf(conf_parser_ctx.conf_file);
1214	–	fclose(conf_parser_ctx.conf_file);
1215	–
1216	–	log_reopen_all();
1217	–
1218	–	add_isupport("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1219	–	add_isupport("NETWORK", ConfigServerInfo.network_name, -1);
1220	–
1221	–	snprintf(chanmodes, sizeof(chanmodes), "beI:%d", ConfigChannel.max_bans);
1222	–	add_isupport("MAXLIST", chanmodes, -1);
1223	–	add_isupport("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1224	–	add_isupport("CHANTYPES", "#", -1);
1225	–
1226	–	snprintf(chanlimit, sizeof(chanlimit), "#:%d",
1227	–	ConfigChannel.max_channels);
1228	–	add_isupport("CHANLIMIT", chanlimit, -1);
1229	–	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstMORS");
1230	–	add_isupport("CHANNELLEN", NULL, CHANNELLEN);
1231	–	add_isupport("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1232	–	add_isupport("CHANMODES", chanmodes, -1);
1233	–
1234	–	/*
1235	–	* message_locale may have changed.  rebuild isupport since it relies
1236	–	* on strlen(form_str(RPL_ISUPPORT))
1237	–	*/
1238	–	rebuild_isupport_message_line();
1239	–	}
1240	–
1145		/* clear_out_old_conf()
1146		*
1147		* inputs       - none
#	Line 1249 | Line 1153 | clear_out_old_conf(void)
1153		{
1154		dlink_node *node = NULL, *node_next = NULL;
1155		dlink_list *free_items [] = {
1156	<	&server_items,   &oconf_items,
1157	<	&uconf_items,   &xconf_items,
1156	>	&server_items,   &operator_items,
1157	>	&shared_items,   &gecos_items,
1158		&nresv_items, &cluster_items,  &service_items, &cresv_items, NULL
1159		};
1160
#	Line 1260 | Line 1164 | clear_out_old_conf(void)
1164		* Resetting structs, etc, is taken care of by set_default_conf().
1165		*/
1166
1167	<	for (; *iterator != NULL; iterator++)
1167	>	for (; *iterator; iterator++)
1168		{
1169		DLINK_FOREACH_SAFE(node, node_next, (*iterator)->head)
1170		{
1171		struct MaskItem *conf = node->data;
1172
1173		conf->active = 0;
1270	–	dlinkDelete(&conf->node, *iterator);
1174
1175	<	/* XXX This is less than pretty */
1273	<	if (conf->type == CONF_SERVER || conf->type == CONF_OPER)
1175	>	if (!IsConfDatabase(conf))
1176		{
1177	+	dlinkDelete(&conf->node, *iterator);
1178	+
1179		if (!conf->ref_count)
1180		conf_free(conf);
1181		}
1278	–	else if (conf->type == CONF_XLINE)
1279	–	{
1280	–	if (!conf->until)
1281	–	conf_free(conf);
1282	–	}
1283	–	else
1284	–	conf_free(conf);
1182		}
1183		}
1184
1185		motd_clear();
1186
1187		/*
1188	<	* don't delete the class table, rather mark all entries
1189	<	* for deletion. The table is cleaned up by class_delete_marked. - avalon
1188	>	* Don't delete the class table, rather mark all entries for deletion.
1189	>	* The table is cleaned up by class_delete_marked. - avalon
1190		*/
1191		class_mark_for_deletion();
1192
1193		clear_out_address_conf();
1194
1195	<	/* clean out module paths */
1195	>	/* Clean out module paths */
1196		mod_clear_paths();
1197
1198		pseudo_clear();
1199
1200	<	/* clean out ConfigServerInfo */
1200	>	/* Clean out ConfigServerInfo */
1201		MyFree(ConfigServerInfo.description);
1202		ConfigServerInfo.description = NULL;
1203		MyFree(ConfigServerInfo.network_name);
#	Line 1318 | Line 1215 | clear_out_old_conf(void)
1215		ConfigServerInfo.rsa_private_key_file = NULL;
1216		#endif
1217
1218	<	/* clean out ConfigAdminInfo */
1218	>	/* Clean out ConfigAdminInfo */
1219		MyFree(ConfigAdminInfo.name);
1220		ConfigAdminInfo.name = NULL;
1221		MyFree(ConfigAdminInfo.email);
#	Line 1326 | Line 1223 | clear_out_old_conf(void)
1223		MyFree(ConfigAdminInfo.description);
1224		ConfigAdminInfo.description = NULL;
1225
1226	<	/* clean out listeners */
1227	<	close_listeners();
1226	>	MyFree(ConfigServerHide.flatten_links_file);
1227	>	ConfigServerHide.flatten_links_file = NULL;
1228	>
1229	>	/* Clean out listeners */
1230	>	listener_close_marked();
1231	>	}
1232	>
1233	>	/* read_conf_files()
1234	>	*
1235	>	* inputs       - cold start YES or NO
1236	>	* output       - none
1237	>	* side effects - read all conf files needed, ircd.conf kline.conf etc.
1238	>	*/
1239	>	void
1240	>	read_conf_files(int cold)
1241	>	{
1242	>	const char *filename = NULL;
1243	>	char chanmodes[IRCD_BUFSIZE] = "";
1244	>	char chanlimit[IRCD_BUFSIZE] = "";
1245	>
1246	>	conf_parser_ctx.boot = cold;
1247	>	filename = ConfigGeneral.configfile;
1248	>
1249	>	/* We need to know the initial filename for the yyerror() to report
1250	>	FIXME: The full path is in conffilenamebuf first time since we
1251	>	don't know anything else
1252	>
1253	>	- Gozem 2002-07-21
1254	>	*/
1255	>	strlcpy(conffilebuf, filename, sizeof(conffilebuf));
1256	>
1257	>	if ((conf_parser_ctx.conf_file = fopen(filename, "r")) == NULL)
1258	>	{
1259	>	if (cold)
1260	>	{
1261	>	ilog(LOG_TYPE_IRCD, "Unable to read configuration file '%s': %s",
1262	>	filename, strerror(errno));
1263	>	exit(EXIT_FAILURE);
1264	>	}
1265	>	else
1266	>	{
1267	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1268	>	"Unable to read configuration file '%s': %s",
1269	>	filename, strerror(errno));
1270	>	return;
1271	>	}
1272	>	}
1273	>
1274	>	if (!cold)
1275	>	clear_out_old_conf();
1276	>
1277	>	read_conf(conf_parser_ctx.conf_file);
1278	>	fclose(conf_parser_ctx.conf_file);
1279	>
1280	>	log_reopen_all();
1281	>
1282	>	isupport_add("NICKLEN", NULL, ConfigServerInfo.max_nick_length);
1283	>	isupport_add("NETWORK", ConfigServerInfo.network_name, -1);
1284	>
1285	>	snprintf(chanmodes, sizeof(chanmodes), "beI:%u", ConfigChannel.max_bans);
1286	>	isupport_add("MAXLIST", chanmodes, -1);
1287	>	isupport_add("MAXTARGETS", NULL, ConfigGeneral.max_targets);
1288	>	isupport_add("CHANTYPES", "#", -1);
1289	>
1290	>	snprintf(chanlimit, sizeof(chanlimit), "#:%u",
1291	>	ConfigChannel.max_channels);
1292	>	isupport_add("CHANLIMIT", chanlimit, -1);
1293	>	snprintf(chanmodes, sizeof(chanmodes), "%s", "beI,k,l,cimnprstCMORST");
1294	>	isupport_add("CHANNELLEN", NULL, CHANNELLEN);
1295	>	isupport_add("TOPICLEN", NULL, ConfigServerInfo.max_topic_length);
1296	>	isupport_add("CHANMODES", chanmodes, -1);
1297	>
1298	>	/*
1299	>	* message_locale may have changed.  rebuild isupport since it relies
1300	>	* on strlen(form_str(RPL_ISUPPORT))
1301	>	*/
1302	>	isupport_rebuild();
1303		}
1304
1305		/* conf_add_class_to_conf()
#	Line 1337 | Line 1309 | clear_out_old_conf(void)
1309		* side effects - Add a class pointer to a conf
1310		*/
1311		void
1312	<	conf_add_class_to_conf(struct MaskItem *conf, const char *class_name)
1312	>	conf_add_class_to_conf(struct MaskItem *conf, const char *name)
1313		{
1314	<	if (class_name == NULL)
1314	>	if (EmptyString(name) || (conf->class = class_find(name, 1)) == NULL)
1315		{
1316		conf->class = class_default;
1317
1318		if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1319	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1319	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1320		"Warning *** Defaulting to default class for %s@%s",
1321		conf->user, conf->host);
1322		else
1323	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1323	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1324		"Warning *** Defaulting to default class for %s",
1325		conf->name);
1326		}
1355	–	else
1356	–	conf->class = class_find(class_name, 1);
1357	–
1358	–	if (conf->class == NULL)
1359	–	{
1360	–	if (conf->type == CONF_CLIENT || conf->type == CONF_OPER)
1361	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1362	–	"Warning *** Defaulting to default class for %s@%s",
1363	–	conf->user, conf->host);
1364	–	else
1365	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1366	–	"Warning *** Defaulting to default class for %s",
1367	–	conf->name);
1368	–	conf->class = class_default;
1369	–	}
1327		}
1328
1329		/* yyerror()
#	Line 1384 | Line 1341 | yyerror(const char *msg)
1341		return;
1342
1343		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1344	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1344	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1345		"\"%s\", line %u: %s: %s",
1346		conffilebuf, lineno + 1, msg, newlinebuf);
1347		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1397 | Line 1354 | conf_error_report(const char *msg)
1354		char newlinebuf[IRCD_BUFSIZE];
1355
1356		strip_tabs(newlinebuf, linebuf, sizeof(newlinebuf));
1357	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1357	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
1358		"\"%s\", line %u: %s: %s",
1359		conffilebuf, lineno + 1, msg, newlinebuf);
1360		ilog(LOG_TYPE_IRCD, "\"%s\", line %u: %s: %s",
#	Line 1432 | Line 1389 | valid_tkline(const char *data, const int
1389
1390		/*
1391		* In the degenerate case where oper does a /quote kline 0 user@host :reason
1392	<	* i.e. they specifically use 0, I am going to return 1 instead
1393	<	* as a return value of non-zero is used to flag it as a temporary kline
1392	>	* i.e. they specifically use 0, I am going to return 1 instead as a return
1393	>	* value of non-zero is used to flag it as a temporary kline
1394		*/
1395		if (result == 0)
1396		result = 1;
#	Line 1448 | Line 1405 | valid_tkline(const char *data, const int
1405		if (result > MAX_TDKLINE_TIME)
1406		result = MAX_TDKLINE_TIME;
1407
1408	<	result = result * 60;  /* turn it into seconds */
1408	>	result = result * 60;  /* Turn it into seconds */
1409
1410		return result;
1411		}
#	Line 1464 | Line 1421 | valid_wild_card_simple(const char *data)
1421		{
1422		const unsigned char *p = (const unsigned char *)data;
1423		unsigned char tmpch = '\0';
1424	<	unsigned int nonwild = 0;
1424	>	unsigned int nonwild = 0, wild = 0;
1425
1426		while ((tmpch = *p++))
1427		{
#	Line 1479 | Line 1436 | valid_wild_card_simple(const char *data)
1436		if (++nonwild >= ConfigGeneral.min_nonwildcard_simple)
1437		return 1;
1438		}
1439	+	else
1440	+	++wild;
1441		}
1442
1443	<	return 0;
1443	>	return !wild;
1444		}
1445
1446		/* valid_wild_card()
#	Line 1493 | Line 1452 | valid_wild_card_simple(const char *data)
1452		* side effects - NOTICE is given to source_p if warn is 1
1453		*/
1454		int
1455	<	valid_wild_card(struct Client *source_p, int warn, int count, ...)
1455	>	valid_wild_card(struct Client *source_p, int count, ...)
1456		{
1457		unsigned char tmpch = '\0';
1458		unsigned int nonwild = 0;
#	Line 1536 | Line 1495 | valid_wild_card(struct Client *source_p,
1495		}
1496		}
1497
1498	<	if (warn)
1498	>	if (IsClient(source_p))
1499		sendto_one_notice(source_p, &me,
1500		":Please include at least %u non-wildcard characters with the mask",
1501		ConfigGeneral.min_nonwildcard);
#	Line 1544 | Line 1503 | valid_wild_card(struct Client *source_p,
1503		return 0;
1504		}
1505
1506	+	/* find_user_host()
1507	+	*
1508	+	* inputs       - pointer to client placing kline
1509	+	*              - pointer to user_host_or_nick
1510	+	*              - pointer to user buffer
1511	+	*              - pointer to host buffer
1512	+	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1513	+	* side effects -
1514	+	*/
1515	+	static int
1516	+	find_user_host(struct Client *source_p, char *user_host_or_nick,
1517	+	char *luser, char *lhost)
1518	+	{
1519	+	struct Client *target_p = NULL;
1520	+	char *hostp = NULL;
1521	+
1522	+	if (lhost == NULL)
1523	+	{
1524	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1525	+	return 1;
1526	+	}
1527	+
1528	+	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1529	+	{
1530	+	/* Explicit user@host mask given */
1531	+	if (hostp)                            /* I'm a little user@host */
1532	+	{
1533	+	*(hostp++) = '\0';                       /* short and squat */
1534	+
1535	+	if (*user_host_or_nick)
1536	+	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1537	+	else
1538	+	strcpy(luser, "*");
1539	+
1540	+	if (*hostp)
1541	+	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1542	+	else
1543	+	strcpy(lhost, "*");
1544	+	}
1545	+	else
1546	+	{
1547	+	luser[0] = '*';             /* no @ found, assume its *@somehost */
1548	+	luser[1] = '\0';
1549	+	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1550	+	}
1551	+
1552	+	return 1;
1553	+	}
1554	+	else
1555	+	{
1556	+	/* Try to find user@host mask from nick */
1557	+	/* Okay to use source_p as the first param, because source_p == client_p */
1558	+	if ((target_p =
1559	+	find_chasing(source_p, user_host_or_nick)) == NULL)
1560	+	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1561	+
1562	+	if (HasFlag(target_p, FLAGS_EXEMPTKLINE))
1563	+	{
1564	+	if (IsClient(source_p))
1565	+	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1566	+	return 0;
1567	+	}
1568	+
1569	+	/*
1570	+	* Turn the "user" bit into "*user", blow away '~'
1571	+	* if found in original user name (non-idented)
1572	+	*/
1573	+	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1574	+
1575	+	if (target_p->username[0] == '~')
1576	+	luser[0] = '*';
1577	+
1578	+	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1579	+	return 1;
1580	+	}
1581	+
1582	+	return 0;
1583	+	}
1584	+
1585		/* XXX should this go into a separate file ? -Dianora */
1586		/* parse_aline
1587		*
#	Line 1558 | Line 1596 | valid_wild_card(struct Client *source_p,
1596		*              - pointer to target_server to parse into if non NULL
1597		*              - pointer to reason to parse into
1598		*
1599	<	* output       - 1 if valid, -1 if not valid
1599	>	* output       - 1 if valid, 0 if not valid
1600		* side effects - A generalised k/d/x etc. line parser,
1601		*               "ALINE [time] user@host|string [ON] target :reason"
1602		*                will parse returning a parsed user, host if
#	Line 1581 | Line 1619 | parse_aline(const char *cmd, struct Clie
1619		char **target_server, char **reason)
1620		{
1621		int found_tkline_time=0;
1622	<	static char def_reason[] = CONF_NOREASON;
1622	>	static char default_reason[] = CONF_NOREASON;
1623		static char user[USERLEN*4+1];
1624		static char host[HOSTLEN*4+1];
1625
#	Line 1590 | Line 1628 | parse_aline(const char *cmd, struct Clie
1628
1629		found_tkline_time = valid_tkline(*parv, TK_MINUTES);
1630
1631	<	if (found_tkline_time != 0)
1631	>	if (found_tkline_time)
1632		{
1633		parv++;
1634		parc--;
1635
1636	<	if (tkline_time != NULL)
1636	>	if (tkline_time)
1637		*tkline_time = found_tkline_time;
1638		else
1639		{
1640		sendto_one_notice(source_p, &me, ":temp_line not supported by %s", cmd);
1641	<	return -1;
1641	>	return 0;
1642		}
1643		}
1644
1645		if (parc == 0)
1646		{
1647		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1648	<	return -1;
1648	>	return 0;
1649		}
1650
1651		if (h_p == NULL)
1652		*up_p = *parv;
1653		else
1654		{
1655	<	if (find_user_host(source_p, *parv, user, host, parse_flags) == 0)
1656	<	return -1;
1655	>	if (find_user_host(source_p, *parv, user, host) == 0)
1656	>	return 0;
1657
1658		*up_p = user;
1659		*h_p = host;
#	Line 1624 | Line 1662 | parse_aline(const char *cmd, struct Clie
1662		parc--;
1663		parv++;
1664
1665	<	if (parc != 0)
1665	>	if (parc)
1666		{
1667		if (irccmp(*parv, "ON") == 0)
1668		{
1669		parc--;
1670		parv++;
1671
1634	–	if (target_server == NULL)
1635	–	{
1636	–	sendto_one_notice(source_p, &me, ":ON server not supported by %s", cmd);
1637	–	return -1;
1638	–	}
1639	–
1672		if (!HasOFlag(source_p, OPER_FLAG_REMOTEBAN))
1673		{
1674		sendto_one_numeric(source_p, &me, ERR_NOPRIVS, "remoteban");
1675	<	return -1;
1675	>	return 0;
1676		}
1677
1678		if (parc == 0 || EmptyString(*parv))
1679		{
1680		sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, cmd);
1681	<	return -1;
1681	>	return 0;
1682		}
1683
1684		*target_server = *parv;
#	Line 1658 | Line 1690 | parse_aline(const char *cmd, struct Clie
1690		/* Make sure target_server *is* NULL if no ON server found
1691		* caller probably NULL'd it first, but no harm to do it again -db
1692		*/
1693	<	if (target_server != NULL)
1693	>	if (target_server)
1694		*target_server = NULL;
1695		}
1696		}
1697
1698	<	if (h_p != NULL)
1698	>	if (h_p)
1699		{
1700	<	if (strchr(user, '!') != NULL)
1700	>	if (strchr(user, '!'))
1701		{
1702		sendto_one_notice(source_p, &me, ":Invalid character '!' in kline");
1703	<	return -1;
1703	>	return 0;
1704		}
1705
1706	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 2, *up_p, *h_p))
1707	<	return -1;
1706	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 2, *up_p, *h_p))
1707	>	return 0;
1708		}
1709		else
1710	<	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, 1, *up_p))
1711	<	return -1;
1710	>	if ((parse_flags & AWILD) && !valid_wild_card(source_p, 1, *up_p))
1711	>	return 0;
1712
1713	<	if (reason != NULL)
1713	>	if (reason)
1714		{
1715	<	if (parc != 0 && !EmptyString(*parv))
1684	<	{
1715	>	if (parc && !EmptyString(*parv))
1716		*reason = *parv;
1686	–	if (!valid_comment(source_p, *reason, 1))
1687	–	return -1;
1688	–	}
1689	–	else
1690	–	*reason = def_reason;
1691	–	}
1692	–
1693	–	return 1;
1694	–	}
1695	–
1696	–	/* find_user_host()
1697	–	*
1698	–	* inputs       - pointer to client placing kline
1699	–	*              - pointer to user_host_or_nick
1700	–	*              - pointer to user buffer
1701	–	*              - pointer to host buffer
1702	–	* output       - 0 if not ok to kline, 1 to kline i.e. if valid user host
1703	–	* side effects -
1704	–	*/
1705	–	static int
1706	–	find_user_host(struct Client *source_p, char *user_host_or_nick,
1707	–	char *luser, char *lhost, unsigned int flags)
1708	–	{
1709	–	struct Client *target_p = NULL;
1710	–	char *hostp = NULL;
1711	–
1712	–	if (lhost == NULL)
1713	–	{
1714	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1);
1715	–	return 1;
1716	–	}
1717	–
1718	–	if ((hostp = strchr(user_host_or_nick, '@')) || *user_host_or_nick == '*')
1719	–	{
1720	–	/* Explicit user@host mask given */
1721	–
1722	–	if (hostp != NULL)                            /* I'm a little user@host */
1723	–	{
1724	–	*(hostp++) = '\0';                       /* short and squat */
1725	–	if (*user_host_or_nick)
1726	–	strlcpy(luser, user_host_or_nick, USERLEN*4 + 1); /* here is my user */
1727	–	else
1728	–	strcpy(luser, "*");
1729	–
1730	–	if (*hostp)
1731	–	strlcpy(lhost, hostp, HOSTLEN + 1);    /* here is my host */
1732	–	else
1733	–	strcpy(lhost, "*");
1734	–	}
1735	–	else
1736	–	{
1737	–	luser[0] = '*';             /* no @ found, assume its *@somehost */
1738	–	luser[1] = '\0';
1739	–	strlcpy(lhost, user_host_or_nick, HOSTLEN*4 + 1);
1740	–	}
1741	–
1742	–	return 1;
1743	–	}
1744	–	else
1745	–	{
1746	–	/* Try to find user@host mask from nick */
1747	–	/* Okay to use source_p as the first param, because source_p == client_p */
1748	–	if ((target_p =
1749	–	find_chasing(source_p, user_host_or_nick)) == NULL)
1750	–	return 0;  /* find_chasing sends ERR_NOSUCHNICK */
1751	–
1752	–	if (IsExemptKline(target_p))
1753	–	{
1754	–	if (IsClient(source_p))
1755	–	sendto_one_notice(source_p, &me, ":%s is E-lined", target_p->name);
1756	–	return 0;
1757	–	}
1758	–
1759	–	/*
1760	–	* turn the "user" bit into "*user", blow away '~'
1761	–	* if found in original user name (non-idented)
1762	–	*/
1763	–	strlcpy(luser, target_p->username, USERLEN*4 + 1);
1764	–
1765	–	if (target_p->username[0] == '~')
1766	–	luser[0] = '*';
1767	–
1768	–	if (!strcmp(target_p->sockhost, "0"))
1769	–	strlcpy(lhost, target_p->host, HOSTLEN*4 + 1);
1717		else
1718	<	strlcpy(lhost, target_p->sockhost, HOSTLEN*4 + 1);
1772	<	return 1;
1718	>	*reason = default_reason;
1719		}
1720
1775	–	return 0;
1776	–	}
1777	–
1778	–	/* valid_comment()
1779	–	*
1780	–	* inputs       - pointer to client
1781	–	*              - pointer to comment
1782	–	* output       - 0 if no valid comment,
1783	–	*              - 1 if valid
1784	–	* side effects - truncates reason where necessary
1785	–	*/
1786	–	int
1787	–	valid_comment(struct Client *source_p, char *comment, int warn)
1788	–	{
1789	–	if (strlen(comment) > REASONLEN)
1790	–	comment[REASONLEN-1] = '\0';
1791	–
1721		return 1;
1722		}
1723
#	Line 1820 | Line 1749 | match_conf_password(const char *password
1749		*
1750		* inputs       - client sending the cluster
1751		*              - command name "KLINE" "XLINE" etc.
1752	<	*              - capab -- CAP_KLN etc. from server.h
1752	>	*              - capab -- CAPAB_KLN etc. from server.h
1753		*              - cluster type -- CLUSTER_KLINE etc. from conf.h
1754		*              - pattern and args to send along
1755		* output       - none
#	Line 1828 | Line 1757 | match_conf_password(const char *password
1757		*                along to all servers that match capab and cluster type
1758		*/
1759		void
1760	<	cluster_a_line(struct Client *source_p, const char *command,
1761	<	int capab, int cluster_type, const char *pattern, ...)
1760	>	cluster_a_line(struct Client *source_p, const char *command, unsigned int capab,
1761	>	unsigned int cluster_type, const char *pattern, ...)
1762		{
1763		va_list args;
1764		char buffer[IRCD_BUFSIZE] = "";
#	Line 1844 | Line 1773 | cluster_a_line(struct Client *source_p,
1773		const struct MaskItem *conf = node->data;
1774
1775		if (conf->flags & cluster_type)
1776	<	sendto_match_servs(source_p, conf->name, CAP_CLUSTER|capab,
1776	>	sendto_match_servs(source_p, conf->name, CAPAB_CLUSTER | capab,
1777		"%s %s %s", command, conf->name, buffer);
1778		}
1779		}
#	Line 1884 | Line 1813 | split_nuh(struct split_nuh_item *const i
1813
1814		if (iptr->nickptr)
1815		strlcpy(iptr->nickptr, "*", iptr->nicksize);
1816	+
1817		if (iptr->userptr)
1818		strlcpy(iptr->userptr, "*", iptr->usersize);
1819	+
1820		if (iptr->hostptr)
1821		strlcpy(iptr->hostptr, "*", iptr->hostsize);
1822
#	Line 1928 | Line 1859 | split_nuh(struct split_nuh_item *const i
1859		}
1860		else
1861		{
1862	<	/* no @ found */
1862	>	/* No @ found */
1863		if (!iptr->nickptr || strpbrk(iptr->nuhmask, ".:"))
1864		strlcpy(iptr->hostptr, iptr->nuhmask, iptr->hostsize);
1865		else

Diff Legend

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