ViewVC Help

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

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

Comparing:
ircd-hybrid-7.3/src/s_user.c (file contents), Revision 1115 by michael, Tue Dec 21 14:42:54 2010 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2134 by michael, Wed May 29 18:59:39 2013 UTC

#	Line 29 | Line 29
29		#include "channel.h"
30		#include "channel_mode.h"
31		#include "client.h"
32	–	#include "common.h"
32		#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
35		#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
38		#include "motd.h"
39		#include "numeric.h"
40	<	#include "s_conf.h"
41	<	#include "s_log.h"
40	>	#include "conf.h"
41	>	#include "log.h"
42		#include "s_serv.h"
43		#include "send.h"
44		#include "supported.h"
#	Line 51 | Line 49
49		#include "userhost.h"
50		#include "hook.h"
51		#include "s_misc.h"
52	<	#include "msg.h"
52	>	#include "parse.h"
53		#include "watch.h"
54
57	–	unsigned int MaxClientCount     = 1;
58	–	unsigned int MaxConnectionCount = 1;
59	–	struct Callback *entering_umode_cb = NULL;
60	–	struct Callback *umode_cb = NULL;
55
56		static char umode_buffer[IRCD_BUFSIZE];
57
58		static void user_welcome(struct Client *);
59	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
59	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
60		static int check_xline(struct Client *);
61		static void introduce_client(struct Client *);
62		static const char *uid_get(void);
#	Line 83 | Line 77 | static dlink_list support_list = { NULL,
77		MessageFile *isupportFile;
78
79		/* memory is cheap. map 0-255 to equivalent mode */
80	<	unsigned int user_modes[256] =
80	>	const unsigned int user_modes[256] =
81		{
82		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
83		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 95 | Line 89 | unsigned int user_modes[256] =
89		UMODE_CCONN_FULL,   /* C */
90		UMODE_DEAF,         /* D */
91		0,                  /* E */
92	<	0,                  /* F */
92	>	UMODE_FARCONNECT,   /* F */
93		UMODE_SOFTCALLERID, /* G */
94	<	0,                  /* H */
94	>	UMODE_HIDDEN,       /* H */
95		0,                  /* I */
96		0,                  /* J */
97		0,                  /* K */
#	Line 107 | Line 101 | unsigned int user_modes[256] =
101		0,                  /* O */
102		0,                  /* P */
103		0,                  /* Q */
104	<	0,                  /* R */
104	>	UMODE_REGONLY,      /* R */
105		0,                  /* S */
106		0,                  /* T */
107		0,                  /* U */
#	Line 122 | Line 116 | unsigned int user_modes[256] =
116		UMODE_BOTS,         /* b */
117		UMODE_CCONN,        /* c */
118		UMODE_DEBUG,        /* d */
119	<	0,                  /* e */
119	>	UMODE_EXTERNAL,     /* e */
120		UMODE_FULL,         /* f */
121		UMODE_CALLERID,     /* g */
122		0,                  /* h */
123		UMODE_INVISIBLE,    /* i */
124	<	0,                  /* j */
124	>	UMODE_REJ,          /* j */
125		UMODE_SKILL,        /* k */
126		UMODE_LOCOPS,       /* l */
127		0,                  /* m */
#	Line 135 | Line 129 | unsigned int user_modes[256] =
129		UMODE_OPER,         /* o */
130		0,                  /* p */
131		0,                  /* q */
132	<	UMODE_REJ,          /* r */
132	>	UMODE_REGISTERED,   /* r */
133		UMODE_SERVNOTICE,   /* s */
134		0,                  /* t */
135		UMODE_UNAUTH,       /* u */
136		0,                  /* v */
137		UMODE_WALLOP,       /* w */
138	<	UMODE_EXTERNAL,     /* x */
138	>	0,                  /* x */
139		UMODE_SPY,          /* y */
140		UMODE_OPERWALL,     /* z      0x7A */
141		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 191 | Line 185 | show_lusers(struct Client *source_p)
185		to = source_p->name;
186		}
187
188	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
188	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
189		sendto_one(source_p, form_str(RPL_LUSERCLIENT),
190		from, to, (Count.total-Count.invisi),
191		Count.invisi, dlink_list_length(&global_serv_list));
#	Line 211 | Line 205 | show_lusers(struct Client *source_p)
205		sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
206		from, to, dlink_list_length(&global_channel_list));
207
208	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
208	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
209		{
210		sendto_one(source_p, form_str(RPL_LUSERME),
211		from, to, Count.local, Count.myserver);
212		sendto_one(source_p, form_str(RPL_LOCALUSERS),
213	<	from, to, Count.local, Count.max_loc,
220	<	Count.local, Count.max_loc);
213	>	from, to, Count.local, Count.max_loc);
214		}
215		else
216		{
217		sendto_one(source_p, form_str(RPL_LUSERME),
218		from, to, Count.total, 0);
219		sendto_one(source_p, form_str(RPL_LOCALUSERS),
220	<	from, to, Count.total, Count.max_tot,
228	<	Count.total, Count.max_tot);
220	>	from, to, Count.total, Count.max_tot);
221		}
222
223		sendto_one(source_p, form_str(RPL_GLOBALUSERS),
224	<	from, to, Count.total, Count.max_tot,
233	<	Count.total, Count.max_tot);
224	>	from, to, Count.total, Count.max_tot);
225
226	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
226	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
227		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
228	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
228	>	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
229
230	<	if (Count.local > MaxClientCount)
231	<	MaxClientCount = Count.local;
230	>	if (Count.local > Count.max_loc_cli)
231	>	Count.max_loc_cli = Count.local;
232
233	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
234	<	MaxConnectionCount = Count.local + Count.myserver;
233	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
234	>	Count.max_loc_con = Count.local + Count.myserver;
235		}
236
237		/* show_isupport()
#	Line 282 | Line 273 | void
273		register_local_user(struct Client *source_p)
274		{
275		const char *id = NULL;
276	<	const struct AccessItem *aconf = NULL;
286	<	dlink_node *ptr = NULL;
287	<	dlink_node *m = NULL;
276	>	const struct MaskItem *conf = NULL;
277
278		assert(source_p != NULL);
279		assert(source_p == source_p->from);
#	Line 311 | Line 300 | register_local_user(struct Client *sourc
300		return;
301		}
302
303	<	source_p->localClient->last = CurrentTime;
303	>	source_p->localClient->last_privmsg = CurrentTime;
304		/* Straight up the maximum rate of flooding... */
305		source_p->localClient->allow_read = MAX_FLOOD_BURST;
306
307	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
307	>	if (!check_client(source_p))
308		return;
309
310		if (valid_hostname(source_p->host) == 0)
#	Line 326 | Line 315 | register_local_user(struct Client *sourc
315		sizeof(source_p->host));
316		}
317
318	<	ptr   = source_p->localClient->confs.head;
330	<	aconf = map_to_conf(ptr->data);
318	>	conf = source_p->localClient->confs.head->data;
319
320		if (!IsGotId(source_p))
321		{
#	Line 335 | Line 323 | register_local_user(struct Client *sourc
323		const char *p = username;
324		unsigned int i = 0;
325
326	<	if (IsNeedIdentd(aconf))
326	>	if (IsNeedIdentd(conf))
327		{
328		++ServerStats.is_ref;
329		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
#	Line 346 | Line 334 | register_local_user(struct Client *sourc
334
335		strlcpy(username, source_p->username, sizeof(username));
336
337	<	if (!IsNoTilde(aconf))
337	>	if (!IsNoTilde(conf))
338		source_p->username[i++] = '~';
339
340		for (; *p && i < USERLEN; ++p)
#	Line 357 | Line 345 | register_local_user(struct Client *sourc
345		}
346
347		/* password check */
348	<	if (!EmptyString(aconf->passwd))
348	>	if (!EmptyString(conf->passwd))
349		{
350		const char *pass = source_p->localClient->passwd;
351
352	<	if (!match_conf_password(pass, aconf))
352	>	if (!match_conf_password(pass, conf))
353		{
354		++ServerStats.is_ref;
355		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
#	Line 377 | Line 365 | register_local_user(struct Client *sourc
365		*/
366
367		/* report if user has &^>= etc. and set flags as needed in source_p */
368	<	report_and_set_user_flags(source_p, aconf);
368	>	report_and_set_user_flags(source_p, conf);
369
370		if (IsDead(source_p))
371		return;
#	Line 393 | Line 381 | register_local_user(struct Client *sourc
381		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
382		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
383		{
384	<	sendto_realops_flags(UMODE_FULL, L_ALL,
384	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
385		"Too many clients, rejecting %s[%s].",
386		source_p->name, source_p->host);
387		++ServerStats.is_ref;
#	Line 402 | Line 390 | register_local_user(struct Client *sourc
390		}
391
392		/* valid user name check */
393	<	if (valid_username(source_p->username) == 0)
393	>	if (valid_username(source_p->username, 1) == 0)
394		{
395		char tmpstr2[IRCD_BUFSIZE];
396
397	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
397	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
398	>	"Invalid username: %s (%s@%s)",
399		source_p->name, source_p->username, source_p->host);
400		++ServerStats.is_ref;
401	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
401	>	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
402	>	source_p->username);
403		exit_client(source_p, &me, tmpstr2);
404		return;
405		}
#	Line 423 | Line 413 | register_local_user(struct Client *sourc
413		strlcpy(source_p->id, id, sizeof(source_p->id));
414		hash_add_id(source_p);
415
416	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
417	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
416	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
417	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
418		source_p->name, source_p->username, source_p->host,
419		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
420		"255.255.255.255" : source_p->sockhost,
421	<	get_client_class(source_p),
422	<	source_p->info);
421	>	get_client_class(&source_p->localClient->confs),
422	>	source_p->info, source_p->id);
423
424	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
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),
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) ?
#	Line 446 | Line 436 | register_local_user(struct Client *sourc
436
437		if (ConfigFileEntry.invisible_on_connect)
438		{
439	<	source_p->umodes |= UMODE_INVISIBLE;
439	>	AddUMode(source_p, UMODE_INVISIBLE);
440		++Count.invisi;
441		}
442
#	Line 455 | Line 445 | register_local_user(struct Client *sourc
445		Count.max_loc = Count.local;
446
447		if (!(Count.max_loc % 10))
448	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
448	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
449	>	"New Max Local Clients: %d",
450		Count.max_loc);
451		}
452
#	Line 470 | Line 461 | register_local_user(struct Client *sourc
461
462		source_p->localClient->allow_read = MAX_FLOOD_BURST;
463
464	<	assert(dlinkFindDelete(&unknown_list, source_p));
464	>	assert(dlinkFind(&unknown_list, source_p));
465
466	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
467	<	{
477	<	free_dlink_node(m);
478	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
479	<	}
466	>	dlink_move_node(&source_p->localClient->lclient_node,
467	>	&unknown_list, &local_client_list);
468
469		user_welcome(source_p);
470		add_user_host(source_p->username, source_p->host, 0);
#	Line 512 | Line 500 | register_remote_user(struct Client *sour
500		/*
501		* coming from another server, take the servers word for it
502		*/
503	<	source_p->servptr = find_server(server);
503	>	source_p->servptr = hash_find_server(server);
504
505	<	/* Super GhostDetect:
505	>	/*
506	>	* Super GhostDetect:
507		* If we can't find the server the user is supposed to be on,
508		* then simply blow the user away.        -Taner
509		*/
510		if (source_p->servptr == NULL)
511		{
512	<	sendto_realops_flags(UMODE_ALL, L_ALL,
512	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
513		"No server %s for user %s[%s@%s] from %s",
514		server, source_p->name, source_p->username,
515		source_p->host, source_p->from->name);
516		kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
517
518	<	SetKilled(source_p);
518	>	AddFlag(source_p, FLAGS_KILLED);
519		exit_client(source_p, &me, "Ghosted Client");
520		return;
521		}
522
523		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
524		{
525	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
525	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
526		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
527		source_p->from->name, source_p->name, source_p->username,
528		source_p->host, source_p->servptr->name,
#	Line 541 | Line 530 | register_remote_user(struct Client *sour
530		kill_client(source_p->from, source_p,
531		"%s (NICK from wrong direction (%s != %s))",
532		me.name, source_p->servptr->name, target_p->from->name);
533	<	SetKilled(source_p);
533	>	AddFlag(source_p, FLAGS_KILLED);
534		exit_client(source_p, &me, "USER server wrong direction");
535		return;
536		}
537
538	+	/*
539	+	* If the nick has been introduced by a services server,
540	+	* make it a service as well.
541	+	*/
542	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
543	+	AddFlag(source_p, FLAGS_SERVICE);
544	+
545		/* Increment our total user count here */
546		if (++Count.total > Count.max_tot)
547		Count.max_tot = Count.total;
#	Line 555 | Line 551 | register_remote_user(struct Client *sour
551		add_user_host(source_p->username, source_p->host, 1);
552		SetUserHost(source_p);
553
554	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
555	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
556	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
557	+	source_p->servptr->name,
558	+	source_p->name, source_p->username, source_p->host,
559	+	source_p->info, source_p->id);
560	+
561		introduce_client(source_p);
562		}
563
#	Line 592 | Line 595 | introduce_client(struct Client *source_p
595		if (server == source_p->from)
596		continue;
597
598	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
599	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
600	<	source_p->servptr->id,
601	<	source_p->name, source_p->hopcount+1,
602	<	(unsigned long)source_p->tsinfo,
603	<	ubuf, source_p->username, source_p->host,
604	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
605	<	"0" : source_p->sockhost, source_p->id, source_p->info);
598	>	if (IsCapable(server, CAP_SVS))
599	>	{
600	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
601	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
602	>	source_p->servptr->id,
603	>	source_p->name, source_p->hopcount+1,
604	>	(unsigned long)source_p->tsinfo,
605	>	ubuf, source_p->username, source_p->host,
606	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
607	>	"0" : source_p->sockhost, source_p->id,
608	>	source_p->svid,
609	>	source_p->info);
610	>	else
611	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
612	>	source_p->name, source_p->hopcount+1,
613	>	(unsigned long)source_p->tsinfo,
614	>	ubuf, source_p->username, source_p->host,
615	>	source_p->servptr->name, source_p->svid,
616	>	source_p->info);
617	>
618	>	}
619		else
620	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
621	<	source_p->name, source_p->hopcount+1,
622	<	(unsigned long)source_p->tsinfo,
623	<	ubuf, source_p->username, source_p->host,
624	<	source_p->servptr->name, source_p->info);
620	>	{
621	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
622	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
623	>	source_p->servptr->id,
624	>	source_p->name, source_p->hopcount+1,
625	>	(unsigned long)source_p->tsinfo,
626	>	ubuf, source_p->username, source_p->host,
627	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
628	>	"0" : source_p->sockhost, source_p->id, source_p->info);
629	>	else
630	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
631	>	source_p->name, source_p->hopcount+1,
632	>	(unsigned long)source_p->tsinfo,
633	>	ubuf, source_p->username, source_p->host,
634	>	source_p->servptr->name, source_p->info);
635	>	}
636		}
637		}
638
#	Line 632 | Line 659 | valid_hostname(const char *hostname)
659		if (!IsHostChar(*p))
660		return 0;
661
662	<	return 1;
662	>	return p - hostname <= HOSTLEN;
663		}
664
665		/* valid_username()
#	Line 647 | Line 674 | valid_hostname(const char *hostname)
674		* style of username
675		*/
676		int
677	<	valid_username(const char *username)
677	>	valid_username(const char *username, const int local)
678		{
679		int dots      = 0;
680		const char *p = username;
#	Line 657 | Line 684 | valid_username(const char *username)
684		if (*p == '~')
685		++p;
686
687	<	/* reject usernames that don't start with an alphanum
687	>	/*
688	>	* Reject usernames that don't start with an alphanum
689		* i.e. reject jokers who have '-@somehost' or '.@somehost'
690		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
691		*/
692		if (!IsAlNum(*p))
693		return 0;
694
695	<	while (*++p)
695	>	if (local)
696		{
697	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
697	>	while (*++p)
698		{
699	<	if (++dots > ConfigFileEntry.dots_in_ident)
700	<	return 0;
701	<	if (!IsUserChar(*(p + 1)))
699	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
700	>	{
701	>	if (++dots > ConfigFileEntry.dots_in_ident)
702	>	return 0;
703	>	if (!IsUserChar(*(p + 1)))
704	>	return 0;
705	>	}
706	>	else if (!IsUserChar(*p))
707		return 0;
708		}
709	<	else if (!IsUserChar(*p))
710	<	return 0;
709	>	}
710	>	else
711	>	{
712	>	while (*++p)
713	>	if (!IsUserChar(*p))
714	>	return 0;
715		}
716
717	<	return 1;
717	>	return  p - username <= USERLEN;;
718	>	}
719	>
720	>	/* clean_nick_name()
721	>	*
722	>	* input        - nickname
723	>	*              - whether it's a local nick (1) or remote (0)
724	>	* output       - none
725	>	* side effects - walks through the nickname, returning 0 if erroneous
726	>	*/
727	>	int
728	>	valid_nickname(const char *nickname, const int local)
729	>	{
730	>	const char *p = nickname;
731	>	assert(nickname && *nickname);
732	>
733	>	/* nicks can't start with a digit or - or be 0 length */
734	>	/* This closer duplicates behaviour of hybrid-6 */
735	>	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
736	>	return 0;
737	>
738	>	for (; *p; ++p)
739	>	if (!IsNickChar(*p))
740	>	return 0;
741	>
742	>	return p - nickname <= NICKLEN;
743		}
744
745		/* report_and_set_user_flags()
746		*
747		* inputs       - pointer to source_p
748	<	*              - pointer to aconf for this user
748	>	*              - pointer to conf for this user
749		* output       - NONE
750		* side effects - Report to user any special flags
751		*                they are getting, and set them.
752		*/
753		static void
754	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
754	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
755		{
756		/* If this user is being spoofed, tell them so */
757	<	if (IsConfDoSpoofIp(aconf))
696	<	{
757	>	if (IsConfDoSpoofIp(conf))
758		sendto_one(source_p,
759	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
759	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
760		me.name, source_p->name);
700	–	}
761
762		/* If this user is in the exception class, Set it "E lined" */
763	<	if (IsConfExemptKline(aconf))
763	>	if (IsConfExemptKline(conf))
764		{
765		SetExemptKline(source_p);
766		sendto_one(source_p,
767	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
767	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
768		me.name, source_p->name);
769		}
770
771		/* The else here is to make sure that G line exempt users
772		* do not get noticed twice.
773		*/
774	<	else if (IsConfExemptGline(aconf))
774	>	else if (IsConfExemptGline(conf))
775		{
776		SetExemptGline(source_p);
777	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
777	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
778		me.name, source_p->name);
779		}
780
781	<	if (IsConfExemptResv(aconf))
781	>	if (IsConfExemptResv(conf))
782		{
783		SetExemptResv(source_p);
784	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
784	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
785		me.name, source_p->name);
786		}
787
788		/* If this user is exempt from user limits set it "F lined" */
789	<	if (IsConfExemptLimits(aconf))
789	>	if (IsConfExemptLimits(conf))
790		{
791		SetExemptLimits(source_p);
792		sendto_one(source_p,
793	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
793	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
794		me.name,source_p->name);
795		}
796
797	<	/* If this user is exempt from idle time outs */
738	<	if (IsConfIdlelined(aconf))
739	<	{
740	<	SetIdlelined(source_p);
741	<	sendto_one(source_p,
742	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
743	<	me.name, source_p->name);
744	<	}
745	<
746	<	if (IsConfCanFlood(aconf))
797	>	if (IsConfCanFlood(conf))
798		{
799		SetCanFlood(source_p);
800		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 752 | Line 803 | report_and_set_user_flags(struct Client
803		}
804		}
805
755	–	/* change_simple_umode()
756	–	*
757	–	* this callback can be hooked to allow special handling of
758	–	* certain usermodes
759	–	*/
760	–	static void *
761	–	change_simple_umode(va_list args)
762	–	{
763	–	struct Client *client_p;
764	–	struct Client *source_p;
765	–	int what;
766	–	unsigned int flag;
767	–
768	–	client_p = va_arg(args, struct Client *);
769	–	source_p = va_arg(args, struct Client *);
770	–	what = va_arg(args, int);
771	–	flag = va_arg(args, unsigned int);
772	–
773	–	if (what == MODE_ADD)
774	–	source_p->umodes |= flag;
775	–	else
776	–	source_p->umodes &= ~flag;
777	–
778	–	return NULL;
779	–	}
780	–
806		/* set_user_mode()
807		*
808		* added 15/10/91 By Darren Reed.
#	Line 787 | Line 812 | change_simple_umode(va_list args)
812		*/
813		void
814		set_user_mode(struct Client *client_p, struct Client *source_p,
815	<	int parc, char *parv[])
815	>	const int parc, char *parv[])
816		{
817		unsigned int flag, setflags;
818		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 804 | Line 829 | set_user_mode(struct Client *client_p, s
829		return;
830		}
831
807	–	if (IsServer(source_p))
808	–	{
809	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
810	–	parv[1], source_p->name);
811	–	return;
812	–	}
813	–
832		if (source_p != target_p)
833		{
834		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
#	Line 824 | Line 842 | set_user_mode(struct Client *client_p, s
842		*m++ = '+';
843
844		for (i = 0; i < 128; i++)
845	<	if (source_p->umodes & user_modes[i])
845	>	if (HasUMode(source_p, user_modes[i]))
846		*m++ = (char)i;
847		*m = '\0';
848
#	Line 833 | Line 851 | set_user_mode(struct Client *client_p, s
851		return;
852		}
853
836	–	execute_callback(entering_umode_cb, client_p, source_p);
837	–
854		/* find flags already set for user */
855		setflags = source_p->umodes;
856
#	Line 854 | Line 870 | set_user_mode(struct Client *client_p, s
870		case 'o':
871		if (what == MODE_ADD)
872		{
873	<	if (IsServer(client_p) && !IsOper(source_p))
873	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
874		{
875		++Count.oper;
876		SetOper(source_p);
#	Line 865 | Line 881 | set_user_mode(struct Client *client_p, s
881		/* Only decrement the oper counts if an oper to begin with
882		* found by Pat Szuta, Perly , perly@xnet.com
883		*/
884	<	if (!IsOper(source_p))
884	>	if (!HasUMode(source_p, UMODE_OPER))
885		break;
886
887		ClearOper(source_p);
872	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
888		Count.oper--;
889
890		if (MyConnect(source_p))
891		{
892		dlink_node *dm;
893
894	<	detach_conf(source_p, OPER_TYPE);
895	<	ClearOperFlags(source_p);
894	>	detach_conf(source_p, CONF_OPER);
895	>	ClrOFlag(source_p);
896	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
897
898		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
899		free_dlink_node(dm);
#	Line 886 | Line 902 | set_user_mode(struct Client *client_p, s
902
903		break;
904
905	<	/* we may not get these,
890	<	* but they shouldnt be in default
891	<	*/
892	<	case ' ' :
893	<	case '\n':
894	<	case '\r':
895	<	case '\t':
905	>	case 'r':  /* Only services may set +r */
906		break;
907
908		default:
909		if ((flag = user_modes[(unsigned char)*m]))
910		{
911	<	if (MyConnect(source_p) && !IsOper(source_p) &&
911	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
912		(ConfigFileEntry.oper_only_umodes & flag))
903	–	{
913		badflag = 1;
905	–	}
914		else
915	<	execute_callback(umode_cb, client_p, source_p, what, flag);
915	>	{
916	>	if (what == MODE_ADD)
917	>	AddUMode(source_p, flag);
918	>	else
919	>	DelUMode(source_p, flag);
920	>	}
921		}
922		else
923		{
#	Line 921 | Line 934 | set_user_mode(struct Client *client_p, s
934		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
935		me.name, source_p->name);
936
937	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
937	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
938	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
939		{
940		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
941		me.name, source_p->name);
942	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
942	>	DelUMode(source_p, UMODE_ADMIN);
943		}
944
945	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
932	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
933	<	{
934	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
935	<	me.name, source_p->name);
936	<	source_p->umodes &= ~UMODE_ADMIN;
937	<	}
938	<
939	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
945	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
946		++Count.invisi;
947	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
947	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
948		--Count.invisi;
949
950		/*
#	Line 981 | Line 987 | send_umode(struct Client *client_p, stru
987		if (MyClient(source_p) && !(flag & sendmask))
988		continue;
989
990	<	if ((flag & old) && !(source_p->umodes & flag))
990	>	if ((flag & old) && !HasUMode(source_p, flag))
991		{
992		if (what == MODE_DEL)
993		*m++ = (char)i;
#	Line 992 | Line 998 | send_umode(struct Client *client_p, stru
998		*m++ = (char)i;
999		}
1000		}
1001	<	else if (!(flag & old) && (source_p->umodes & flag))
1001	>	else if (!(flag & old) && HasUMode(source_p, flag))
1002		{
1003		if (what == MODE_ADD)
1004		*m++ = (char)i;
#	Line 1026 | Line 1032 | send_umode_out(struct Client *client_p,
1032		char buf[IRCD_BUFSIZE] = { '\0' };
1033		dlink_node *ptr = NULL;
1034
1035	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1030	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1035	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1036
1037		if (buf[0])
1038		{
#	Line 1046 | Line 1051 | send_umode_out(struct Client *client_p,
1051		send_umode(client_p, source_p, old, 0xffffffff, buf);
1052		}
1053
1054	+	void
1055	+	user_set_hostmask(struct Client *target_p, const char *hostname)
1056	+	{
1057	+	if (!valid_hostname(hostname))
1058	+	return;
1059	+
1060	+	if (IsUserHostIp(target_p))
1061	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1062	+
1063	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1064	+	SetIPSpoof(target_p);
1065	+
1066	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1067	+	SetUserHost(target_p);
1068	+
1069	+	if (MyClient(target_p))
1070	+	clear_ban_cache_client(target_p);
1071	+	}
1072	+
1073		/* user_welcome()
1074		*
1075		* inputs       - client pointer to client to welcome
#	Line 1112 | Line 1136 | user_welcome(struct Client *source_p)
1136		static int
1137		check_xline(struct Client *source_p)
1138		{
1139	<	struct ConfItem *conf = NULL;
1139	>	struct MaskItem *conf = NULL;
1140		const char *reason = NULL;
1141
1142	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1119	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1142	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1143		{
1144	<	struct MatchItem *reg = map_to_conf(conf);
1122	<
1123	<	++reg->count;
1144	>	++conf->count;
1145
1146	<	if (reg->reason != NULL)
1147	<	reason = reg->reason;
1146	>	if (conf->reason != NULL)
1147	>	reason = conf->reason;
1148		else
1149		reason = "No Reason";
1150
1151	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1151	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1152		"X-line Rejecting [%s] [%s], user %s [%s]",
1153		source_p->info, reason,
1154		get_client_name(source_p, HIDE_IP),
1155		source_p->sockhost);
1156
1157		++ServerStats.is_ref;
1158	<	if (REJECT_HOLD_TIME > 0)
1138	<	{
1139	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1140	<	me.name, source_p->name);
1141	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1142	<	SetCaptured(source_p);
1143	<	}
1144	<	else
1145	<	exit_client(source_p, &me, "Bad user info");
1158	>	exit_client(source_p, &me, "Bad user info");
1159		return 1;
1160		}
1161
#	Line 1153 | Line 1166 | check_xline(struct Client *source_p)
1166		*
1167		* inputs       - pointer to given client to oper
1168		* output       - NONE
1169	<	* side effects - Blindly opers up given source_p, using aconf info
1169	>	* side effects - Blindly opers up given source_p, using conf info
1170		*                all checks on passwords have already been done.
1171		*                This could also be used by rsa oper routines.
1172		*/
1173		void
1174		oper_up(struct Client *source_p)
1175		{
1176	<	unsigned int old = source_p->umodes;
1177	<	const char *operprivs = "";
1165	<	const struct AccessItem *oconf = NULL;
1176	>	const unsigned int old = source_p->umodes;
1177	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1178
1179		assert(source_p->localClient->confs.head);
1168	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1180
1181		++Count.oper;
1182		SetOper(source_p);
1183
1184	<	if (oconf->modes)
1185	<	source_p->umodes |= oconf->modes;
1184	>	if (conf->modes)
1185	>	AddUMode(source_p, conf->modes);
1186		else if (ConfigFileEntry.oper_umodes)
1187	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1177	<	else
1178	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1179	<	UMODE_WALLOP|UMODE_LOCOPS);
1187	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1188
1189	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1189	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1190		++Count.invisi;
1191	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1191	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1192		--Count.invisi;
1193
1194		assert(dlinkFind(&oper_list, source_p) == NULL);
1195		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1196
1197	<	operprivs = oper_privs_as_string(oconf->port);
1190	<
1191	<	SetOFlag(source_p, oconf->port);
1197	>	AddOFlag(source_p, conf->port);
1198
1199	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1200	<	source_p->umodes |= UMODE_ADMIN;
1195	<	if (!IsOperN(source_p))
1196	<	source_p->umodes &= ~UMODE_NCHANGE;
1199	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1200	>	AddUMode(source_p, UMODE_ADMIN);
1201
1202	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1203	<	source_p->name, source_p->username, source_p->host);
1202	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1203	>	get_oper_name(source_p));
1204		send_umode_out(source_p, source_p, old);
1205		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1202	–	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1203	–	me.name, source_p->name, operprivs);
1204	–	send_message_file(source_p, &ConfigFileEntry.opermotd);
1206		}
1207
1208		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1229 | Line 1230 | valid_sid(const char *sid)
1230		void
1231		init_uid(void)
1232		{
1233	<	int i;
1233	>	unsigned int i;
1234
1235		memset(new_uid, 0, sizeof(new_uid));
1236
#	Line 1246 | Line 1247 | init_uid(void)
1247		* -Dianora
1248		*/
1249		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1249	–
1250	–	entering_umode_cb = register_callback("entering_umode", NULL);
1251	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1250		}
1251
1252		/*
#	Line 1315 | Line 1313 | init_isupport(void)
1313		add_isupport("DEAF", "D", -1);
1314		add_isupport("KICKLEN", NULL, KICKLEN);
1315		add_isupport("MODES", NULL, MAXMODEPARAMS);
1318	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1316		#ifdef HALFOPS
1317		add_isupport("PREFIX", "(ohv)@%+", -1);
1318		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1323 | Line 1320 | init_isupport(void)
1320		add_isupport("PREFIX", "(ov)@+", -1);
1321		add_isupport("STATUSMSG", "@+", -1);
1322		#endif
1326	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1323		}
1324
1325		/*
#	Line 1358 | Line 1354 | add_isupport(const char *name, const cha
1354		dlinkAddTail(support, &support->node, &support_list);
1355		}
1356
1357	<	DupString(support->name, name);
1357	>	support->name = xstrdup(name);
1358		if (options != NULL)
1359	<	DupString(support->options, options);
1359	>	support->options = xstrdup(options);
1360		support->number = n;
1361
1362		rebuild_isupport_message_line();
#	Line 1419 | Line 1415 | rebuild_isupport_message_line(void)
1415		{
1416		struct Isupport *support = ptr->data;
1417
1418	<	p += (n = ircsprintf(p, "%s", support->name));
1418	>	p += (n = sprintf(p, "%s", support->name));
1419		len += n;
1420
1421		if (support->options != NULL)
1422		{
1423	<	p += (n = ircsprintf(p, "=%s", support->options));
1423	>	p += (n = sprintf(p, "=%s", support->options));
1424		len += n;
1425		}
1426
1427		if (support->number > 0)
1428		{
1429	<	p += (n = ircsprintf(p, "=%d", support->number));
1429	>	p += (n = sprintf(p, "=%d", support->number));
1430		len += n;
1431		}
1432

Diff Legend

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