ViewVC Help

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

root/svn/ircd-hybrid/trunk/src/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 2955 by michael, Tue Jan 28 16:40:30 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 *);
60	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
60	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
61		static int check_xline(struct Client *);
62		static void introduce_client(struct Client *);
63		static const char *uid_get(void);
#	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		{
176		const char *from, *to;
177
#	Line 214 | Line 211 | show_lusers(struct Client *source_p)
211		sendto_one(source_p, form_str(RPL_LUSERME),
212		from, to, Count.local, Count.myserver);
213		sendto_one(source_p, form_str(RPL_LOCALUSERS),
214	<	from, to, Count.local, Count.max_loc,
218	<	Count.local, Count.max_loc);
214	>	from, to, Count.local, Count.max_loc);
215		}
216		else
217		{
218		sendto_one(source_p, form_str(RPL_LUSERME),
219		from, to, Count.total, 0);
220	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
221	<	from, to, Count.total, Count.max_tot,
226	<	Count.total, Count.max_tot);
220	>	sendto_one(source_p, form_str(RPL_LOCALUSERS),
221	>	from, to, Count.total, Count.max_tot);
222		}
223
224		sendto_one(source_p, form_str(RPL_GLOBALUSERS),
225	<	from, to, Count.total, Count.max_tot,
231	<	Count.total, Count.max_tot);
225	>	from, to, Count.total, Count.max_tot);
226
227		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
228		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
#	Line 238 | Line 232 | show_lusers(struct Client *source_p)
232		Count.max_loc_cli = Count.local;
233
234		if ((Count.local + Count.myserver) > Count.max_loc_con)
235	<	Count.max_loc_con = Count.local + Count.myserver;
235	>	Count.max_loc_con = Count.local + Count.myserver;
236		}
237
238		/* show_isupport()
#	Line 248 | Line 242 | show_lusers(struct Client *source_p)
242		* side effects - display to client what we support (for them)
243		*/
244		void
245	<	show_isupport(struct Client *source_p)
245	>	show_isupport(struct Client *source_p)
246		{
247	<	send_message_file(source_p, isupportFile);
247	>	const dlink_node *ptr = NULL;
248	>
249	>	DLINK_FOREACH(ptr, support_list_lines.head)
250	>	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
251	>	source_p->name, ptr->data);
252		}
253
254		/*
#	Line 280 | Line 278 | void
278		register_local_user(struct Client *source_p)
279		{
280		const char *id = NULL;
281	<	const struct AccessItem *aconf = NULL;
284	<	dlink_node *ptr = NULL;
281	>	const struct MaskItem *conf = NULL;
282
283		assert(source_p != NULL);
284		assert(source_p == source_p->from);
#	Line 292 | Line 289 | register_local_user(struct Client *sourc
289
290		if (ConfigFileEntry.ping_cookie)
291		{
292	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
292	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
293		{
294		do
295		source_p->localClient->random_ping = genrand_int32();
#	Line 312 | Line 309 | register_local_user(struct Client *sourc
309		/* Straight up the maximum rate of flooding... */
310		source_p->localClient->allow_read = MAX_FLOOD_BURST;
311
312	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
312	>	if (!check_client(source_p))
313		return;
314
315	<	if (valid_hostname(source_p->host) == 0)
315	>	if (!valid_hostname(source_p->host))
316		{
317		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
318		"character in your hostname", me.name, source_p->name);
#	Line 323 | Line 320 | register_local_user(struct Client *sourc
320		sizeof(source_p->host));
321		}
322
323	<	ptr   = source_p->localClient->confs.head;
327	<	aconf = map_to_conf(ptr->data);
323	>	conf = source_p->localClient->confs.head->data;
324
325		if (!IsGotId(source_p))
326		{
#	Line 332 | Line 328 | register_local_user(struct Client *sourc
328		const char *p = username;
329		unsigned int i = 0;
330
331	<	if (IsNeedIdentd(aconf))
331	>	if (IsNeedIdentd(conf))
332		{
333		++ServerStats.is_ref;
334		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
#	Line 343 | Line 339 | register_local_user(struct Client *sourc
339
340		strlcpy(username, source_p->username, sizeof(username));
341
342	<	if (!IsNoTilde(aconf))
342	>	if (!IsNoTilde(conf))
343		source_p->username[i++] = '~';
344
345		for (; *p && i < USERLEN; ++p)
#	Line 354 | Line 350 | register_local_user(struct Client *sourc
350		}
351
352		/* password check */
353	<	if (!EmptyString(aconf->passwd))
353	>	if (!EmptyString(conf->passwd))
354		{
355		const char *pass = source_p->localClient->passwd;
356
357	<	if (!match_conf_password(pass, aconf))
357	>	if (!match_conf_password(pass, conf))
358		{
359		++ServerStats.is_ref;
360		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
#	Line 374 | Line 370 | register_local_user(struct Client *sourc
370		*/
371
372		/* report if user has &^>= etc. and set flags as needed in source_p */
373	<	report_and_set_user_flags(source_p, aconf);
373	>	report_and_set_user_flags(source_p, conf);
374
375		if (IsDead(source_p))
376		return;
#	Line 390 | Line 386 | register_local_user(struct Client *sourc
386		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
387		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
388		{
389	<	sendto_realops_flags(UMODE_FULL, L_ALL,
389	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
390		"Too many clients, rejecting %s[%s].",
391		source_p->name, source_p->host);
392		++ServerStats.is_ref;
#	Line 399 | Line 395 | register_local_user(struct Client *sourc
395		}
396
397		/* valid user name check */
398	<	if (valid_username(source_p->username) == 0)
398	>	if (!valid_username(source_p->username, 1))
399		{
400		char tmpstr2[IRCD_BUFSIZE];
401
402	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
402	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
403	>	"Invalid username: %s (%s@%s)",
404		source_p->name, source_p->username, source_p->host);
405		++ServerStats.is_ref;
406		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
#	Line 421 | Line 418 | register_local_user(struct Client *sourc
418		strlcpy(source_p->id, id, sizeof(source_p->id));
419		hash_add_id(source_p);
420
421	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
421	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
422		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
423		source_p->name, source_p->username, source_p->host,
424		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
425		"255.255.255.255" : source_p->sockhost,
426	<	get_client_class(source_p),
426	>	get_client_class(&source_p->localClient->confs),
427		source_p->info, source_p->id);
428
432	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
433	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
434	–	source_p->name, source_p->username, source_p->host,
435	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436	–	"255.255.255.255" : source_p->sockhost,
437	–	get_client_class(source_p),
438	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
439	–	"<hidden>" : source_p->localClient->client_host,
440	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
441	–	"<hidden>" : source_p->localClient->client_server,
442	–	source_p->info);
443	–
444	–
429		if (ConfigFileEntry.invisible_on_connect)
430		{
431		AddUMode(source_p, UMODE_INVISIBLE);
432		++Count.invisi;
433		}
434
435	<	if ((++Count.local) > Count.max_loc)
435	>	if (++Count.local > Count.max_loc)
436		{
437		Count.max_loc = Count.local;
438
439		if (!(Count.max_loc % 10))
440	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
440	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
441	>	"New Max Local Clients: %d",
442		Count.max_loc);
443		}
444
#	Line 486 | Line 471 | register_local_user(struct Client *sourc
471		*              - username to register as
472		*              - host name to register as
473		*              - server name
489	–	*              - realname (gecos)
474		* output       - NONE
475		* side effects - This function is called when a remote client
476		*                is introduced by a server.
477		*/
478		void
479	<	register_remote_user(struct Client *source_p,
480	<	const char *username, const char *host, const char *server,
497	<	const char *realname)
479	>	register_remote_user(struct Client *source_p, const char *username,
480	>	const char *host, const char *server)
481		{
482		struct Client *target_p = NULL;
483
484		assert(source_p != NULL);
485		assert(source_p->username != username);
486
487	<	strlcpy(source_p->host, host, sizeof(source_p->host));
487	>	strlcpy(source_p->host, host, sizeof(source_p->host));
488		strlcpy(source_p->username, username, sizeof(source_p->username));
489
490		/*
#	Line 509 | Line 492 | register_remote_user(struct Client *sour
492		*/
493		source_p->servptr = hash_find_server(server);
494
495	<	/* Super GhostDetect:
495	>	/*
496	>	* Super GhostDetect:
497		* If we can't find the server the user is supposed to be on,
498		* then simply blow the user away.        -Taner
499		*/
500		if (source_p->servptr == NULL)
501		{
502	<	sendto_realops_flags(UMODE_ALL, L_ALL,
502	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
503		"No server %s for user %s[%s@%s] from %s",
504		server, source_p->name, source_p->username,
505		source_p->host, source_p->from->name);
#	Line 528 | Line 512 | register_remote_user(struct Client *sour
512
513		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
514		{
515	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
515	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
516		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
517		source_p->from->name, source_p->name, source_p->username,
518		source_p->host, source_p->servptr->name,
#	Line 557 | Line 541 | register_remote_user(struct Client *sour
541		add_user_host(source_p->username, source_p->host, 1);
542		SetUserHost(source_p);
543
544	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
545	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
546	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
547	+	source_p->servptr->name,
548	+	source_p->name, source_p->username, source_p->host,
549	+	source_p->info, source_p->id);
550	+
551		introduce_client(source_p);
552		}
553
#	Line 572 | Line 563 | static void
563		introduce_client(struct Client *source_p)
564		{
565		dlink_node *server_node = NULL;
566	<	static char ubuf[12];
566	>	char ubuf[IRCD_BUFSIZE];
567
568		if (MyClient(source_p))
569		send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
#	Line 581 | Line 572 | introduce_client(struct Client *source_p
572
573		watch_check_hash(source_p, RPL_LOGON);
574
575	<	if (*ubuf == '\0')
575	>	if (ubuf[0] == '\0')
576		{
577		ubuf[0] = '+';
578		ubuf[1] = '\0';
#	Line 632 | Line 623 | introduce_client(struct Client *source_p
623		ubuf, source_p->username, source_p->host,
624		source_p->servptr->name, source_p->info);
625		}
626	+
627	+	if (!EmptyString(source_p->certfp))
628	+	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
629		}
630		}
631
#	Line 651 | Line 645 | valid_hostname(const char *hostname)
645
646		assert(p != NULL);
647
648	<	if (*p == '.' || *p == ':')
648	>	if (EmptyString(p) || *p == '.' || *p == ':')
649		return 0;
650
651		for (; *p; ++p)
652		if (!IsHostChar(*p))
653		return 0;
654
655	<	return 1;
655	>	return p - hostname <= HOSTLEN;
656		}
657
658		/* valid_username()
#	Line 673 | Line 667 | valid_hostname(const char *hostname)
667		* style of username
668		*/
669		int
670	<	valid_username(const char *username)
670	>	valid_username(const char *username, const int local)
671		{
672		int dots      = 0;
673		const char *p = username;
#	Line 683 | Line 677 | valid_username(const char *username)
677		if (*p == '~')
678		++p;
679
680	<	/* reject usernames that don't start with an alphanum
680	>	/*
681	>	* Reject usernames that don't start with an alphanum
682		* i.e. reject jokers who have '-@somehost' or '.@somehost'
683		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
684		*/
685		if (!IsAlNum(*p))
686		return 0;
687
688	<	while (*++p)
688	>	if (local)
689		{
690	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
690	>	while (*++p)
691		{
692	<	if (++dots > ConfigFileEntry.dots_in_ident)
693	<	return 0;
694	<	if (!IsUserChar(*(p + 1)))
692	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
693	>	{
694	>	if (++dots > ConfigFileEntry.dots_in_ident)
695	>	return 0;
696	>	if (!IsUserChar(*(p + 1)))
697	>	return 0;
698	>	}
699	>	else if (!IsUserChar(*p))
700		return 0;
701		}
702	<	else if (!IsUserChar(*p))
703	<	return 0;
702	>	}
703	>	else
704	>	{
705	>	while (*++p)
706	>	if (!IsUserChar(*p))
707	>	return 0;
708		}
709
710	<	return 1;
710	>	return  p - username <= USERLEN;;
711		}
712
713		/* clean_nick_name()
#	Line 734 | Line 738 | valid_nickname(const char *nickname, con
738		/* report_and_set_user_flags()
739		*
740		* inputs       - pointer to source_p
741	<	*              - pointer to aconf for this user
741	>	*              - pointer to conf for this user
742		* output       - NONE
743		* side effects - Report to user any special flags
744		*                they are getting, and set them.
745		*/
746		static void
747	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
747	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
748		{
749		/* If this user is being spoofed, tell them so */
750	<	if (IsConfDoSpoofIp(aconf))
747	<	{
750	>	if (IsConfDoSpoofIp(conf))
751		sendto_one(source_p,
752	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
752	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
753		me.name, source_p->name);
751	–	}
754
755		/* If this user is in the exception class, Set it "E lined" */
756	<	if (IsConfExemptKline(aconf))
756	>	if (IsConfExemptKline(conf))
757		{
758		SetExemptKline(source_p);
759		sendto_one(source_p,
760	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
760	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
761		me.name, source_p->name);
762		}
763
764	<	/* The else here is to make sure that G line exempt users
764	>	/*
765	>	* The else here is to make sure that G line exempt users
766		* do not get noticed twice.
767		*/
768	<	else if (IsConfExemptGline(aconf))
768	>	else if (IsConfExemptGline(conf))
769		{
770		SetExemptGline(source_p);
771	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
771	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
772		me.name, source_p->name);
773		}
774
775	<	if (IsConfExemptResv(aconf))
775	>	if (IsConfExemptResv(conf))
776		{
777		SetExemptResv(source_p);
778	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
778	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
779		me.name, source_p->name);
780		}
781
782		/* If this user is exempt from user limits set it "F lined" */
783	<	if (IsConfExemptLimits(aconf))
783	>	if (IsConfExemptLimits(conf))
784		{
785		SetExemptLimits(source_p);
786		sendto_one(source_p,
787	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
787	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
788		me.name,source_p->name);
789		}
790
791	<	if (IsConfCanFlood(aconf))
791	>	if (IsConfCanFlood(conf))
792		{
793		SetCanFlood(source_p);
794		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 794 | Line 797 | report_and_set_user_flags(struct Client
797		}
798		}
799
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	–
800		/* set_user_mode()
801		*
802		* added 15/10/91 By Darren Reed.
#	Line 829 | Line 806 | change_simple_umode(va_list args)
806		*/
807		void
808		set_user_mode(struct Client *client_p, struct Client *source_p,
809	<	int parc, char *parv[])
809	>	const int parc, char *parv[])
810		{
811		unsigned int flag, setflags;
812		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 846 | Line 823 | set_user_mode(struct Client *client_p, s
823		return;
824		}
825
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	–
826		if (source_p != target_p)
827		{
828		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
#	Line 865 | Line 835 | set_user_mode(struct Client *client_p, s
835		m = buf;
836		*m++ = '+';
837
838	<	for (i = 0; i < 128; i++)
838	>	for (i = 0; i < 128; ++i)
839		if (HasUMode(source_p, user_modes[i]))
840		*m++ = (char)i;
841		*m = '\0';
#	Line 875 | Line 845 | set_user_mode(struct Client *client_p, s
845		return;
846		}
847
878	–	execute_callback(entering_umode_cb, client_p, source_p);
879	–
848		/* find flags already set for user */
849		setflags = source_p->umodes;
850
851		/* parse mode change string(s) */
852	<	for (p = &parv[2]; p && *p; p++)
852	>	for (p = &parv[2]; p && *p; ++p)
853		{
854	<	for (m = *p; *m; m++)
854	>	for (m = *p; *m; ++m)
855		{
856		switch (*m)
857		{
#	Line 904 | Line 872 | set_user_mode(struct Client *client_p, s
872		}
873		else
874		{
907	–	/* Only decrement the oper counts if an oper to begin with
908	–	* found by Pat Szuta, Perly , perly@xnet.com
909	–	*/
875		if (!HasUMode(source_p, UMODE_OPER))
876		break;
877
#	Line 915 | Line 880 | set_user_mode(struct Client *client_p, s
880
881		if (MyConnect(source_p))
882		{
883	<	dlink_node *dm;
883	>	dlink_node *dm = NULL;
884
885	<	detach_conf(source_p, OPER_TYPE);
885	>	detach_conf(source_p, CONF_OPER);
886		ClrOFlag(source_p);
887		DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
888
#	Line 928 | Line 893 | set_user_mode(struct Client *client_p, s
893
894		break;
895
896	<	/* we may not get these,
897	<	* but they shouldnt be in default
898	<	*/
899	<	case 'r':
935	<	case ' ' :
936	<	case '\n':
937	<	case '\r':
938	<	case '\t':
896	>	case 'S':  /* Only servers may set +S in a burst */
897	>	case 'W':  /* Only servers may set +W in a burst */
898	>	case 'r':  /* Only services may set +r */
899	>	case 'x':  /* Only services may set +x */
900		break;
901
902		default:
#	Line 943 | Line 904 | set_user_mode(struct Client *client_p, s
904		{
905		if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
906		(ConfigFileEntry.oper_only_umodes & flag))
946	–	{
907		badflag = 1;
948	–	}
908		else
909	<	execute_callback(umode_cb, client_p, source_p, what, flag);
910	<	}
911	<	else
912	<	{
913	<	if (MyConnect(source_p))
914	<	badflag = 1;
909	>	{
910	>	if (what == MODE_ADD)
911	>	AddUMode(source_p, flag);
912	>	else
913	>	DelUMode(source_p, flag);
914	>	}
915		}
916	+	else if (MyConnect(source_p))
917	+	badflag = 1;
918
919		break;
920		}
#	Line 964 | Line 925 | set_user_mode(struct Client *client_p, s
925		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
926		me.name, source_p->name);
927
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	–
928		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
929		!HasOFlag(source_p, OPER_FLAG_ADMIN))
930		{
#	Line 1015 | Line 969 | send_umode(struct Client *client_p, stru
969		* build a string in umode_buf to represent the change in the user's
970		* mode between the new (source_p->umodes) and 'old'.
971		*/
972	<	for (i = 0; i < 128; i++)
972	>	for (i = 0; i < 128; ++i)
973		{
974		flag = user_modes[i];
975		if (!flag)
#	Line 1088 | Line 1042 | send_umode_out(struct Client *client_p,
1042		send_umode(client_p, source_p, old, 0xffffffff, buf);
1043		}
1044
1045	+	void
1046	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1047	+	{
1048	+	dlink_node *ptr = NULL;
1049	+
1050	+	if (!strcmp(target_p->host, hostname))
1051	+	return;
1052	+
1053	+	switch (what)
1054	+	{
1055	+	case MODE_ADD:
1056	+	AddUMode(target_p, UMODE_HIDDENHOST);
1057	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1058	+	break;
1059	+	case MODE_DEL:
1060	+	DelUMode(target_p, UMODE_HIDDENHOST);
1061	+
1062	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1063	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1064	+	break;
1065	+	default: return;
1066	+	}
1067	+
1068	+	if (ConfigFileEntry.cycle_on_host_change)
1069	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1070	+	target_p->name, target_p->username, target_p->host);
1071	+
1072	+	if (IsUserHostIp(target_p))
1073	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1074	+
1075	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1076	+
1077	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1078	+	SetUserHost(target_p);
1079	+
1080	+	if (MyClient(target_p))
1081	+	{
1082	+	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1083	+	target_p->name, target_p->host);
1084	+	clear_ban_cache_client(target_p);
1085	+	}
1086	+
1087	+	if (!ConfigFileEntry.cycle_on_host_change)
1088	+	return;
1089	+
1090	+	DLINK_FOREACH(ptr, target_p->channel.head)
1091	+	{
1092	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1093	+	char *p = modebuf;
1094	+	int len = 0;
1095	+	const struct Membership *ms = ptr->data;
1096	+
1097	+	if (has_member_flags(ms, CHFL_CHANOP))
1098	+	{
1099	+	*p++ = 'o';
1100	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1101	+	}
1102	+
1103	+	if (has_member_flags(ms, CHFL_HALFOP))
1104	+	{
1105	+	*p++ = 'h';
1106	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1107	+	}
1108	+
1109	+	if (has_member_flags(ms, CHFL_VOICE))
1110	+	{
1111	+	*p++ = 'v';
1112	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1113	+	}
1114	+
1115	+	*p = '\0';
1116	+
1117	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1118	+	target_p->name, target_p->username, target_p->host,
1119	+	ms->chptr->chname);
1120	+	if (nickbuf[0])
1121	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1122	+	target_p->servptr->name, ms->chptr->chname,
1123	+	modebuf, nickbuf);
1124	+
1125	+	}
1126	+
1127	+	if (target_p->away[0])
1128	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1129	+	":%s!%s@%s AWAY :%s",
1130	+	target_p->name, target_p->username,
1131	+	target_p->host, target_p->away);
1132	+	}
1133	+
1134		/* user_welcome()
1135		*
1136		* inputs       - client pointer to client to welcome
#	Line 1104 | Line 1147 | user_welcome(struct Client *source_p)
1147		#endif
1148
1149		#ifdef HAVE_LIBCRYPTO
1150	<	if (source_p->localClient->fd.ssl != NULL)
1150	>	if (HasFlag(source_p, FLAGS_SSL))
1151	>	{
1152	>	AddUMode(source_p, UMODE_SSL);
1153		sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1154		me.name, source_p->name,
1155		ssl_get_cipher(source_p->localClient->fd.ssl));
1156	+	}
1157		#endif
1158
1159	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1159	>	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1160		ServerInfo.network_name, source_p->name);
1161		sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1162		get_listener_name(source_p->localClient->listener), ircd_version);
#	Line 1125 | Line 1171 | user_welcome(struct Client *source_p)
1171		source_p->name, source_p->id);
1172
1173		show_lusers(source_p);
1174	<
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);
1174	>	motd_signon(source_p);
1175		}
1176
1177		/* check_xline()
#	Line 1154 | Line 1183 | user_welcome(struct Client *source_p)
1183		static int
1184		check_xline(struct Client *source_p)
1185		{
1186	<	struct ConfItem *conf = NULL;
1186	>	struct MaskItem *conf = NULL;
1187		const char *reason = NULL;
1188
1189	<	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)))
1189	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1190		{
1191	<	struct MatchItem *reg = map_to_conf(conf);
1164	<
1165	<	++reg->count;
1191	>	++conf->count;
1192
1193	<	if (reg->reason != NULL)
1194	<	reason = reg->reason;
1193	>	if (conf->reason != NULL)
1194	>	reason = conf->reason;
1195		else
1196		reason = "No Reason";
1197
1198	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1198	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1199		"X-line Rejecting [%s] [%s], user %s [%s]",
1200		source_p->info, reason,
1201		get_client_name(source_p, HIDE_IP),
#	Line 1187 | Line 1213 | check_xline(struct Client *source_p)
1213		*
1214		* inputs       - pointer to given client to oper
1215		* output       - NONE
1216	<	* side effects - Blindly opers up given source_p, using aconf info
1216	>	* side effects - Blindly opers up given source_p, using conf info
1217		*                all checks on passwords have already been done.
1218	<	*                This could also be used by rsa oper routines.
1218	>	*                This could also be used by rsa oper routines.
1219		*/
1220		void
1221		oper_up(struct Client *source_p)
1222		{
1223		const unsigned int old = source_p->umodes;
1224	<	const struct AccessItem *oconf = NULL;
1224	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1225
1226		assert(source_p->localClient->confs.head);
1201	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1227
1228		++Count.oper;
1229		SetOper(source_p);
1230
1231	<	if (oconf->modes)
1232	<	AddUMode(source_p, oconf->modes);
1231	>	if (conf->modes)
1232	>	AddUMode(source_p, conf->modes);
1233		else if (ConfigFileEntry.oper_umodes)
1234		AddUMode(source_p, ConfigFileEntry.oper_umodes);
1235
#	Line 1216 | Line 1241 | oper_up(struct Client *source_p)
1241		assert(dlinkFind(&oper_list, source_p) == NULL);
1242		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1243
1244	<	AddOFlag(source_p, oconf->port);
1244	>	AddOFlag(source_p, conf->port);
1245
1246		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1247		AddUMode(source_p, UMODE_ADMIN);
1223	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1224	–	DelUMode(source_p, UMODE_NCHANGE);
1248
1249	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s is now an operator",
1249	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1250		get_oper_name(source_p));
1251		send_umode_out(source_p, source_p, old);
1252		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
#	Line 1244 | Line 1267 | valid_sid(const char *sid)
1267
1268		/*
1269		* init_uid()
1270	<	*
1270	>	*
1271		* inputs       - NONE
1272		* output       - NONE
1273		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1254 | Line 1277 | valid_sid(const char *sid)
1277		void
1278		init_uid(void)
1279		{
1280	<	int i;
1280	>	unsigned int i;
1281
1282		memset(new_uid, 0, sizeof(new_uid));
1283
#	Line 1262 | Line 1285 | init_uid(void)
1285		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1286
1287		for (i = 0; i < IRC_MAXSID; ++i)
1288	<	if (new_uid[i] == '\0')
1288	>	if (new_uid[i] == '\0')
1289		new_uid[i] = 'A';
1290
1291		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1269	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1270	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1271	–	* -Dianora
1272	–	*/
1292		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);
1293		}
1294
1295		/*
#	Line 1333 | Line 1349 | uid_get(void)
1349		void
1350		init_isupport(void)
1351		{
1336	–	isupportFile = init_MessageLine();
1337	–
1352		add_isupport("CALLERID", NULL, -1);
1353		add_isupport("CASEMAPPING", CASEMAP, -1);
1354		add_isupport("DEAF", "D", -1);
1355		add_isupport("KICKLEN", NULL, KICKLEN);
1356		add_isupport("MODES", NULL, MAXMODEPARAMS);
1343	–	add_isupport("NICKLEN", NULL, NICKLEN);
1357		#ifdef HALFOPS
1358		add_isupport("PREFIX", "(ohv)@%+", -1);
1359		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1348 | Line 1361 | init_isupport(void)
1361		add_isupport("PREFIX", "(ov)@+", -1);
1362		add_isupport("STATUSMSG", "@+", -1);
1363		#endif
1364	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1364	>	add_isupport("EXCEPTS", "e", -1);
1365	>	add_isupport("INVEX", "I", -1);
1366		}
1367
1368		/*
#	Line 1383 | Line 1397 | add_isupport(const char *name, const cha
1397		dlinkAddTail(support, &support->node, &support_list);
1398		}
1399
1400	<	DupString(support->name, name);
1400	>	support->name = xstrdup(name);
1401		if (options != NULL)
1402	<	DupString(support->options, options);
1402	>	support->options = xstrdup(options);
1403		support->number = n;
1404
1405		rebuild_isupport_message_line();
#	Line 1432 | Line 1446 | rebuild_isupport_message_line(void)
1446		{
1447		char isupportbuffer[IRCD_BUFSIZE];
1448		char *p = isupportbuffer;
1449	<	dlink_node *ptr = NULL;
1449	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1450		int n = 0;
1451		int tokens = 0;
1452		size_t len = 0;
1453		size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1454
1455	<	destroy_MessageLine(isupportFile);
1455	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1456	>	{
1457	>	dlinkDelete(ptr, &support_list_lines);
1458	>	MyFree(ptr->data);
1459	>	free_dlink_node(ptr);
1460	>	}
1461
1462		DLINK_FOREACH(ptr, support_list.head)
1463		{
1464		struct Isupport *support = ptr->data;
1465
1466	<	p += (n = ircsprintf(p, "%s", support->name));
1466	>	p += (n = sprintf(p, "%s", support->name));
1467		len += n;
1468
1469		if (support->options != NULL)
1470		{
1471	<	p += (n = ircsprintf(p, "=%s", support->options));
1471	>	p += (n = sprintf(p, "=%s", support->options));
1472		len += n;
1473		}
1474
1475		if (support->number > 0)
1476		{
1477	<	p += (n = ircsprintf(p, "=%d", support->number));
1477	>	p += (n = sprintf(p, "=%d", support->number));
1478		len += n;
1479		}
1480
#	Line 1468 | Line 1487 | rebuild_isupport_message_line(void)
1487		if (*--p == ' ')
1488		*p = '\0';
1489
1490	<	addto_MessageLine(isupportFile, isupportbuffer);
1490	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1491		p = isupportbuffer;
1492		len = 0;
1493		n = tokens = 0;
#	Line 1479 | Line 1498 | rebuild_isupport_message_line(void)
1498		{
1499		if (*--p == ' ')
1500		*p = '\0';
1501	<	addto_MessageLine(isupportFile, isupportbuffer);
1501	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1502		}
1503		}

Diff Legend

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