ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/s_user.c (file contents):
Revision 2097 by michael, Sun May 19 08:47:35 2013 UTC vs.
Revision 3109 by michael, Thu Mar 6 19:25:12 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_user.c: User related 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-2014 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 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_user.c
23	>	* \brief User related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 52 | Line 54
54		#include "parse.h"
55		#include "watch.h"
56
55	–
57		static char umode_buffer[IRCD_BUFSIZE];
58
59		static void user_welcome(struct Client *);
#	Line 65 | Line 66 | static const char *uid_get(void);
66		* used with init_isupport, add_isupport, delete_isupport
67		*/
68
69	<	struct Isupport
69	>	struct Isupport
70		{
71		dlink_node node;
72		char *name;
#	Line 73 | Line 74 | struct Isupport
74		int number;
75		};
76
77	<	static dlink_list support_list = { NULL, NULL, 0 };
78	<	MessageFile *isupportFile;
77	>	static dlink_list support_list;
78	>	static dlink_list support_list_lines;
79
80		/* memory is cheap. map 0-255 to equivalent mode */
81		const unsigned int user_modes[256] =
#	Line 86 | Line 87 | const unsigned int user_modes[256] =
87		0,                  /* @ */
88		0,                  /* A */
89		0,                  /* B */
90	<	UMODE_CCONN_FULL,   /* C */
90	>	0,                  /* C */
91		UMODE_DEAF,         /* D */
92		0,                  /* E */
93		UMODE_FARCONNECT,   /* F */
#	Line 102 | Line 103 | const unsigned int user_modes[256] =
103		0,                  /* P */
104		0,                  /* Q */
105		UMODE_REGONLY,      /* R */
106	<	0,                  /* S */
106	>	UMODE_SSL,          /* S */
107		0,                  /* T */
108		0,                  /* U */
109		0,                  /* V */
110	<	0,                  /* W */
110	>	UMODE_WEBIRC,       /* W */
111		0,                  /* X */
112		0,                  /* Y */
113		0,                  /* Z 0x5A */
114	<	0, 0, 0, 0, 0,      /* 0x5F   */
114	>	0, 0, 0, 0, 0,      /* 0x5F   */
115		0,                  /* 0x60   */
116		UMODE_ADMIN,        /* a */
117		UMODE_BOTS,         /* b */
#	Line 135 | Line 136 | const unsigned int user_modes[256] =
136		UMODE_UNAUTH,       /* u */
137		0,                  /* v */
138		UMODE_WALLOP,       /* w */
139	<	0,                  /* x */
139	>	UMODE_HIDDENHOST,   /* x */
140		UMODE_SPY,          /* y */
141		UMODE_OPERWALL,     /* z      0x7A */
142		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 170 | Line 171 | assemble_umode_buffer(void)
171		* side effects - display to client user counts etc.
172		*/
173		void
174	<	show_lusers(struct Client *source_p)
174	>	show_lusers(struct Client *source_p)
175		{
175	–	const char *from, *to;
176	–
177	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
178	–	{
179	–	from = me.id;
180	–	to = source_p->id;
181	–	}
182	–	else
183	–	{
184	–	from = me.name;
185	–	to = source_p->name;
186	–	}
187	–
176		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
177	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
178	<	from, to, (Count.total-Count.invisi),
191	<	Count.invisi, dlink_list_length(&global_serv_list));
177	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
178	>	Count.invisi, dlink_list_length(&global_serv_list));
179		else
180	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
181	<	(Count.total-Count.invisi), Count.invisi, 1);
180	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
181	>	(Count.total-Count.invisi), Count.invisi, 1);
182
183		if (Count.oper > 0)
184	<	sendto_one(source_p, form_str(RPL_LUSEROP),
198	<	from, to, Count.oper);
184	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
185
186		if (dlink_list_length(&unknown_list) > 0)
187	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
202	<	from, to, dlink_list_length(&unknown_list));
187	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
188
189		if (dlink_list_length(&global_channel_list) > 0)
190	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
206	<	from, to, dlink_list_length(&global_channel_list));
190	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
191
192		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
193		{
194	<	sendto_one(source_p, form_str(RPL_LUSERME),
195	<	from, to, Count.local, Count.myserver);
212	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
213	<	from, to, Count.local, Count.max_loc);
194	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
195	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
196		}
197		else
198		{
199	<	sendto_one(source_p, form_str(RPL_LUSERME),
200	<	from, to, Count.total, 0);
219	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
220	<	from, to, Count.total, Count.max_tot);
199	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
200	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
201		}
202
203	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
224	<	from, to, Count.total, Count.max_tot);
203	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
204
205		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
206	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
207	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
206	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
207	>	Count.max_loc_cli, Count.totalrestartcount);
208
209		if (Count.local > Count.max_loc_cli)
210		Count.max_loc_cli = Count.local;
211
212		if ((Count.local + Count.myserver) > Count.max_loc_con)
213	<	Count.max_loc_con = Count.local + Count.myserver;
213	>	Count.max_loc_con = Count.local + Count.myserver;
214		}
215
216		/* show_isupport()
#	Line 241 | Line 220 | show_lusers(struct Client *source_p)
220		* side effects - display to client what we support (for them)
221		*/
222		void
223	<	show_isupport(struct Client *source_p)
223	>	show_isupport(struct Client *source_p)
224		{
225	<	send_message_file(source_p, isupportFile);
225	>	const dlink_node *ptr = NULL;
226	>
227	>	DLINK_FOREACH(ptr, support_list_lines.head)
228	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
229		}
230
231		/*
#	Line 284 | Line 266 | register_local_user(struct Client *sourc
266
267		if (ConfigFileEntry.ping_cookie)
268		{
269	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
269	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
270		{
271		do
272		source_p->localClient->random_ping = genrand_int32();
#	Line 307 | Line 289 | register_local_user(struct Client *sourc
289		if (!check_client(source_p))
290		return;
291
292	<	if (valid_hostname(source_p->host) == 0)
292	>	if (!valid_hostname(source_p->host))
293		{
294		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
295		"character in your hostname", me.name, source_p->name);
#	Line 352 | Line 334 | register_local_user(struct Client *sourc
334		if (!match_conf_password(pass, conf))
335		{
336		++ServerStats.is_ref;
337	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
338	<	me.name, source_p->name);
337	>
338	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
339		exit_client(source_p, &me, "Bad Password");
340		return;
341		}
#	Line 390 | Line 372 | register_local_user(struct Client *sourc
372		}
373
374		/* valid user name check */
375	<	if (valid_username(source_p->username, 1) == 0)
375	>	if (!valid_username(source_p->username, 1))
376		{
377		char tmpstr2[IRCD_BUFSIZE];
378
#	Line 421 | Line 403 | register_local_user(struct Client *sourc
403		get_client_class(&source_p->localClient->confs),
404		source_p->info, source_p->id);
405
424	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
425	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
426	–	source_p->name, source_p->username, source_p->host,
427	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
428	–	"255.255.255.255" : source_p->sockhost,
429	–	get_client_class(&source_p->localClient->confs),
430	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	–	"<hidden>" : source_p->localClient->client_host,
432	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
433	–	"<hidden>" : source_p->localClient->client_server,
434	–	source_p->info);
435	–
436	–
406		if (ConfigFileEntry.invisible_on_connect)
407		{
408		AddUMode(source_p, UMODE_INVISIBLE);
409		++Count.invisi;
410		}
411
412	<	if ((++Count.local) > Count.max_loc)
412	>	if (++Count.local > Count.max_loc)
413		{
414		Count.max_loc = Count.local;
415
#	Line 479 | Line 448 | register_local_user(struct Client *sourc
448		*              - username to register as
449		*              - host name to register as
450		*              - server name
482	–	*              - realname (gecos)
451		* output       - NONE
452		* side effects - This function is called when a remote client
453		*                is introduced by a server.
454		*/
455		void
456	<	register_remote_user(struct Client *source_p,
457	<	const char *username, const char *host, const char *server,
490	<	const char *realname)
456	>	register_remote_user(struct Client *source_p, const char *username,
457	>	const char *host, const char *server)
458		{
459		struct Client *target_p = NULL;
460
461		assert(source_p != NULL);
462		assert(source_p->username != username);
463
464	<	strlcpy(source_p->host, host, sizeof(source_p->host));
464	>	strlcpy(source_p->host, host, sizeof(source_p->host));
465		strlcpy(source_p->username, username, sizeof(source_p->username));
466
467		/*
#	Line 573 | Line 540 | static void
540		introduce_client(struct Client *source_p)
541		{
542		dlink_node *server_node = NULL;
543	<	static char ubuf[12];
543	>	char ubuf[IRCD_BUFSIZE];
544
545		if (MyClient(source_p))
546		send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
#	Line 582 | Line 549 | introduce_client(struct Client *source_p
549
550		watch_check_hash(source_p, RPL_LOGON);
551
552	<	if (*ubuf == '\0')
552	>	if (ubuf[0] == '\0')
553		{
554		ubuf[0] = '+';
555		ubuf[1] = '\0';
#	Line 633 | Line 600 | introduce_client(struct Client *source_p
600		ubuf, source_p->username, source_p->host,
601		source_p->servptr->name, source_p->info);
602		}
603	+
604	+	if (!EmptyString(source_p->certfp))
605	+	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
606		}
607		}
608
#	Line 652 | Line 622 | valid_hostname(const char *hostname)
622
623		assert(p != NULL);
624
625	<	if (*p == '.' || *p == ':')
625	>	if (EmptyString(p) || *p == '.' || *p == ':')
626		return 0;
627
628		for (; *p; ++p)
#	Line 755 | Line 725 | report_and_set_user_flags(struct Client
725		{
726		/* If this user is being spoofed, tell them so */
727		if (IsConfDoSpoofIp(conf))
758	–	{
728		sendto_one(source_p,
729	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
729	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
730		me.name, source_p->name);
762	–	}
731
732		/* If this user is in the exception class, Set it "E lined" */
733		if (IsConfExemptKline(conf))
734		{
735		SetExemptKline(source_p);
736		sendto_one(source_p,
737	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
737	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
738		me.name, source_p->name);
739		}
740
741	<	/* The else here is to make sure that G line exempt users
741	>	/*
742	>	* The else here is to make sure that G line exempt users
743		* do not get noticed twice.
744		*/
745		else if (IsConfExemptGline(conf))
746		{
747		SetExemptGline(source_p);
748	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
748	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
749		me.name, source_p->name);
750		}
751
752		if (IsConfExemptResv(conf))
753		{
754		SetExemptResv(source_p);
755	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
755	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
756		me.name, source_p->name);
757		}
758
#	Line 792 | Line 761 | report_and_set_user_flags(struct Client
761		{
762		SetExemptLimits(source_p);
763		sendto_one(source_p,
764	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
765	<	me.name,source_p->name);
764	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
765	>	me.name, source_p->name);
766		}
767
768		if (IsConfCanFlood(conf))
#	Line 826 | Line 795 | set_user_mode(struct Client *client_p, s
795		if ((target_p = find_person(client_p, parv[1])) == NULL)
796		{
797		if (MyConnect(source_p))
798	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
830	<	me.name, source_p->name, parv[1]);
798	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
799		return;
800		}
801
802		if (source_p != target_p)
803		{
804	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
837	<	me.name, source_p->name);
804	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
805		return;
806		}
807
#	Line 843 | Line 810 | set_user_mode(struct Client *client_p, s
810		m = buf;
811		*m++ = '+';
812
813	<	for (i = 0; i < 128; i++)
813	>	for (i = 0; i < 128; ++i)
814		if (HasUMode(source_p, user_modes[i]))
815		*m++ = (char)i;
816		*m = '\0';
817
818	<	sendto_one(source_p, form_str(RPL_UMODEIS),
852	<	me.name, source_p->name, buf);
818	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
819		return;
820		}
821
#	Line 857 | Line 823 | set_user_mode(struct Client *client_p, s
823		setflags = source_p->umodes;
824
825		/* parse mode change string(s) */
826	<	for (p = &parv[2]; p && *p; p++)
826	>	for (p = &parv[2]; p && *p; ++p)
827		{
828	<	for (m = *p; *m; m++)
828	>	for (m = *p; *m; ++m)
829		{
830		switch (*m)
831		{
#	Line 880 | Line 846 | set_user_mode(struct Client *client_p, s
846		}
847		else
848		{
883	–	/* Only decrement the oper counts if an oper to begin with
884	–	* found by Pat Szuta, Perly , perly@xnet.com
885	–	*/
849		if (!HasUMode(source_p, UMODE_OPER))
850		break;
851
#	Line 891 | Line 854 | set_user_mode(struct Client *client_p, s
854
855		if (MyConnect(source_p))
856		{
857	<	dlink_node *dm;
857	>	dlink_node *dm = NULL;
858
859		detach_conf(source_p, CONF_OPER);
860		ClrOFlag(source_p);
#	Line 904 | Line 867 | set_user_mode(struct Client *client_p, s
867
868		break;
869
870	+	case 'S':  /* Only servers may set +S in a burst */
871	+	case 'W':  /* Only servers may set +W in a burst */
872		case 'r':  /* Only services may set +r */
873	+	case 'x':  /* Only services may set +x */
874		break;
875
876		default:
#	Line 921 | Line 887 | set_user_mode(struct Client *client_p, s
887		DelUMode(source_p, flag);
888		}
889		}
890	<	else
891	<	{
926	<	if (MyConnect(source_p))
927	<	badflag = 1;
928	<	}
890	>	else if (MyConnect(source_p))
891	>	badflag = 1;
892
893		break;
894		}
#	Line 933 | Line 896 | set_user_mode(struct Client *client_p, s
896		}
897
898		if (badflag)
899	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
937	<	me.name, source_p->name);
899	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
900
901		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
902		!HasOFlag(source_p, OPER_FLAG_ADMIN))
#	Line 980 | Line 942 | send_umode(struct Client *client_p, stru
942		* build a string in umode_buf to represent the change in the user's
943		* mode between the new (source_p->umodes) and 'old'.
944		*/
945	<	for (i = 0; i < 128; i++)
945	>	for (i = 0; i < 128; ++i)
946		{
947		flag = user_modes[i];
948		if (!flag)
#	Line 1054 | Line 1016 | send_umode_out(struct Client *client_p,
1016		}
1017
1018		void
1019	<	user_set_hostmask(struct Client *target_p, const char *hostname)
1019	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1020		{
1021	<	if (!valid_hostname(hostname))
1021	>	dlink_node *ptr = NULL;
1022	>
1023	>	if (!strcmp(target_p->host, hostname))
1024		return;
1025
1026	+	switch (what)
1027	+	{
1028	+	case MODE_ADD:
1029	+	AddUMode(target_p, UMODE_HIDDENHOST);
1030	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1031	+	break;
1032	+	case MODE_DEL:
1033	+	DelUMode(target_p, UMODE_HIDDENHOST);
1034	+
1035	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1036	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1037	+	break;
1038	+	default: return;
1039	+	}
1040	+
1041	+	if (ConfigFileEntry.cycle_on_host_change)
1042	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1043	+	target_p->name, target_p->username, target_p->host);
1044	+
1045		if (IsUserHostIp(target_p))
1046		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1047
1048		strlcpy(target_p->host, hostname, sizeof(target_p->host));
1066	–	SetIPSpoof(target_p);
1049
1050		add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1051		SetUserHost(target_p);
1052
1053		if (MyClient(target_p))
1054	+	{
1055	+	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1056		clear_ban_cache_client(target_p);
1057	+	}
1058	+
1059	+	if (!ConfigFileEntry.cycle_on_host_change)
1060	+	return;
1061	+
1062	+	DLINK_FOREACH(ptr, target_p->channel.head)
1063	+	{
1064	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1065	+	char *p = modebuf;
1066	+	int len = 0;
1067	+	const struct Membership *ms = ptr->data;
1068	+
1069	+	if (has_member_flags(ms, CHFL_CHANOP))
1070	+	{
1071	+	*p++ = 'o';
1072	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1073	+	}
1074	+
1075	+	if (has_member_flags(ms, CHFL_HALFOP))
1076	+	{
1077	+	*p++ = 'h';
1078	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1079	+	}
1080	+
1081	+	if (has_member_flags(ms, CHFL_VOICE))
1082	+	{
1083	+	*p++ = 'v';
1084	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1085	+	}
1086	+
1087	+	*p = '\0';
1088	+
1089	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1090	+	target_p->name, target_p->username, target_p->host,
1091	+	ms->chptr->chname);
1092	+	if (nickbuf[0])
1093	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1094	+	target_p->servptr->name, ms->chptr->chname,
1095	+	modebuf, nickbuf);
1096	+
1097	+	}
1098	+
1099	+	if (target_p->away[0])
1100	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1101	+	":%s!%s@%s AWAY :%s",
1102	+	target_p->name, target_p->username,
1103	+	target_p->host, target_p->away);
1104		}
1105
1106		/* user_welcome()
#	Line 1088 | Line 1119 | user_welcome(struct Client *source_p)
1119		#endif
1120
1121		#ifdef HAVE_LIBCRYPTO
1122	<	if (source_p->localClient->fd.ssl != NULL)
1122	>	if (HasFlag(source_p, FLAGS_SSL))
1123	>	{
1124	>	AddUMode(source_p, UMODE_SSL);
1125		sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1126		me.name, source_p->name,
1127		ssl_get_cipher(source_p->localClient->fd.ssl));
1128	+	}
1129		#endif
1130
1131	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1132	<	ServerInfo.network_name, source_p->name);
1133	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1134	<	get_listener_name(source_p->localClient->listener), ircd_version);
1135	<	sendto_one(source_p, form_str(RPL_CREATED),
1136	<	me.name, source_p->name, built_date);
1103	<	sendto_one(source_p, form_str(RPL_MYINFO),
1104	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1131	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1132	>	source_p->name);
1133	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1134	>	get_listener_name(source_p->localClient->listener), ircd_version);
1135	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1136	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1137		show_isupport(source_p);
1138
1139		if (source_p->id[0] != '\0')
1140	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1109	<	source_p->name, source_p->id);
1140	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1141
1142		show_lusers(source_p);
1143	<
1113	<	if (ConfigFileEntry.short_motd)
1114	<	{
1115	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1116	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1117	<	sendto_one(source_p,
1118	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1119	<	"read it", me.name, source_p->name);
1120	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1121	<	me.name, source_p->name, me.name);
1122	<	sendto_one(source_p, form_str(RPL_MOTD),
1123	<	me.name, source_p->name,
1124	<	"*** This is the short motd ***");
1125	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1126	<	me.name, source_p->name);
1127	<	}
1128	<	else
1129	<	send_message_file(source_p, &ConfigFileEntry.motd);
1143	>	motd_signon(source_p);
1144		}
1145
1146		/* check_xline()
#	Line 1170 | Line 1184 | check_xline(struct Client *source_p)
1184		* output       - NONE
1185		* side effects - Blindly opers up given source_p, using conf info
1186		*                all checks on passwords have already been done.
1187	<	*                This could also be used by rsa oper routines.
1187	>	*                This could also be used by rsa oper routines.
1188		*/
1189		void
1190		oper_up(struct Client *source_p)
#	Line 1204 | Line 1218 | oper_up(struct Client *source_p)
1218		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1219		get_oper_name(source_p));
1220		send_umode_out(source_p, source_p, old);
1221	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1221	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1222		}
1223
1224		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1222 | Line 1236 | valid_sid(const char *sid)
1236
1237		/*
1238		* init_uid()
1239	<	*
1239	>	*
1240		* inputs       - NONE
1241		* output       - NONE
1242		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1240 | Line 1254 | init_uid(void)
1254		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1255
1256		for (i = 0; i < IRC_MAXSID; ++i)
1257	<	if (new_uid[i] == '\0')
1257	>	if (new_uid[i] == '\0')
1258		new_uid[i] = 'A';
1259
1260		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1247	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1248	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1249	–	* -Dianora
1250	–	*/
1261		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1262		}
1263
#	Line 1308 | Line 1318 | uid_get(void)
1318		void
1319		init_isupport(void)
1320		{
1311	–	isupportFile = init_MessageLine();
1312	–
1321		add_isupport("CALLERID", NULL, -1);
1322		add_isupport("CASEMAPPING", CASEMAP, -1);
1323		add_isupport("DEAF", "D", -1);
#	Line 1322 | Line 1330 | init_isupport(void)
1330		add_isupport("PREFIX", "(ov)@+", -1);
1331		add_isupport("STATUSMSG", "@+", -1);
1332		#endif
1333	+	add_isupport("EXCEPTS", "e", -1);
1334	+	add_isupport("INVEX", "I", -1);
1335		}
1336
1337		/*
#	Line 1405 | Line 1415 | rebuild_isupport_message_line(void)
1415		{
1416		char isupportbuffer[IRCD_BUFSIZE];
1417		char *p = isupportbuffer;
1418	<	dlink_node *ptr = NULL;
1418	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1419		int n = 0;
1420		int tokens = 0;
1421		size_t len = 0;
1422	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1422	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1423
1424	<	destroy_MessageLine(isupportFile);
1424	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1425	>	{
1426	>	dlinkDelete(ptr, &support_list_lines);
1427	>	MyFree(ptr->data);
1428	>	free_dlink_node(ptr);
1429	>	}
1430
1431		DLINK_FOREACH(ptr, support_list.head)
1432		{
#	Line 1441 | Line 1456 | rebuild_isupport_message_line(void)
1456		if (*--p == ' ')
1457		*p = '\0';
1458
1459	<	addto_MessageLine(isupportFile, isupportbuffer);
1459	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1460		p = isupportbuffer;
1461		len = 0;
1462		n = tokens = 0;
#	Line 1452 | Line 1467 | rebuild_isupport_message_line(void)
1467		{
1468		if (*--p == ' ')
1469		*p = '\0';
1470	<	addto_MessageLine(isupportFile, isupportbuffer);
1470	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1471		}
1472		}

Diff Legend

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