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 1646 by michael, Wed Nov 7 21:02:43 2012 UTC vs.
Revision 3110 by michael, Thu Mar 6 20:33:17 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 32 | Line 34
34		#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
35	–	#include "sprintf_irc.h"
37		#include "s_bsd.h"
38		#include "ircd.h"
39		#include "listener.h"
#	Line 53 | Line 54
54		#include "parse.h"
55		#include "watch.h"
56
56	–
57	–	struct Callback *entering_umode_cb = NULL;
58	–	struct Callback *umode_cb = NULL;
59	–
57		static char umode_buffer[IRCD_BUFSIZE];
58
59		static void user_welcome(struct Client *);
#	Line 69 | 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 77 | 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	<	unsigned int user_modes[256] =
81	>	const unsigned int user_modes[256] =
82		{
83		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
84		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 90 | Line 87 | 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	<	0,                  /* F */
93	>	UMODE_FARCONNECT,   /* F */
94		UMODE_SOFTCALLERID, /* G */
95		UMODE_HIDDEN,       /* H */
96		0,                  /* I */
#	Line 106 | Line 103 | 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 */
118		UMODE_CCONN,        /* c */
119		UMODE_DEBUG,        /* d */
120	<	0,                  /* e */
120	>	UMODE_EXTERNAL,     /* e */
121		UMODE_FULL,         /* f */
122		UMODE_CALLERID,     /* g */
123		0,                  /* h */
#	Line 139 | Line 136 | unsigned int user_modes[256] =
136		UMODE_UNAUTH,       /* u */
137		0,                  /* v */
138		UMODE_WALLOP,       /* w */
139	<	UMODE_EXTERNAL,     /* x */
139	>	UMODE_HIDDENHOST,   /* x */
140		UMODE_SPY,          /* y */
141		UMODE_OPERWALL,     /* z      0x7A */
142		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 174 | 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		{
179	–	const char *from, *to;
180	–
181	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
182	–	{
183	–	from = me.id;
184	–	to = source_p->id;
185	–	}
186	–	else
187	–	{
188	–	from = me.name;
189	–	to = source_p->name;
190	–	}
191	–
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),
195	<	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),
202	<	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),
206	<	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),
210	<	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);
216	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
217	<	from, to, Count.local, Count.max_loc,
218	<	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);
224	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
225	<	from, to, Count.total, Count.max_tot,
226	<	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),
230	<	from, to, Count.total, Count.max_tot,
231	<	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 248 | 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 291 | 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 314 | 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);
294	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
295	>	"character in your hostname");
296		strlcpy(source_p->host, source_p->sockhost,
297		sizeof(source_p->host));
298		}
#	Line 333 | Line 308 | register_local_user(struct Client *sourc
308		if (IsNeedIdentd(conf))
309		{
310		++ServerStats.is_ref;
311	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
312	<	"identd to use this server", me.name, source_p->name);
311	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
312	>	"identd to use this server");
313		exit_client(source_p, &me, "Install identd");
314		return;
315		}
#	Line 359 | 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 397 | Line 372 | register_local_user(struct Client *sourc
372		}
373
374		/* valid user name check */
375	<	if (valid_username(source_p->username) == 0)
375	>	if (!valid_username(source_p->username, 1))
376		{
377		char tmpstr2[IRCD_BUFSIZE];
378
#	Line 428 | Line 403 | register_local_user(struct Client *sourc
403		get_client_class(&source_p->localClient->confs),
404		source_p->info, source_p->id);
405
431	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
432	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
433	–	source_p->name, source_p->username, source_p->host,
434	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
435	–	"255.255.255.255" : source_p->sockhost,
436	–	get_client_class(&source_p->localClient->confs),
437	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
438	–	"<hidden>" : source_p->localClient->client_host,
439	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
440	–	"<hidden>" : source_p->localClient->client_server,
441	–	source_p->info);
442	–
443	–
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 486 | Line 448 | register_local_user(struct Client *sourc
448		*              - username to register as
449		*              - host name to register as
450		*              - server name
489	–	*              - 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,
497	<	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 558 | Line 518 | register_remote_user(struct Client *sour
518		add_user_host(source_p->username, source_p->host, 1);
519		SetUserHost(source_p);
520
521	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
522	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
523	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
524	+	source_p->servptr->name,
525	+	source_p->name, source_p->username, source_p->host,
526	+	source_p->info, source_p->id);
527	+
528		introduce_client(source_p);
529		}
530
#	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)
629		if (!IsHostChar(*p))
630		return 0;
631
632	<	return 1;
632	>	return p - hostname <= HOSTLEN;
633		}
634
635		/* valid_username()
#	Line 674 | Line 644 | valid_hostname(const char *hostname)
644		* style of username
645		*/
646		int
647	<	valid_username(const char *username)
647	>	valid_username(const char *username, const int local)
648		{
649		int dots      = 0;
650		const char *p = username;
#	Line 684 | Line 654 | valid_username(const char *username)
654		if (*p == '~')
655		++p;
656
657	<	/* reject usernames that don't start with an alphanum
657	>	/*
658	>	* Reject usernames that don't start with an alphanum
659		* i.e. reject jokers who have '-@somehost' or '.@somehost'
660		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
661		*/
662		if (!IsAlNum(*p))
663		return 0;
664
665	<	while (*++p)
665	>	if (local)
666		{
667	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
667	>	while (*++p)
668		{
669	<	if (++dots > ConfigFileEntry.dots_in_ident)
670	<	return 0;
671	<	if (!IsUserChar(*(p + 1)))
669	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
670	>	{
671	>	if (++dots > ConfigFileEntry.dots_in_ident)
672	>	return 0;
673	>	if (!IsUserChar(*(p + 1)))
674	>	return 0;
675	>	}
676	>	else if (!IsUserChar(*p))
677		return 0;
678		}
679	<	else if (!IsUserChar(*p))
680	<	return 0;
679	>	}
680	>	else
681	>	{
682	>	while (*++p)
683	>	if (!IsUserChar(*p))
684	>	return 0;
685		}
686
687	<	return 1;
687	>	return  p - username <= USERLEN;;
688		}
689
690		/* clean_nick_name()
#	Line 745 | Line 725 | report_and_set_user_flags(struct Client
725		{
726		/* If this user is being spoofed, tell them so */
727		if (IsConfDoSpoofIp(conf))
728	<	{
749	<	sendto_one(source_p,
750	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
751	<	me.name, source_p->name);
752	<	}
728	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
729
730		/* If this user is in the exception class, Set it "E lined" */
731		if (IsConfExemptKline(conf))
732		{
733		SetExemptKline(source_p);
734	<	sendto_one(source_p,
759	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
760	<	me.name, source_p->name);
734	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
735		}
736
737	<	/* The else here is to make sure that G line exempt users
737	>	/*
738	>	* The else here is to make sure that G line exempt users
739		* do not get noticed twice.
740		*/
741		else if (IsConfExemptGline(conf))
742		{
743		SetExemptGline(source_p);
744	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
770	<	me.name, source_p->name);
744	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
745		}
746
747		if (IsConfExemptResv(conf))
748		{
749		SetExemptResv(source_p);
750	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
777	<	me.name, source_p->name);
750	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
751		}
752
753		/* If this user is exempt from user limits set it "F lined" */
754		if (IsConfExemptLimits(conf))
755		{
756		SetExemptLimits(source_p);
757	<	sendto_one(source_p,
785	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
786	<	me.name,source_p->name);
757	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
758		}
759
760		if (IsConfCanFlood(conf))
761		{
762		SetCanFlood(source_p);
763	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
764	<	"protection, aren't you fearsome.",
794	<	me.name, source_p->name);
763	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
764	>	"protection, aren't you fearsome.");
765		}
766		}
767
798	–	/* change_simple_umode()
799	–	*
800	–	* this callback can be hooked to allow special handling of
801	–	* certain usermodes
802	–	*/
803	–	static void *
804	–	change_simple_umode(va_list args)
805	–	{
806	–	struct Client *client_p;
807	–	struct Client *source_p;
808	–	int what;
809	–	unsigned int flag;
810	–
811	–	client_p = va_arg(args, struct Client *);
812	–	source_p = va_arg(args, struct Client *);
813	–	what = va_arg(args, int);
814	–	flag = va_arg(args, unsigned int);
815	–
816	–	if (what == MODE_ADD)
817	–	AddUMode(source_p, flag);
818	–	else
819	–	DelUMode(source_p, flag);
820	–
821	–	return NULL;
822	–	}
823	–
768		/* set_user_mode()
769		*
770		* added 15/10/91 By Darren Reed.
#	Line 830 | Line 774 | change_simple_umode(va_list args)
774		*/
775		void
776		set_user_mode(struct Client *client_p, struct Client *source_p,
777	<	int parc, char *parv[])
777	>	const int parc, char *parv[])
778		{
779		unsigned int flag, setflags;
780		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 842 | Line 786 | set_user_mode(struct Client *client_p, s
786		if ((target_p = find_person(client_p, parv[1])) == NULL)
787		{
788		if (MyConnect(source_p))
789	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
846	<	me.name, source_p->name, parv[1]);
789	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
790		return;
791		}
792
850	–	if (IsServer(source_p))
851	–	{
852	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
853	–	"*** Mode for User %s from %s",
854	–	parv[1], source_p->name);
855	–	return;
856	–	}
857	–
793		if (source_p != target_p)
794		{
795	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
861	<	me.name, source_p->name);
795	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
796		return;
797		}
798
#	Line 867 | Line 801 | set_user_mode(struct Client *client_p, s
801		m = buf;
802		*m++ = '+';
803
804	<	for (i = 0; i < 128; i++)
804	>	for (i = 0; i < 128; ++i)
805		if (HasUMode(source_p, user_modes[i]))
806		*m++ = (char)i;
807		*m = '\0';
808
809	<	sendto_one(source_p, form_str(RPL_UMODEIS),
876	<	me.name, source_p->name, buf);
809	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
810		return;
811		}
812
880	–	execute_callback(entering_umode_cb, client_p, source_p);
881	–
813		/* find flags already set for user */
814		setflags = source_p->umodes;
815
816		/* parse mode change string(s) */
817	<	for (p = &parv[2]; p && *p; p++)
817	>	for (p = &parv[2]; p && *p; ++p)
818		{
819	<	for (m = *p; *m; m++)
819	>	for (m = *p; *m; ++m)
820		{
821		switch (*m)
822		{
#	Line 906 | Line 837 | set_user_mode(struct Client *client_p, s
837		}
838		else
839		{
909	–	/* Only decrement the oper counts if an oper to begin with
910	–	* found by Pat Szuta, Perly , perly@xnet.com
911	–	*/
840		if (!HasUMode(source_p, UMODE_OPER))
841		break;
842
#	Line 917 | Line 845 | set_user_mode(struct Client *client_p, s
845
846		if (MyConnect(source_p))
847		{
848	<	dlink_node *dm;
848	>	dlink_node *dm = NULL;
849
850		detach_conf(source_p, CONF_OPER);
851		ClrOFlag(source_p);
#	Line 930 | Line 858 | set_user_mode(struct Client *client_p, s
858
859		break;
860
861	<	/* we may not get these,
862	<	* but they shouldnt be in default
863	<	*/
864	<	case 'r':
937	<	case ' ' :
938	<	case '\n':
939	<	case '\r':
940	<	case '\t':
861	>	case 'S':  /* Only servers may set +S in a burst */
862	>	case 'W':  /* Only servers may set +W in a burst */
863	>	case 'r':  /* Only services may set +r */
864	>	case 'x':  /* Only services may set +x */
865		break;
866
867		default:
#	Line 945 | Line 869 | set_user_mode(struct Client *client_p, s
869		{
870		if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
871		(ConfigFileEntry.oper_only_umodes & flag))
948	–	{
872		badflag = 1;
950	–	}
873		else
874	<	execute_callback(umode_cb, client_p, source_p, what, flag);
875	<	}
876	<	else
877	<	{
878	<	if (MyConnect(source_p))
879	<	badflag = 1;
874	>	{
875	>	if (what == MODE_ADD)
876	>	AddUMode(source_p, flag);
877	>	else
878	>	DelUMode(source_p, flag);
879	>	}
880		}
881	+	else if (MyConnect(source_p))
882	+	badflag = 1;
883
884		break;
885		}
#	Line 963 | Line 887 | set_user_mode(struct Client *client_p, s
887		}
888
889		if (badflag)
890	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
967	<	me.name, source_p->name);
968	<
969	<	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
970	<	{
971	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
972	<	me.name, source_p->name);
973	<	DelUMode(source_p, UMODE_NCHANGE);
974	<	}
890	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
891
892		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
893		!HasOFlag(source_p, OPER_FLAG_ADMIN))
894		{
895	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
980	<	me.name, source_p->name);
895	>	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
896		DelUMode(source_p, UMODE_ADMIN);
897		}
898
#	Line 1017 | Line 932 | send_umode(struct Client *client_p, stru
932		* build a string in umode_buf to represent the change in the user's
933		* mode between the new (source_p->umodes) and 'old'.
934		*/
935	<	for (i = 0; i < 128; i++)
935	>	for (i = 0; i < 128; ++i)
936		{
937		flag = user_modes[i];
938		if (!flag)
#	Line 1090 | Line 1005 | send_umode_out(struct Client *client_p,
1005		send_umode(client_p, source_p, old, 0xffffffff, buf);
1006		}
1007
1008	+	void
1009	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1010	+	{
1011	+	dlink_node *ptr = NULL;
1012	+
1013	+	if (!strcmp(target_p->host, hostname))
1014	+	return;
1015	+
1016	+	switch (what)
1017	+	{
1018	+	case MODE_ADD:
1019	+	AddUMode(target_p, UMODE_HIDDENHOST);
1020	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1021	+	break;
1022	+	case MODE_DEL:
1023	+	DelUMode(target_p, UMODE_HIDDENHOST);
1024	+
1025	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1026	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1027	+	break;
1028	+	default: return;
1029	+	}
1030	+
1031	+	if (ConfigFileEntry.cycle_on_host_change)
1032	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1033	+	target_p->name, target_p->username, target_p->host);
1034	+
1035	+	if (IsUserHostIp(target_p))
1036	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1037	+
1038	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1039	+
1040	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1041	+	SetUserHost(target_p);
1042	+
1043	+	if (MyClient(target_p))
1044	+	{
1045	+	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1046	+	clear_ban_cache_client(target_p);
1047	+	}
1048	+
1049	+	if (!ConfigFileEntry.cycle_on_host_change)
1050	+	return;
1051	+
1052	+	DLINK_FOREACH(ptr, target_p->channel.head)
1053	+	{
1054	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1055	+	char *p = modebuf;
1056	+	int len = 0;
1057	+	const struct Membership *ms = ptr->data;
1058	+
1059	+	if (has_member_flags(ms, CHFL_CHANOP))
1060	+	{
1061	+	*p++ = 'o';
1062	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1063	+	}
1064	+
1065	+	if (has_member_flags(ms, CHFL_HALFOP))
1066	+	{
1067	+	*p++ = 'h';
1068	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1069	+	}
1070	+
1071	+	if (has_member_flags(ms, CHFL_VOICE))
1072	+	{
1073	+	*p++ = 'v';
1074	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1075	+	}
1076	+
1077	+	*p = '\0';
1078	+
1079	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1080	+	target_p->name, target_p->username, target_p->host,
1081	+	ms->chptr->chname);
1082	+	if (nickbuf[0])
1083	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1084	+	target_p->servptr->name, ms->chptr->chname,
1085	+	modebuf, nickbuf);
1086	+
1087	+	}
1088	+
1089	+	if (target_p->away[0])
1090	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1091	+	":%s!%s@%s AWAY :%s",
1092	+	target_p->name, target_p->username,
1093	+	target_p->host, target_p->away);
1094	+	}
1095	+
1096		/* user_welcome()
1097		*
1098		* inputs       - client pointer to client to welcome
#	Line 1106 | Line 1109 | user_welcome(struct Client *source_p)
1109		#endif
1110
1111		#ifdef HAVE_LIBCRYPTO
1112	<	if (source_p->localClient->fd.ssl != NULL)
1113	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1114	<	me.name, source_p->name,
1115	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1112	>	if (HasFlag(source_p, FLAGS_SSL))
1113	>	{
1114	>	AddUMode(source_p, UMODE_SSL);
1115	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1116	>	ssl_get_cipher(source_p->localClient->fd.ssl));
1117	>	}
1118		#endif
1119
1120	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1121	<	ServerInfo.network_name, source_p->name);
1122	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1123	<	get_listener_name(source_p->localClient->listener), ircd_version);
1124	<	sendto_one(source_p, form_str(RPL_CREATED),
1125	<	me.name, source_p->name, built_date);
1121	<	sendto_one(source_p, form_str(RPL_MYINFO),
1122	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1120	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1121	>	source_p->name);
1122	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1123	>	get_listener_name(source_p->localClient->listener), ircd_version);
1124	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1125	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1126		show_isupport(source_p);
1127
1128		if (source_p->id[0] != '\0')
1129	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1127	<	source_p->name, source_p->id);
1129	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1130
1131		show_lusers(source_p);
1132	<
1131	<	if (ConfigFileEntry.short_motd)
1132	<	{
1133	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1134	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1135	<	sendto_one(source_p,
1136	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1137	<	"read it", me.name, source_p->name);
1138	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1139	<	me.name, source_p->name, me.name);
1140	<	sendto_one(source_p, form_str(RPL_MOTD),
1141	<	me.name, source_p->name,
1142	<	"*** This is the short motd ***");
1143	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1144	<	me.name, source_p->name);
1145	<	}
1146	<	else
1147	<	send_message_file(source_p, &ConfigFileEntry.motd);
1132	>	motd_signon(source_p);
1133		}
1134
1135		/* check_xline()
#	Line 1159 | Line 1144 | check_xline(struct Client *source_p)
1144		struct MaskItem *conf = NULL;
1145		const char *reason = NULL;
1146
1147	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
1163	<	(conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
1147	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1148		{
1149		++conf->count;
1150
#	Line 1189 | Line 1173 | check_xline(struct Client *source_p)
1173		* output       - NONE
1174		* side effects - Blindly opers up given source_p, using conf info
1175		*                all checks on passwords have already been done.
1176	<	*                This could also be used by rsa oper routines.
1176	>	*                This could also be used by rsa oper routines.
1177		*/
1178		void
1179		oper_up(struct Client *source_p)
#	Line 1219 | Line 1203 | oper_up(struct Client *source_p)
1203
1204		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1205		AddUMode(source_p, UMODE_ADMIN);
1222	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1223	–	DelUMode(source_p, UMODE_NCHANGE);
1206
1207		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1208		get_oper_name(source_p));
1209		send_umode_out(source_p, source_p, old);
1210	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1210	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1211		}
1212
1213		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1243 | Line 1225 | valid_sid(const char *sid)
1225
1226		/*
1227		* init_uid()
1228	<	*
1228	>	*
1229		* inputs       - NONE
1230		* output       - NONE
1231		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1253 | Line 1235 | valid_sid(const char *sid)
1235		void
1236		init_uid(void)
1237		{
1238	<	int i;
1238	>	unsigned int i;
1239
1240		memset(new_uid, 0, sizeof(new_uid));
1241
#	Line 1261 | Line 1243 | init_uid(void)
1243		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1244
1245		for (i = 0; i < IRC_MAXSID; ++i)
1246	<	if (new_uid[i] == '\0')
1246	>	if (new_uid[i] == '\0')
1247		new_uid[i] = 'A';
1248
1249		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1268	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1269	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1270	–	* -Dianora
1271	–	*/
1250		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1273	–
1274	–	entering_umode_cb = register_callback("entering_umode", NULL);
1275	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1251		}
1252
1253		/*
#	Line 1332 | Line 1307 | uid_get(void)
1307		void
1308		init_isupport(void)
1309		{
1335	–	isupportFile = init_MessageLine();
1336	–
1310		add_isupport("CALLERID", NULL, -1);
1311		add_isupport("CASEMAPPING", CASEMAP, -1);
1312		add_isupport("DEAF", "D", -1);
1313		add_isupport("KICKLEN", NULL, KICKLEN);
1314		add_isupport("MODES", NULL, MAXMODEPARAMS);
1342	–	add_isupport("NICKLEN", NULL, NICKLEN);
1315		#ifdef HALFOPS
1316		add_isupport("PREFIX", "(ohv)@%+", -1);
1317		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1347 | Line 1319 | init_isupport(void)
1319		add_isupport("PREFIX", "(ov)@+", -1);
1320		add_isupport("STATUSMSG", "@+", -1);
1321		#endif
1322	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1322	>	add_isupport("EXCEPTS", "e", -1);
1323	>	add_isupport("INVEX", "I", -1);
1324		}
1325
1326		/*
#	Line 1431 | Line 1404 | rebuild_isupport_message_line(void)
1404		{
1405		char isupportbuffer[IRCD_BUFSIZE];
1406		char *p = isupportbuffer;
1407	<	dlink_node *ptr = NULL;
1407	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1408		int n = 0;
1409		int tokens = 0;
1410		size_t len = 0;
1411	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1411	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1412
1413	<	destroy_MessageLine(isupportFile);
1413	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1414	>	{
1415	>	dlinkDelete(ptr, &support_list_lines);
1416	>	MyFree(ptr->data);
1417	>	free_dlink_node(ptr);
1418	>	}
1419
1420		DLINK_FOREACH(ptr, support_list.head)
1421		{
1422		struct Isupport *support = ptr->data;
1423
1424	<	p += (n = ircsprintf(p, "%s", support->name));
1424	>	p += (n = sprintf(p, "%s", support->name));
1425		len += n;
1426
1427		if (support->options != NULL)
1428		{
1429	<	p += (n = ircsprintf(p, "=%s", support->options));
1429	>	p += (n = sprintf(p, "=%s", support->options));
1430		len += n;
1431		}
1432
1433		if (support->number > 0)
1434		{
1435	<	p += (n = ircsprintf(p, "=%d", support->number));
1435	>	p += (n = sprintf(p, "=%d", support->number));
1436		len += n;
1437		}
1438
#	Line 1467 | Line 1445 | rebuild_isupport_message_line(void)
1445		if (*--p == ' ')
1446		*p = '\0';
1447
1448	<	addto_MessageLine(isupportFile, isupportbuffer);
1448	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1449		p = isupportbuffer;
1450		len = 0;
1451		n = tokens = 0;
#	Line 1478 | Line 1456 | rebuild_isupport_message_line(void)
1456		{
1457		if (*--p == ' ')
1458		*p = '\0';
1459	<	addto_MessageLine(isupportFile, isupportbuffer);
1459	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1460		}
1461		}

Diff Legend

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