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 1173 by michael, Sun Aug 14 00:23:02 2011 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2125 by michael, Sun May 26 18:41:13 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
55
58	–	struct Callback *entering_umode_cb = NULL;
59	–	struct Callback *umode_cb = NULL;
60	–
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 82 | 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 94 | 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 106 | Line 101 | unsigned int user_modes[256] =
101		0,                  /* O */
102		0,                  /* P */
103		0,                  /* Q */
104	<	0,                  /* R */
105	<	UMODE_REGONLY,      /* S */
104	>	UMODE_REGONLY,      /* R */
105	>	0,                  /* S */
106		0,                  /* T */
107		0,                  /* U */
108		0,                  /* V */
#	Line 121 | 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 */
#	Line 140 | Line 135 | unsigned int user_modes[256] =
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 190 | 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 210 | 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,
219	<	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,
227	<	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,
232	<	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		Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
229
#	Line 281 | Line 273 | void
273		register_local_user(struct Client *source_p)
274		{
275		const char *id = NULL;
276	<	const struct AccessItem *aconf = NULL;
285	<	dlink_node *ptr = NULL;
276	>	const struct MaskItem *conf = NULL;
277
278		assert(source_p != NULL);
279		assert(source_p == source_p->from);
#	Line 309 | 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 324 | Line 315 | register_local_user(struct Client *sourc
315		sizeof(source_p->host));
316		}
317
318	<	ptr   = source_p->localClient->confs.head;
328	<	aconf = map_to_conf(ptr->data);
318	>	conf = source_p->localClient->confs.head->data;
319
320		if (!IsGotId(source_p))
321		{
#	Line 333 | 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 344 | 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 355 | 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 375 | 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 391 | 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 400 | 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		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
#	Line 422 | 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,
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),
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 445 | 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 454 | 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 510 | Line 502 | register_remote_user(struct Client *sour
502		*/
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 537 | 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		}
#	Line 546 | Line 539 | register_remote_user(struct Client *sour
539		* If the nick has been introduced by a services server,
540		* make it a service as well.
541		*/
542	<	if (IsService(source_p->servptr))
543	<	SetService(source_p);
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)
#	Line 558 | 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 595 | 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 635 | 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 650 | 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 660 | 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()
#	Line 705 | Line 739 | valid_nickname(const char *nickname, con
739		if (!IsNickChar(*p))
740		return 0;
741
742	<	return p - nickname <= (NICKLEN - 1);
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))
757	>	if (IsConfDoSpoofIp(conf))
758		{
759		sendto_one(source_p,
760	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
760	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
761		me.name, source_p->name);
762		}
763
764		/* If this user is in the exception class, Set it "E lined" */
765	<	if (IsConfExemptKline(aconf))
765	>	if (IsConfExemptKline(conf))
766		{
767		SetExemptKline(source_p);
768		sendto_one(source_p,
769	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
769	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
770		me.name, source_p->name);
771		}
772
773		/* The else here is to make sure that G line exempt users
774		* do not get noticed twice.
775		*/
776	<	else if (IsConfExemptGline(aconf))
776	>	else if (IsConfExemptGline(conf))
777		{
778		SetExemptGline(source_p);
779	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
779	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
780		me.name, source_p->name);
781		}
782
783	<	if (IsConfExemptResv(aconf))
783	>	if (IsConfExemptResv(conf))
784		{
785		SetExemptResv(source_p);
786	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
786	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
787		me.name, source_p->name);
788		}
789
790		/* If this user is exempt from user limits set it "F lined" */
791	<	if (IsConfExemptLimits(aconf))
791	>	if (IsConfExemptLimits(conf))
792		{
793		SetExemptLimits(source_p);
794		sendto_one(source_p,
795	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
795	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
796		me.name,source_p->name);
797		}
798
799	<	/* If this user is exempt from idle time outs */
766	<	if (IsConfIdlelined(aconf))
767	<	{
768	<	SetIdlelined(source_p);
769	<	sendto_one(source_p,
770	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
771	<	me.name, source_p->name);
772	<	}
773	<
774	<	if (IsConfCanFlood(aconf))
799	>	if (IsConfCanFlood(conf))
800		{
801		SetCanFlood(source_p);
802		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 780 | Line 805 | report_and_set_user_flags(struct Client
805		}
806		}
807
783	–	/* change_simple_umode()
784	–	*
785	–	* this callback can be hooked to allow special handling of
786	–	* certain usermodes
787	–	*/
788	–	static void *
789	–	change_simple_umode(va_list args)
790	–	{
791	–	struct Client *client_p;
792	–	struct Client *source_p;
793	–	int what;
794	–	unsigned int flag;
795	–
796	–	client_p = va_arg(args, struct Client *);
797	–	source_p = va_arg(args, struct Client *);
798	–	what = va_arg(args, int);
799	–	flag = va_arg(args, unsigned int);
800	–
801	–	if (what == MODE_ADD)
802	–	source_p->umodes |= flag;
803	–	else
804	–	source_p->umodes &= ~flag;
805	–
806	–	return NULL;
807	–	}
808	–
808		/* set_user_mode()
809		*
810		* added 15/10/91 By Darren Reed.
#	Line 815 | Line 814 | change_simple_umode(va_list args)
814		*/
815		void
816		set_user_mode(struct Client *client_p, struct Client *source_p,
817	<	int parc, char *parv[])
817	>	const int parc, char *parv[])
818		{
819		unsigned int flag, setflags;
820		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 832 | Line 831 | set_user_mode(struct Client *client_p, s
831		return;
832		}
833
835	–	if (IsServer(source_p))
836	–	{
837	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
838	–	parv[1], source_p->name);
839	–	return;
840	–	}
841	–
834		if (source_p != target_p)
835		{
836		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
#	Line 852 | Line 844 | set_user_mode(struct Client *client_p, s
844		*m++ = '+';
845
846		for (i = 0; i < 128; i++)
847	<	if (source_p->umodes & user_modes[i])
847	>	if (HasUMode(source_p, user_modes[i]))
848		*m++ = (char)i;
849		*m = '\0';
850
#	Line 861 | Line 853 | set_user_mode(struct Client *client_p, s
853		return;
854		}
855
864	–	execute_callback(entering_umode_cb, client_p, source_p);
865	–
856		/* find flags already set for user */
857		setflags = source_p->umodes;
858
#	Line 882 | Line 872 | set_user_mode(struct Client *client_p, s
872		case 'o':
873		if (what == MODE_ADD)
874		{
875	<	if (IsServer(client_p) && !IsOper(source_p))
875	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
876		{
877		++Count.oper;
878		SetOper(source_p);
#	Line 893 | Line 883 | set_user_mode(struct Client *client_p, s
883		/* Only decrement the oper counts if an oper to begin with
884		* found by Pat Szuta, Perly , perly@xnet.com
885		*/
886	<	if (!IsOper(source_p))
886	>	if (!HasUMode(source_p, UMODE_OPER))
887		break;
888
889		ClearOper(source_p);
#	Line 903 | Line 893 | set_user_mode(struct Client *client_p, s
893		{
894		dlink_node *dm;
895
896	<	detach_conf(source_p, OPER_TYPE);
897	<	ClearOperFlags(source_p);
898	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
896	>	detach_conf(source_p, CONF_OPER);
897	>	ClrOFlag(source_p);
898	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
899
900		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
901		free_dlink_node(dm);
#	Line 914 | Line 904 | set_user_mode(struct Client *client_p, s
904
905		break;
906
907	<	/* we may not get these,
918	<	* but they shouldnt be in default
919	<	*/
920	<	case 'r':
921	<	case ' ' :
922	<	case '\n':
923	<	case '\r':
924	<	case '\t':
907	>	case 'r':  /* Only services may set +r */
908		break;
909
910		default:
911		if ((flag = user_modes[(unsigned char)*m]))
912		{
913	<	if (MyConnect(source_p) && !IsOper(source_p) &&
913	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
914		(ConfigFileEntry.oper_only_umodes & flag))
932	–	{
915		badflag = 1;
934	–	}
916		else
917	<	execute_callback(umode_cb, client_p, source_p, what, flag);
917	>	{
918	>	if (what == MODE_ADD)
919	>	AddUMode(source_p, flag);
920	>	else
921	>	DelUMode(source_p, flag);
922	>	}
923		}
924		else
925		{
#	Line 950 | Line 936 | set_user_mode(struct Client *client_p, s
936		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
937		me.name, source_p->name);
938
939	<	if (HasUMode(source_p, UMODE_NCHANGE) && !IsOperN(source_p))
940	<	{
955	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
956	<	me.name, source_p->name);
957	<	DelUMode(source_p, UMODE_NCHANGE); /* only tcm's really need this */
958	<	}
959	<
960	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
961	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
939	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
940	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
941		{
942		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
943		me.name, source_p->name);
944	<	source_p->umodes &= ~UMODE_ADMIN;
944	>	DelUMode(source_p, UMODE_ADMIN);
945		}
946
947	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
947	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
948		++Count.invisi;
949	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
949	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
950		--Count.invisi;
951
952		/*
#	Line 1010 | Line 989 | send_umode(struct Client *client_p, stru
989		if (MyClient(source_p) && !(flag & sendmask))
990		continue;
991
992	<	if ((flag & old) && !(source_p->umodes & flag))
992	>	if ((flag & old) && !HasUMode(source_p, flag))
993		{
994		if (what == MODE_DEL)
995		*m++ = (char)i;
#	Line 1021 | Line 1000 | send_umode(struct Client *client_p, stru
1000		*m++ = (char)i;
1001		}
1002		}
1003	<	else if (!(flag & old) && (source_p->umodes & flag))
1003	>	else if (!(flag & old) && HasUMode(source_p, flag))
1004		{
1005		if (what == MODE_ADD)
1006		*m++ = (char)i;
#	Line 1055 | Line 1034 | send_umode_out(struct Client *client_p,
1034		char buf[IRCD_BUFSIZE] = { '\0' };
1035		dlink_node *ptr = NULL;
1036
1037	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1059	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1037	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1038
1039		if (buf[0])
1040		{
#	Line 1075 | Line 1053 | send_umode_out(struct Client *client_p,
1053		send_umode(client_p, source_p, old, 0xffffffff, buf);
1054		}
1055
1056	+	void
1057	+	user_set_hostmask(struct Client *target_p, const char *hostname)
1058	+	{
1059	+	if (!valid_hostname(hostname))
1060	+	return;
1061	+
1062	+	if (IsUserHostIp(target_p))
1063	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1064	+
1065	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1066	+	SetIPSpoof(target_p);
1067	+
1068	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1069	+	SetUserHost(target_p);
1070	+
1071	+	if (MyClient(target_p))
1072	+	clear_ban_cache_client(target_p);
1073	+	}
1074	+
1075		/* user_welcome()
1076		*
1077		* inputs       - client pointer to client to welcome
#	Line 1141 | Line 1138 | user_welcome(struct Client *source_p)
1138		static int
1139		check_xline(struct Client *source_p)
1140		{
1141	<	struct ConfItem *conf = NULL;
1141	>	struct MaskItem *conf = NULL;
1142		const char *reason = NULL;
1143
1144	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1148	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1144	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1145		{
1146	<	struct MatchItem *reg = map_to_conf(conf);
1151	<
1152	<	++reg->count;
1146	>	++conf->count;
1147
1148	<	if (reg->reason != NULL)
1149	<	reason = reg->reason;
1148	>	if (conf->reason != NULL)
1149	>	reason = conf->reason;
1150		else
1151		reason = "No Reason";
1152
1153	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1153	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1154		"X-line Rejecting [%s] [%s], user %s [%s]",
1155		source_p->info, reason,
1156		get_client_name(source_p, HIDE_IP),
1157		source_p->sockhost);
1158
1159		++ServerStats.is_ref;
1160	<	if (REJECT_HOLD_TIME > 0)
1167	<	{
1168	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1169	<	me.name, source_p->name);
1170	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1171	<	SetCaptured(source_p);
1172	<	}
1173	<	else
1174	<	exit_client(source_p, &me, "Bad user info");
1160	>	exit_client(source_p, &me, "Bad user info");
1161		return 1;
1162		}
1163
#	Line 1182 | Line 1168 | check_xline(struct Client *source_p)
1168		*
1169		* inputs       - pointer to given client to oper
1170		* output       - NONE
1171	<	* side effects - Blindly opers up given source_p, using aconf info
1171	>	* side effects - Blindly opers up given source_p, using conf info
1172		*                all checks on passwords have already been done.
1173		*                This could also be used by rsa oper routines.
1174		*/
1175		void
1176		oper_up(struct Client *source_p)
1177		{
1178	<	unsigned int old = source_p->umodes;
1179	<	const char *operprivs = "";
1194	<	const struct AccessItem *oconf = NULL;
1178	>	const unsigned int old = source_p->umodes;
1179	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1180
1181		assert(source_p->localClient->confs.head);
1197	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1182
1183		++Count.oper;
1184		SetOper(source_p);
1185
1186	<	if (oconf->modes)
1187	<	source_p->umodes |= oconf->modes;
1186	>	if (conf->modes)
1187	>	AddUMode(source_p, conf->modes);
1188		else if (ConfigFileEntry.oper_umodes)
1189	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1206	<	else
1207	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1208	<	UMODE_WALLOP|UMODE_LOCOPS);
1189	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1190
1191	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1191	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1192		++Count.invisi;
1193	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1193	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1194		--Count.invisi;
1195
1196		assert(dlinkFind(&oper_list, source_p) == NULL);
1197		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1198
1199	<	operprivs = oper_privs_as_string(oconf->port);
1219	<
1220	<	SetOFlag(source_p, oconf->port);
1199	>	AddOFlag(source_p, conf->port);
1200
1201	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1201	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1202		AddUMode(source_p, UMODE_ADMIN);
1224	–	if (!IsOperN(source_p))
1225	–	DelUMode(source_p, UMODE_NCHANGE);
1203
1204	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1205	<	source_p->name, source_p->username, source_p->host);
1204	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1205	>	get_oper_name(source_p));
1206		send_umode_out(source_p, source_p, old);
1207		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1231	–	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1232	–	me.name, source_p->name, operprivs);
1233	–	send_message_file(source_p, &ConfigFileEntry.opermotd);
1208		}
1209
1210		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1258 | Line 1232 | valid_sid(const char *sid)
1232		void
1233		init_uid(void)
1234		{
1235	<	int i;
1235	>	unsigned int i;
1236
1237		memset(new_uid, 0, sizeof(new_uid));
1238
#	Line 1275 | Line 1249 | init_uid(void)
1249		* -Dianora
1250		*/
1251		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1278	–
1279	–	entering_umode_cb = register_callback("entering_umode", NULL);
1280	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1252		}
1253
1254		/*
#	Line 1344 | Line 1315 | init_isupport(void)
1315		add_isupport("DEAF", "D", -1);
1316		add_isupport("KICKLEN", NULL, KICKLEN);
1317		add_isupport("MODES", NULL, MAXMODEPARAMS);
1347	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1318		#ifdef HALFOPS
1319		add_isupport("PREFIX", "(ohv)@%+", -1);
1320		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1352 | Line 1322 | init_isupport(void)
1322		add_isupport("PREFIX", "(ov)@+", -1);
1323		add_isupport("STATUSMSG", "@+", -1);
1324		#endif
1355	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1325		}
1326
1327		/*
#	Line 1387 | Line 1356 | add_isupport(const char *name, const cha
1356		dlinkAddTail(support, &support->node, &support_list);
1357		}
1358
1359	<	DupString(support->name, name);
1359	>	support->name = xstrdup(name);
1360		if (options != NULL)
1361	<	DupString(support->options, options);
1361	>	support->options = xstrdup(options);
1362		support->number = n;
1363
1364		rebuild_isupport_message_line();
#	Line 1448 | Line 1417 | rebuild_isupport_message_line(void)
1417		{
1418		struct Isupport *support = ptr->data;
1419
1420	<	p += (n = ircsprintf(p, "%s", support->name));
1420	>	p += (n = sprintf(p, "%s", support->name));
1421		len += n;
1422
1423		if (support->options != NULL)
1424		{
1425	<	p += (n = ircsprintf(p, "=%s", support->options));
1425	>	p += (n = sprintf(p, "=%s", support->options));
1426		len += n;
1427		}
1428
1429		if (support->number > 0)
1430		{
1431	<	p += (n = ircsprintf(p, "=%d", support->number));
1431	>	p += (n = sprintf(p, "=%d", support->number));
1432		len += n;
1433		}
1434

Diff Legend

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