ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_user.c (file contents), Revision 1559 by michael, Sun Oct 14 01:38:28 2012 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2175 by michael, Mon Jun 3 23:45:39 2013 UTC

#	Line 32 | Line 32
32		#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
35	–	#include "sprintf_irc.h"
35		#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
#	Line 53 | Line 52
52		#include "parse.h"
53		#include "watch.h"
54
56	–
57	–	struct Callback *entering_umode_cb = NULL;
58	–	struct Callback *umode_cb = NULL;
59	–
55		static char umode_buffer[IRCD_BUFSIZE];
56
57		static void user_welcome(struct Client *);
58	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
58	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
59		static int check_xline(struct Client *);
60		static void introduce_client(struct Client *);
61		static const char *uid_get(void);
#	Line 77 | Line 72 | struct Isupport
72		int number;
73		};
74
75	<	static dlink_list support_list = { NULL, NULL, 0 };
76	<	MessageFile *isupportFile;
75	>	static dlink_list support_list;
76	>	static dlink_list support_list_lines;
77
78		/* memory is cheap. map 0-255 to equivalent mode */
79	<	unsigned int user_modes[256] =
79	>	const unsigned int user_modes[256] =
80		{
81		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
82		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 93 | Line 88 | unsigned int user_modes[256] =
88		UMODE_CCONN_FULL,   /* C */
89		UMODE_DEAF,         /* D */
90		0,                  /* E */
91	<	0,                  /* F */
91	>	UMODE_FARCONNECT,   /* F */
92		UMODE_SOFTCALLERID, /* G */
93		UMODE_HIDDEN,       /* H */
94		0,                  /* I */
#	Line 120 | Line 115 | unsigned int user_modes[256] =
115		UMODE_BOTS,         /* b */
116		UMODE_CCONN,        /* c */
117		UMODE_DEBUG,        /* d */
118	<	0,                  /* e */
118	>	UMODE_EXTERNAL,     /* e */
119		UMODE_FULL,         /* f */
120		UMODE_CALLERID,     /* g */
121		0,                  /* h */
#	Line 139 | Line 134 | unsigned int user_modes[256] =
134		UMODE_UNAUTH,       /* u */
135		0,                  /* v */
136		UMODE_WALLOP,       /* w */
137	<	UMODE_EXTERNAL,     /* x */
137	>	UMODE_HIDDENHOST,   /* x */
138		UMODE_SPY,          /* y */
139		UMODE_OPERWALL,     /* z      0x7A */
140		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 214 | Line 209 | show_lusers(struct Client *source_p)
209		sendto_one(source_p, form_str(RPL_LUSERME),
210		from, to, Count.local, Count.myserver);
211		sendto_one(source_p, form_str(RPL_LOCALUSERS),
212	<	from, to, Count.local, Count.max_loc,
218	<	Count.local, Count.max_loc);
212	>	from, to, Count.local, Count.max_loc);
213		}
214		else
215		{
216		sendto_one(source_p, form_str(RPL_LUSERME),
217		from, to, Count.total, 0);
218		sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.total, Count.max_tot,
226	<	Count.total, Count.max_tot);
219	>	from, to, Count.total, Count.max_tot);
220		}
221
222		sendto_one(source_p, form_str(RPL_GLOBALUSERS),
223	<	from, to, Count.total, Count.max_tot,
231	<	Count.total, Count.max_tot);
223	>	from, to, Count.total, Count.max_tot);
224
225		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
226		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
#	Line 250 | Line 242 | show_lusers(struct Client *source_p)
242		void
243		show_isupport(struct Client *source_p)
244		{
245	<	send_message_file(source_p, isupportFile);
245	>	const dlink_node *ptr = NULL;
246	>
247	>	DLINK_FOREACH(ptr, support_list_lines.head)
248	>	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
249	>	source_p->name, ptr->data);
250		}
251
252		/*
#	Line 280 | Line 276 | void
276		register_local_user(struct Client *source_p)
277		{
278		const char *id = NULL;
279	<	const struct AccessItem *aconf = NULL;
284	<	dlink_node *ptr = NULL;
279	>	const struct MaskItem *conf = NULL;
280
281		assert(source_p != NULL);
282		assert(source_p == source_p->from);
#	Line 312 | Line 307 | register_local_user(struct Client *sourc
307		/* Straight up the maximum rate of flooding... */
308		source_p->localClient->allow_read = MAX_FLOOD_BURST;
309
310	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
310	>	if (!check_client(source_p))
311		return;
312
313		if (valid_hostname(source_p->host) == 0)
#	Line 323 | Line 318 | register_local_user(struct Client *sourc
318		sizeof(source_p->host));
319		}
320
321	<	ptr   = source_p->localClient->confs.head;
327	<	aconf = map_to_conf(ptr->data);
321	>	conf = source_p->localClient->confs.head->data;
322
323		if (!IsGotId(source_p))
324		{
#	Line 332 | Line 326 | register_local_user(struct Client *sourc
326		const char *p = username;
327		unsigned int i = 0;
328
329	<	if (IsNeedIdentd(aconf))
329	>	if (IsNeedIdentd(conf))
330		{
331		++ServerStats.is_ref;
332		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
#	Line 343 | Line 337 | register_local_user(struct Client *sourc
337
338		strlcpy(username, source_p->username, sizeof(username));
339
340	<	if (!IsNoTilde(aconf))
340	>	if (!IsNoTilde(conf))
341		source_p->username[i++] = '~';
342
343		for (; *p && i < USERLEN; ++p)
#	Line 354 | Line 348 | register_local_user(struct Client *sourc
348		}
349
350		/* password check */
351	<	if (!EmptyString(aconf->passwd))
351	>	if (!EmptyString(conf->passwd))
352		{
353		const char *pass = source_p->localClient->passwd;
354
355	<	if (!match_conf_password(pass, aconf))
355	>	if (!match_conf_password(pass, conf))
356		{
357		++ServerStats.is_ref;
358		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
#	Line 374 | Line 368 | register_local_user(struct Client *sourc
368		*/
369
370		/* report if user has &^>= etc. and set flags as needed in source_p */
371	<	report_and_set_user_flags(source_p, aconf);
371	>	report_and_set_user_flags(source_p, conf);
372
373		if (IsDead(source_p))
374		return;
#	Line 390 | Line 384 | register_local_user(struct Client *sourc
384		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
386		{
387	<	sendto_realops_flags(UMODE_FULL, L_ALL,
387	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
388		"Too many clients, rejecting %s[%s].",
389		source_p->name, source_p->host);
390		++ServerStats.is_ref;
#	Line 399 | Line 393 | register_local_user(struct Client *sourc
393		}
394
395		/* valid user name check */
396	<	if (valid_username(source_p->username) == 0)
396	>	if (valid_username(source_p->username, 1) == 0)
397		{
398		char tmpstr2[IRCD_BUFSIZE];
399
400	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
400	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
401	>	"Invalid username: %s (%s@%s)",
402		source_p->name, source_p->username, source_p->host);
403		++ServerStats.is_ref;
404		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
#	Line 421 | Line 416 | register_local_user(struct Client *sourc
416		strlcpy(source_p->id, id, sizeof(source_p->id));
417		hash_add_id(source_p);
418
419	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
419	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
420		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
421		source_p->name, source_p->username, source_p->host,
422		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
423		"255.255.255.255" : source_p->sockhost,
424	<	get_client_class(source_p),
424	>	get_client_class(&source_p->localClient->confs),
425		source_p->info, source_p->id);
426
427	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
427	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
428		"CLICONN %s %s %s %s %s %s %s 0 %s",
429		source_p->name, source_p->username, source_p->host,
430		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431		"255.255.255.255" : source_p->sockhost,
432	<	get_client_class(source_p),
432	>	get_client_class(&source_p->localClient->confs),
433		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434		"<hidden>" : source_p->localClient->client_host,
435		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
#	Line 453 | Line 448 | register_local_user(struct Client *sourc
448		Count.max_loc = Count.local;
449
450		if (!(Count.max_loc % 10))
451	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
451	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
452	>	"New Max Local Clients: %d",
453		Count.max_loc);
454		}
455
#	Line 509 | Line 505 | register_remote_user(struct Client *sour
505		*/
506		source_p->servptr = hash_find_server(server);
507
508	<	/* Super GhostDetect:
508	>	/*
509	>	* Super GhostDetect:
510		* If we can't find the server the user is supposed to be on,
511		* then simply blow the user away.        -Taner
512		*/
513		if (source_p->servptr == NULL)
514		{
515	<	sendto_realops_flags(UMODE_ALL, L_ALL,
515	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
516		"No server %s for user %s[%s@%s] from %s",
517		server, source_p->name, source_p->username,
518		source_p->host, source_p->from->name);
#	Line 528 | Line 525 | register_remote_user(struct Client *sour
525
526		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
527		{
528	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
528	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
529		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
530		source_p->from->name, source_p->name, source_p->username,
531		source_p->host, source_p->servptr->name,
#	Line 557 | Line 554 | register_remote_user(struct Client *sour
554		add_user_host(source_p->username, source_p->host, 1);
555		SetUserHost(source_p);
556
557	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
558	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
559	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
560	+	source_p->servptr->name,
561	+	source_p->name, source_p->username, source_p->host,
562	+	source_p->info, source_p->id);
563	+
564		introduce_client(source_p);
565		}
566
#	Line 658 | Line 662 | valid_hostname(const char *hostname)
662		if (!IsHostChar(*p))
663		return 0;
664
665	<	return 1;
665	>	return p - hostname <= HOSTLEN;
666		}
667
668		/* valid_username()
#	Line 673 | Line 677 | valid_hostname(const char *hostname)
677		* style of username
678		*/
679		int
680	<	valid_username(const char *username)
680	>	valid_username(const char *username, const int local)
681		{
682		int dots      = 0;
683		const char *p = username;
#	Line 683 | Line 687 | valid_username(const char *username)
687		if (*p == '~')
688		++p;
689
690	<	/* reject usernames that don't start with an alphanum
690	>	/*
691	>	* Reject usernames that don't start with an alphanum
692		* i.e. reject jokers who have '-@somehost' or '.@somehost'
693		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
694		*/
695		if (!IsAlNum(*p))
696		return 0;
697
698	<	while (*++p)
698	>	if (local)
699		{
700	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
700	>	while (*++p)
701		{
702	<	if (++dots > ConfigFileEntry.dots_in_ident)
703	<	return 0;
704	<	if (!IsUserChar(*(p + 1)))
702	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
703	>	{
704	>	if (++dots > ConfigFileEntry.dots_in_ident)
705	>	return 0;
706	>	if (!IsUserChar(*(p + 1)))
707	>	return 0;
708	>	}
709	>	else if (!IsUserChar(*p))
710		return 0;
711		}
712	<	else if (!IsUserChar(*p))
713	<	return 0;
712	>	}
713	>	else
714	>	{
715	>	while (*++p)
716	>	if (!IsUserChar(*p))
717	>	return 0;
718		}
719
720	<	return 1;
720	>	return  p - username <= USERLEN;;
721		}
722
723		/* clean_nick_name()
#	Line 734 | Line 748 | valid_nickname(const char *nickname, con
748		/* report_and_set_user_flags()
749		*
750		* inputs       - pointer to source_p
751	<	*              - pointer to aconf for this user
751	>	*              - pointer to conf for this user
752		* output       - NONE
753		* side effects - Report to user any special flags
754		*                they are getting, and set them.
755		*/
756		static void
757	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
757	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
758		{
759		/* If this user is being spoofed, tell them so */
760	<	if (IsConfDoSpoofIp(aconf))
747	<	{
760	>	if (IsConfDoSpoofIp(conf))
761		sendto_one(source_p,
762	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
762	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
763		me.name, source_p->name);
751	–	}
764
765		/* If this user is in the exception class, Set it "E lined" */
766	<	if (IsConfExemptKline(aconf))
766	>	if (IsConfExemptKline(conf))
767		{
768		SetExemptKline(source_p);
769		sendto_one(source_p,
770	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
770	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
771		me.name, source_p->name);
772		}
773
774		/* The else here is to make sure that G line exempt users
775		* do not get noticed twice.
776		*/
777	<	else if (IsConfExemptGline(aconf))
777	>	else if (IsConfExemptGline(conf))
778		{
779		SetExemptGline(source_p);
780	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
780	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
781		me.name, source_p->name);
782		}
783
784	<	if (IsConfExemptResv(aconf))
784	>	if (IsConfExemptResv(conf))
785		{
786		SetExemptResv(source_p);
787	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
787	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
788		me.name, source_p->name);
789		}
790
791		/* If this user is exempt from user limits set it "F lined" */
792	<	if (IsConfExemptLimits(aconf))
792	>	if (IsConfExemptLimits(conf))
793		{
794		SetExemptLimits(source_p);
795		sendto_one(source_p,
796	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
796	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
797		me.name,source_p->name);
798		}
799
800	<	if (IsConfCanFlood(aconf))
800	>	if (IsConfCanFlood(conf))
801		{
802		SetCanFlood(source_p);
803		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 794 | Line 806 | report_and_set_user_flags(struct Client
806		}
807		}
808
797	–	/* change_simple_umode()
798	–	*
799	–	* this callback can be hooked to allow special handling of
800	–	* certain usermodes
801	–	*/
802	–	static void *
803	–	change_simple_umode(va_list args)
804	–	{
805	–	struct Client *client_p;
806	–	struct Client *source_p;
807	–	int what;
808	–	unsigned int flag;
809	–
810	–	client_p = va_arg(args, struct Client *);
811	–	source_p = va_arg(args, struct Client *);
812	–	what = va_arg(args, int);
813	–	flag = va_arg(args, unsigned int);
814	–
815	–	if (what == MODE_ADD)
816	–	AddUMode(source_p, flag);
817	–	else
818	–	DelUMode(source_p, flag);
819	–
820	–	return NULL;
821	–	}
822	–
809		/* set_user_mode()
810		*
811		* added 15/10/91 By Darren Reed.
#	Line 829 | Line 815 | change_simple_umode(va_list args)
815		*/
816		void
817		set_user_mode(struct Client *client_p, struct Client *source_p,
818	<	int parc, char *parv[])
818	>	const int parc, char *parv[])
819		{
820		unsigned int flag, setflags;
821		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 846 | Line 832 | set_user_mode(struct Client *client_p, s
832		return;
833		}
834
849	–	if (IsServer(source_p))
850	–	{
851	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
852	–	parv[1], source_p->name);
853	–	return;
854	–	}
855	–
835		if (source_p != target_p)
836		{
837		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
#	Line 875 | Line 854 | set_user_mode(struct Client *client_p, s
854		return;
855		}
856
878	–	execute_callback(entering_umode_cb, client_p, source_p);
879	–
857		/* find flags already set for user */
858		setflags = source_p->umodes;
859
#	Line 917 | Line 894 | set_user_mode(struct Client *client_p, s
894		{
895		dlink_node *dm;
896
897	<	detach_conf(source_p, OPER_TYPE);
897	>	detach_conf(source_p, CONF_OPER);
898		ClrOFlag(source_p);
899		DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
900
#	Line 928 | Line 905 | set_user_mode(struct Client *client_p, s
905
906		break;
907
908	<	/* we may not get these,
909	<	* but they shouldnt be in default
933	<	*/
934	<	case 'r':
935	<	case ' ' :
936	<	case '\n':
937	<	case '\r':
938	<	case '\t':
908	>	case 'r':  /* Only services may set +r */
909	>	case 'x':  /* Only services may set +x */
910		break;
911
912		default:
#	Line 943 | Line 914 | set_user_mode(struct Client *client_p, s
914		{
915		if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
916		(ConfigFileEntry.oper_only_umodes & flag))
946	–	{
917		badflag = 1;
948	–	}
918		else
919	<	execute_callback(umode_cb, client_p, source_p, what, flag);
919	>	{
920	>	if (what == MODE_ADD)
921	>	AddUMode(source_p, flag);
922	>	else
923	>	DelUMode(source_p, flag);
924	>	}
925		}
926		else
927		{
#	Line 964 | Line 938 | set_user_mode(struct Client *client_p, s
938		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
939		me.name, source_p->name);
940
967	–	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
968	–	{
969	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
970	–	me.name, source_p->name);
971	–	DelUMode(source_p, UMODE_NCHANGE);
972	–	}
973	–
941		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
942		!HasOFlag(source_p, OPER_FLAG_ADMIN))
943		{
#	Line 1088 | Line 1055 | send_umode_out(struct Client *client_p,
1055		send_umode(client_p, source_p, old, 0xffffffff, buf);
1056		}
1057
1058	+	void
1059	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1060	+	{
1061	+	dlink_node *ptr = NULL;
1062	+
1063	+	if (!strcmp(target_p->host, hostname))
1064	+	return;
1065	+
1066	+	switch (what)
1067	+	{
1068	+	case MODE_ADD:
1069	+	AddUMode(target_p, UMODE_HIDDENHOST);
1070	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1071	+	break;
1072	+	case MODE_DEL:
1073	+	DelUMode(target_p, UMODE_HIDDENHOST);
1074	+
1075	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1076	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1077	+	break;
1078	+	default: return;
1079	+	}
1080	+
1081	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1082	+	target_p->name, target_p->username, target_p->host);
1083	+
1084	+	if (IsUserHostIp(target_p))
1085	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1086	+
1087	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1088	+
1089	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1090	+	SetUserHost(target_p);
1091	+
1092	+	if (MyClient(target_p))
1093	+	{
1094	+	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1095	+	target_p->name, target_p->host);
1096	+	clear_ban_cache_client(target_p);
1097	+	}
1098	+
1099	+	DLINK_FOREACH(ptr, target_p->channel.head)
1100	+	{
1101	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1102	+	char *p = modebuf;
1103	+	int len = 0;
1104	+	const struct Membership *ms = ptr->data;
1105	+
1106	+	if (has_member_flags(ms, CHFL_CHANOP)) {
1107	+	*p++ = 'o';
1108	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1109	+	}
1110	+
1111	+	if (has_member_flags(ms, CHFL_HALFOP)) {
1112	+	*p++ = 'h';
1113	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1114	+	}
1115	+
1116	+	if (has_member_flags(ms, CHFL_VOICE)) {
1117	+	*p++ = 'v';
1118	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1119	+	}
1120	+
1121	+	*p = '\0';
1122	+
1123	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1124	+	target_p->name, target_p->username, target_p->host,
1125	+	ms->chptr->chname);
1126	+	if (nickbuf[0])
1127	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1128	+	target_p->servptr->name, ms->chptr->chname,
1129	+	modebuf, nickbuf);
1130	+
1131	+	}
1132	+
1133	+	if (target_p->away[0])
1134	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1135	+	":%s!%s@%s AWAY :%s",
1136	+	target_p->name, target_p->username,
1137	+	target_p->host, target_p->away);
1138	+	}
1139	+
1140		/* user_welcome()
1141		*
1142		* inputs       - client pointer to client to welcome
#	Line 1125 | Line 1174 | user_welcome(struct Client *source_p)
1174		source_p->name, source_p->id);
1175
1176		show_lusers(source_p);
1177	<
1129	<	if (ConfigFileEntry.short_motd)
1130	<	{
1131	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1132	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1133	<	sendto_one(source_p,
1134	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1135	<	"read it", me.name, source_p->name);
1136	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1137	<	me.name, source_p->name, me.name);
1138	<	sendto_one(source_p, form_str(RPL_MOTD),
1139	<	me.name, source_p->name,
1140	<	"*** This is the short motd ***");
1141	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1142	<	me.name, source_p->name);
1143	<	}
1144	<	else
1145	<	send_message_file(source_p, &ConfigFileEntry.motd);
1177	>	motd_signon(source_p);
1178		}
1179
1180		/* check_xline()
#	Line 1154 | Line 1186 | user_welcome(struct Client *source_p)
1186		static int
1187		check_xline(struct Client *source_p)
1188		{
1189	<	struct ConfItem *conf = NULL;
1189	>	struct MaskItem *conf = NULL;
1190		const char *reason = NULL;
1191
1192	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1161	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1192	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1193		{
1194	<	struct MatchItem *reg = map_to_conf(conf);
1194	>	++conf->count;
1195
1196	<	++reg->count;
1197	<
1167	<	if (reg->reason != NULL)
1168	<	reason = reg->reason;
1196	>	if (conf->reason != NULL)
1197	>	reason = conf->reason;
1198		else
1199		reason = "No Reason";
1200
1201	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1201	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1202		"X-line Rejecting [%s] [%s], user %s [%s]",
1203		source_p->info, reason,
1204		get_client_name(source_p, HIDE_IP),
#	Line 1187 | Line 1216 | check_xline(struct Client *source_p)
1216		*
1217		* inputs       - pointer to given client to oper
1218		* output       - NONE
1219	<	* side effects - Blindly opers up given source_p, using aconf info
1219	>	* side effects - Blindly opers up given source_p, using conf info
1220		*                all checks on passwords have already been done.
1221		*                This could also be used by rsa oper routines.
1222		*/
#	Line 1195 | Line 1224 | void
1224		oper_up(struct Client *source_p)
1225		{
1226		const unsigned int old = source_p->umodes;
1227	<	const struct AccessItem *oconf = NULL;
1227	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1228
1229		assert(source_p->localClient->confs.head);
1201	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1230
1231		++Count.oper;
1232		SetOper(source_p);
1233
1234	<	if (oconf->modes)
1235	<	AddUMode(source_p, oconf->modes);
1234	>	if (conf->modes)
1235	>	AddUMode(source_p, conf->modes);
1236		else if (ConfigFileEntry.oper_umodes)
1237		AddUMode(source_p, ConfigFileEntry.oper_umodes);
1238
#	Line 1216 | Line 1244 | oper_up(struct Client *source_p)
1244		assert(dlinkFind(&oper_list, source_p) == NULL);
1245		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1246
1247	<	AddOFlag(source_p, oconf->port);
1247	>	AddOFlag(source_p, conf->port);
1248
1249		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1250		AddUMode(source_p, UMODE_ADMIN);
1223	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1224	–	DelUMode(source_p, UMODE_NCHANGE);
1251
1252	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s is now an operator",
1252	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1253		get_oper_name(source_p));
1254		send_umode_out(source_p, source_p, old);
1255		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
#	Line 1254 | Line 1280 | valid_sid(const char *sid)
1280		void
1281		init_uid(void)
1282		{
1283	<	int i;
1283	>	unsigned int i;
1284
1285		memset(new_uid, 0, sizeof(new_uid));
1286
#	Line 1271 | Line 1297 | init_uid(void)
1297		* -Dianora
1298		*/
1299		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1274	–
1275	–	entering_umode_cb = register_callback("entering_umode", NULL);
1276	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1300		}
1301
1302		/*
#	Line 1333 | Line 1356 | uid_get(void)
1356		void
1357		init_isupport(void)
1358		{
1336	–	isupportFile = init_MessageLine();
1337	–
1359		add_isupport("CALLERID", NULL, -1);
1360		add_isupport("CASEMAPPING", CASEMAP, -1);
1361		add_isupport("DEAF", "D", -1);
1362		add_isupport("KICKLEN", NULL, KICKLEN);
1363		add_isupport("MODES", NULL, MAXMODEPARAMS);
1343	–	add_isupport("NICKLEN", NULL, NICKLEN);
1364		#ifdef HALFOPS
1365		add_isupport("PREFIX", "(ohv)@%+", -1);
1366		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1348 | Line 1368 | init_isupport(void)
1368		add_isupport("PREFIX", "(ov)@+", -1);
1369		add_isupport("STATUSMSG", "@+", -1);
1370		#endif
1371	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1371	>	add_isupport("EXCEPTS", "e", -1);
1372	>	add_isupport("INVEX", "I", -1);
1373		}
1374
1375		/*
#	Line 1383 | Line 1404 | add_isupport(const char *name, const cha
1404		dlinkAddTail(support, &support->node, &support_list);
1405		}
1406
1407	<	DupString(support->name, name);
1407	>	support->name = xstrdup(name);
1408		if (options != NULL)
1409	<	DupString(support->options, options);
1409	>	support->options = xstrdup(options);
1410		support->number = n;
1411
1412		rebuild_isupport_message_line();
#	Line 1432 | Line 1453 | rebuild_isupport_message_line(void)
1453		{
1454		char isupportbuffer[IRCD_BUFSIZE];
1455		char *p = isupportbuffer;
1456	<	dlink_node *ptr = NULL;
1456	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1457		int n = 0;
1458		int tokens = 0;
1459		size_t len = 0;
1460		size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1461
1462	<	destroy_MessageLine(isupportFile);
1462	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1463	>	{
1464	>	dlinkDelete(ptr, &support_list_lines);
1465	>	MyFree(ptr->data);
1466	>	free_dlink_node(ptr);
1467	>	}
1468
1469		DLINK_FOREACH(ptr, support_list.head)
1470		{
1471		struct Isupport *support = ptr->data;
1472
1473	<	p += (n = ircsprintf(p, "%s", support->name));
1473	>	p += (n = sprintf(p, "%s", support->name));
1474		len += n;
1475
1476		if (support->options != NULL)
1477		{
1478	<	p += (n = ircsprintf(p, "=%s", support->options));
1478	>	p += (n = sprintf(p, "=%s", support->options));
1479		len += n;
1480		}
1481
1482		if (support->number > 0)
1483		{
1484	<	p += (n = ircsprintf(p, "=%d", support->number));
1484	>	p += (n = sprintf(p, "=%d", support->number));
1485		len += n;
1486		}
1487
#	Line 1468 | Line 1494 | rebuild_isupport_message_line(void)
1494		if (*--p == ' ')
1495		*p = '\0';
1496
1497	<	addto_MessageLine(isupportFile, isupportbuffer);
1497	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1498		p = isupportbuffer;
1499		len = 0;
1500		n = tokens = 0;
#	Line 1479 | Line 1505 | rebuild_isupport_message_line(void)
1505		{
1506		if (*--p == ' ')
1507		*p = '\0';
1508	<	addto_MessageLine(isupportFile, isupportbuffer);
1508	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1509		}
1510		}

Diff Legend

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