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 1143 by michael, Mon Jul 25 18:58:51 2011 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 1976 by michael, Wed May 8 19:33:06 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
#	Line 61 | Line 59 | struct Callback *umode_cb = NULL;
59		static char umode_buffer[IRCD_BUFSIZE];
60
61		static void user_welcome(struct Client *);
62	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
62	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
63		static int check_xline(struct Client *);
64		static void introduce_client(struct Client *);
65		static const char *uid_get(void);
#	Line 94 | Line 92 | unsigned int user_modes[256] =
92		UMODE_CCONN_FULL,   /* C */
93		UMODE_DEAF,         /* D */
94		0,                  /* E */
95	<	0,                  /* F */
95	>	UMODE_FARCONNECT,   /* F */
96		UMODE_SOFTCALLERID, /* G */
97	<	0,                  /* H */
97	>	UMODE_HIDDEN,       /* H */
98		0,                  /* I */
99		0,                  /* J */
100		0,                  /* K */
#	Line 106 | Line 104 | unsigned int user_modes[256] =
104		0,                  /* O */
105		0,                  /* P */
106		0,                  /* Q */
107	<	0,                  /* R */
107	>	UMODE_REGONLY,      /* R */
108		0,                  /* S */
109		0,                  /* T */
110		0,                  /* U */
#	Line 121 | Line 119 | unsigned int user_modes[256] =
119		UMODE_BOTS,         /* b */
120		UMODE_CCONN,        /* c */
121		UMODE_DEBUG,        /* d */
122	<	0,                  /* e */
122	>	UMODE_EXTERNAL,     /* e */
123		UMODE_FULL,         /* f */
124		UMODE_CALLERID,     /* g */
125		0,                  /* h */
126		UMODE_INVISIBLE,    /* i */
127	<	0,                  /* j */
127	>	UMODE_REJ,          /* j */
128		UMODE_SKILL,        /* k */
129		UMODE_LOCOPS,       /* l */
130		0,                  /* m */
#	Line 134 | Line 132 | unsigned int user_modes[256] =
132		UMODE_OPER,         /* o */
133		0,                  /* p */
134		0,                  /* q */
135	<	UMODE_REJ,          /* r */
135	>	UMODE_REGISTERED,   /* r */
136		UMODE_SERVNOTICE,   /* s */
137		0,                  /* t */
138		UMODE_UNAUTH,       /* u */
139		0,                  /* v */
140		UMODE_WALLOP,       /* w */
141	<	UMODE_EXTERNAL,     /* x */
141	>	0,                  /* x */
142		UMODE_SPY,          /* y */
143		UMODE_OPERWALL,     /* z      0x7A */
144		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 190 | Line 188 | show_lusers(struct Client *source_p)
188		to = source_p->name;
189		}
190
191	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
191	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
192		sendto_one(source_p, form_str(RPL_LUSERCLIENT),
193		from, to, (Count.total-Count.invisi),
194		Count.invisi, dlink_list_length(&global_serv_list));
#	Line 210 | Line 208 | show_lusers(struct Client *source_p)
208		sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
209		from, to, dlink_list_length(&global_channel_list));
210
211	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
211	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
212		{
213		sendto_one(source_p, form_str(RPL_LUSERME),
214		from, to, Count.local, Count.myserver);
215		sendto_one(source_p, form_str(RPL_LOCALUSERS),
216	<	from, to, Count.local, Count.max_loc,
219	<	Count.local, Count.max_loc);
216	>	from, to, Count.local, Count.max_loc);
217		}
218		else
219		{
220		sendto_one(source_p, form_str(RPL_LUSERME),
221		from, to, Count.total, 0);
222		sendto_one(source_p, form_str(RPL_LOCALUSERS),
223	<	from, to, Count.total, Count.max_tot,
227	<	Count.total, Count.max_tot);
223	>	from, to, Count.total, Count.max_tot);
224		}
225
226		sendto_one(source_p, form_str(RPL_GLOBALUSERS),
227	<	from, to, Count.total, Count.max_tot,
232	<	Count.total, Count.max_tot);
227	>	from, to, Count.total, Count.max_tot);
228
229	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
229	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
230		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
231		Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
232
#	Line 281 | Line 276 | void
276		register_local_user(struct Client *source_p)
277		{
278		const char *id = NULL;
279	<	const struct AccessItem *aconf = NULL;
285	<	dlink_node *ptr = NULL;
279	>	const struct MaskItem *conf = NULL;
280
281		assert(source_p != NULL);
282		assert(source_p == source_p->from);
#	Line 309 | Line 303 | register_local_user(struct Client *sourc
303		return;
304		}
305
306	<	source_p->localClient->last = CurrentTime;
306	>	source_p->localClient->last_privmsg = CurrentTime;
307		/* Straight up the maximum rate of flooding... */
308		source_p->localClient->allow_read = MAX_FLOOD_BURST;
309
310	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
310	>	if (!check_client(source_p))
311		return;
312
313		if (valid_hostname(source_p->host) == 0)
#	Line 324 | Line 318 | register_local_user(struct Client *sourc
318		sizeof(source_p->host));
319		}
320
321	<	ptr   = source_p->localClient->confs.head;
328	<	aconf = map_to_conf(ptr->data);
321	>	conf = source_p->localClient->confs.head->data;
322
323		if (!IsGotId(source_p))
324		{
#	Line 333 | Line 326 | register_local_user(struct Client *sourc
326		const char *p = username;
327		unsigned int i = 0;
328
329	<	if (IsNeedIdentd(aconf))
329	>	if (IsNeedIdentd(conf))
330		{
331		++ServerStats.is_ref;
332		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
#	Line 344 | Line 337 | register_local_user(struct Client *sourc
337
338		strlcpy(username, source_p->username, sizeof(username));
339
340	<	if (!IsNoTilde(aconf))
340	>	if (!IsNoTilde(conf))
341		source_p->username[i++] = '~';
342
343		for (; *p && i < USERLEN; ++p)
#	Line 355 | Line 348 | register_local_user(struct Client *sourc
348		}
349
350		/* password check */
351	<	if (!EmptyString(aconf->passwd))
351	>	if (!EmptyString(conf->passwd))
352		{
353		const char *pass = source_p->localClient->passwd;
354
355	<	if (!match_conf_password(pass, aconf))
355	>	if (!match_conf_password(pass, conf))
356		{
357		++ServerStats.is_ref;
358		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
#	Line 375 | Line 368 | register_local_user(struct Client *sourc
368		*/
369
370		/* report if user has &^>= etc. and set flags as needed in source_p */
371	<	report_and_set_user_flags(source_p, aconf);
371	>	report_and_set_user_flags(source_p, conf);
372
373		if (IsDead(source_p))
374		return;
#	Line 391 | Line 384 | register_local_user(struct Client *sourc
384		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
386		{
387	<	sendto_realops_flags(UMODE_FULL, L_ALL,
387	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
388		"Too many clients, rejecting %s[%s].",
389		source_p->name, source_p->host);
390		++ServerStats.is_ref;
#	Line 404 | Line 397 | register_local_user(struct Client *sourc
397		{
398		char tmpstr2[IRCD_BUFSIZE];
399
400	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
400	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
401	>	"Invalid username: %s (%s@%s)",
402		source_p->name, source_p->username, source_p->host);
403		++ServerStats.is_ref;
404		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
#	Line 422 | Line 416 | register_local_user(struct Client *sourc
416		strlcpy(source_p->id, id, sizeof(source_p->id));
417		hash_add_id(source_p);
418
419	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
419	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
420		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
421		source_p->name, source_p->username, source_p->host,
422		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
423		"255.255.255.255" : source_p->sockhost,
424	<	get_client_class(source_p),
424	>	get_client_class(&source_p->localClient->confs),
425		source_p->info, source_p->id);
426
427	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
427	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
428		"CLICONN %s %s %s %s %s %s %s 0 %s",
429		source_p->name, source_p->username, source_p->host,
430		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431		"255.255.255.255" : source_p->sockhost,
432	<	get_client_class(source_p),
432	>	get_client_class(&source_p->localClient->confs),
433		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434		"<hidden>" : source_p->localClient->client_host,
435		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
#	Line 445 | Line 439 | register_local_user(struct Client *sourc
439
440		if (ConfigFileEntry.invisible_on_connect)
441		{
442	<	source_p->umodes |= UMODE_INVISIBLE;
442	>	AddUMode(source_p, UMODE_INVISIBLE);
443		++Count.invisi;
444		}
445
#	Line 454 | Line 448 | register_local_user(struct Client *sourc
448		Count.max_loc = Count.local;
449
450		if (!(Count.max_loc % 10))
451	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
451	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
452	>	"New Max Local Clients: %d",
453		Count.max_loc);
454		}
455
#	Line 508 | Line 503 | register_remote_user(struct Client *sour
503		/*
504		* coming from another server, take the servers word for it
505		*/
506	<	source_p->servptr = find_server(server);
506	>	source_p->servptr = hash_find_server(server);
507
508	<	/* Super GhostDetect:
508	>	/*
509	>	* Super GhostDetect:
510		* If we can't find the server the user is supposed to be on,
511		* then simply blow the user away.        -Taner
512		*/
513		if (source_p->servptr == NULL)
514		{
515	<	sendto_realops_flags(UMODE_ALL, L_ALL,
515	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
516		"No server %s for user %s[%s@%s] from %s",
517		server, source_p->name, source_p->username,
518		source_p->host, source_p->from->name);
519		kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
520
521	<	SetKilled(source_p);
521	>	AddFlag(source_p, FLAGS_KILLED);
522		exit_client(source_p, &me, "Ghosted Client");
523		return;
524		}
525
526		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
527		{
528	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
528	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
529		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
530		source_p->from->name, source_p->name, source_p->username,
531		source_p->host, source_p->servptr->name,
#	Line 537 | Line 533 | register_remote_user(struct Client *sour
533		kill_client(source_p->from, source_p,
534		"%s (NICK from wrong direction (%s != %s))",
535		me.name, source_p->servptr->name, target_p->from->name);
536	<	SetKilled(source_p);
536	>	AddFlag(source_p, FLAGS_KILLED);
537		exit_client(source_p, &me, "USER server wrong direction");
538		return;
539		}
540
541	+	/*
542	+	* If the nick has been introduced by a services server,
543	+	* make it a service as well.
544	+	*/
545	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
546	+	AddFlag(source_p, FLAGS_SERVICE);
547	+
548		/* Increment our total user count here */
549		if (++Count.total > Count.max_tot)
550		Count.max_tot = Count.total;
#	Line 551 | Line 554 | register_remote_user(struct Client *sour
554		add_user_host(source_p->username, source_p->host, 1);
555		SetUserHost(source_p);
556
557	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
558	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
559	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
560	+	source_p->servptr->name,
561	+	source_p->name, source_p->username, source_p->host,
562	+	source_p->info, source_p->id);
563	+
564		introduce_client(source_p);
565		}
566
#	Line 588 | Line 598 | introduce_client(struct Client *source_p
598		if (server == source_p->from)
599		continue;
600
601	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
602	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
603	<	source_p->servptr->id,
604	<	source_p->name, source_p->hopcount+1,
605	<	(unsigned long)source_p->tsinfo,
606	<	ubuf, source_p->username, source_p->host,
607	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
608	<	"0" : source_p->sockhost, source_p->id, source_p->info);
601	>	if (IsCapable(server, CAP_SVS))
602	>	{
603	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
604	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
605	>	source_p->servptr->id,
606	>	source_p->name, source_p->hopcount+1,
607	>	(unsigned long)source_p->tsinfo,
608	>	ubuf, source_p->username, source_p->host,
609	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
610	>	"0" : source_p->sockhost, source_p->id,
611	>	source_p->svid,
612	>	source_p->info);
613	>	else
614	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
615	>	source_p->name, source_p->hopcount+1,
616	>	(unsigned long)source_p->tsinfo,
617	>	ubuf, source_p->username, source_p->host,
618	>	source_p->servptr->name, source_p->svid,
619	>	source_p->info);
620	>
621	>	}
622		else
623	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
624	<	source_p->name, source_p->hopcount+1,
625	<	(unsigned long)source_p->tsinfo,
626	<	ubuf, source_p->username, source_p->host,
627	<	source_p->servptr->name, source_p->info);
623	>	{
624	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
625	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
626	>	source_p->servptr->id,
627	>	source_p->name, source_p->hopcount+1,
628	>	(unsigned long)source_p->tsinfo,
629	>	ubuf, source_p->username, source_p->host,
630	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
631	>	"0" : source_p->sockhost, source_p->id, source_p->info);
632	>	else
633	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
634	>	source_p->name, source_p->hopcount+1,
635	>	(unsigned long)source_p->tsinfo,
636	>	ubuf, source_p->username, source_p->host,
637	>	source_p->servptr->name, source_p->info);
638	>	}
639		}
640		}
641
#	Line 628 | Line 662 | valid_hostname(const char *hostname)
662		if (!IsHostChar(*p))
663		return 0;
664
665	<	return 1;
665	>	return p - hostname <= HOSTLEN;
666		}
667
668		/* valid_username()
#	Line 676 | Line 710 | valid_username(const char *username)
710		return 1;
711		}
712
713	+	/* clean_nick_name()
714	+	*
715	+	* input        - nickname
716	+	*              - whether it's a local nick (1) or remote (0)
717	+	* output       - none
718	+	* side effects - walks through the nickname, returning 0 if erroneous
719	+	*/
720	+	int
721	+	valid_nickname(const char *nickname, const int local)
722	+	{
723	+	const char *p = nickname;
724	+	assert(nickname && *nickname);
725	+
726	+	/* nicks can't start with a digit or - or be 0 length */
727	+	/* This closer duplicates behaviour of hybrid-6 */
728	+	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
729	+	return 0;
730	+
731	+	for (; *p; ++p)
732	+	if (!IsNickChar(*p))
733	+	return 0;
734	+
735	+	return p - nickname <= NICKLEN;
736	+	}
737	+
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))
750	>	if (IsConfDoSpoofIp(conf))
751		{
752		sendto_one(source_p,
753		":%s NOTICE %s :*** Spoofing your IP. congrats.",
#	Line 696 | Line 755 | report_and_set_user_flags(struct Client
755		}
756
757		/* If this user is in the exception class, Set it "E lined" */
758	<	if (IsConfExemptKline(aconf))
758	>	if (IsConfExemptKline(conf))
759		{
760		SetExemptKline(source_p);
761		sendto_one(source_p,
#	Line 707 | Line 766 | report_and_set_user_flags(struct Client
766		/* The else here is to make sure that G line exempt users
767		* do not get noticed twice.
768		*/
769	<	else if (IsConfExemptGline(aconf))
769	>	else if (IsConfExemptGline(conf))
770		{
771		SetExemptGline(source_p);
772		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
773		me.name, source_p->name);
774		}
775
776	<	if (IsConfExemptResv(aconf))
776	>	if (IsConfExemptResv(conf))
777		{
778		SetExemptResv(source_p);
779		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
#	Line 722 | Line 781 | report_and_set_user_flags(struct Client
781		}
782
783		/* If this user is exempt from user limits set it "F lined" */
784	<	if (IsConfExemptLimits(aconf))
784	>	if (IsConfExemptLimits(conf))
785		{
786		SetExemptLimits(source_p);
787		sendto_one(source_p,
#	Line 730 | Line 789 | report_and_set_user_flags(struct Client
789		me.name,source_p->name);
790		}
791
792	<	/* If this user is exempt from idle time outs */
734	<	if (IsConfIdlelined(aconf))
735	<	{
736	<	SetIdlelined(source_p);
737	<	sendto_one(source_p,
738	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
739	<	me.name, source_p->name);
740	<	}
741	<
742	<	if (IsConfCanFlood(aconf))
792	>	if (IsConfCanFlood(conf))
793		{
794		SetCanFlood(source_p);
795		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 767 | Line 817 | change_simple_umode(va_list args)
817		flag = va_arg(args, unsigned int);
818
819		if (what == MODE_ADD)
820	<	source_p->umodes |= flag;
820	>	AddUMode(source_p, flag);
821		else
822	<	source_p->umodes &= ~flag;
822	>	DelUMode(source_p, flag);
823
824		return NULL;
825		}
#	Line 783 | Line 833 | change_simple_umode(va_list args)
833		*/
834		void
835		set_user_mode(struct Client *client_p, struct Client *source_p,
836	<	int parc, char *parv[])
836	>	const int parc, char *parv[])
837		{
838		unsigned int flag, setflags;
839		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 800 | Line 850 | set_user_mode(struct Client *client_p, s
850		return;
851		}
852
803	–	if (IsServer(source_p))
804	–	{
805	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
806	–	parv[1], source_p->name);
807	–	return;
808	–	}
809	–
853		if (source_p != target_p)
854		{
855		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
#	Line 820 | Line 863 | set_user_mode(struct Client *client_p, s
863		*m++ = '+';
864
865		for (i = 0; i < 128; i++)
866	<	if (source_p->umodes & user_modes[i])
866	>	if (HasUMode(source_p, user_modes[i]))
867		*m++ = (char)i;
868		*m = '\0';
869
#	Line 850 | Line 893 | set_user_mode(struct Client *client_p, s
893		case 'o':
894		if (what == MODE_ADD)
895		{
896	<	if (IsServer(client_p) && !IsOper(source_p))
896	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
897		{
898		++Count.oper;
899		SetOper(source_p);
#	Line 861 | Line 904 | set_user_mode(struct Client *client_p, s
904		/* Only decrement the oper counts if an oper to begin with
905		* found by Pat Szuta, Perly , perly@xnet.com
906		*/
907	<	if (!IsOper(source_p))
907	>	if (!HasUMode(source_p, UMODE_OPER))
908		break;
909
910		ClearOper(source_p);
#	Line 871 | Line 914 | set_user_mode(struct Client *client_p, s
914		{
915		dlink_node *dm;
916
917	<	detach_conf(source_p, OPER_TYPE);
918	<	ClearOperFlags(source_p);
919	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
917	>	detach_conf(source_p, CONF_OPER);
918	>	ClrOFlag(source_p);
919	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
920
921		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
922		free_dlink_node(dm);
#	Line 885 | Line 928 | set_user_mode(struct Client *client_p, s
928		/* we may not get these,
929		* but they shouldnt be in default
930		*/
931	+	case 'r':
932		case ' ' :
933		case '\n':
934		case '\r':
#	Line 894 | Line 938 | set_user_mode(struct Client *client_p, s
938		default:
939		if ((flag = user_modes[(unsigned char)*m]))
940		{
941	<	if (MyConnect(source_p) && !IsOper(source_p) &&
941	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
942		(ConfigFileEntry.oper_only_umodes & flag))
943		{
944		badflag = 1;
#	Line 917 | Line 961 | set_user_mode(struct Client *client_p, s
961		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
962		me.name, source_p->name);
963
964	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
965	<	{
922	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
923	<	me.name, source_p->name);
924	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
925	<	}
926	<
927	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
928	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
964	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
965	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
966		{
967		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
968		me.name, source_p->name);
969	<	source_p->umodes &= ~UMODE_ADMIN;
969	>	DelUMode(source_p, UMODE_ADMIN);
970		}
971
972	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
972	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
973		++Count.invisi;
974	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
974	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
975		--Count.invisi;
976
977		/*
#	Line 977 | Line 1014 | send_umode(struct Client *client_p, stru
1014		if (MyClient(source_p) && !(flag & sendmask))
1015		continue;
1016
1017	<	if ((flag & old) && !(source_p->umodes & flag))
1017	>	if ((flag & old) && !HasUMode(source_p, flag))
1018		{
1019		if (what == MODE_DEL)
1020		*m++ = (char)i;
#	Line 988 | Line 1025 | send_umode(struct Client *client_p, stru
1025		*m++ = (char)i;
1026		}
1027		}
1028	<	else if (!(flag & old) && (source_p->umodes & flag))
1028	>	else if (!(flag & old) && HasUMode(source_p, flag))
1029		{
1030		if (what == MODE_ADD)
1031		*m++ = (char)i;
#	Line 1022 | Line 1059 | send_umode_out(struct Client *client_p,
1059		char buf[IRCD_BUFSIZE] = { '\0' };
1060		dlink_node *ptr = NULL;
1061
1062	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1026	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1062	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1063
1064		if (buf[0])
1065		{
#	Line 1042 | Line 1078 | send_umode_out(struct Client *client_p,
1078		send_umode(client_p, source_p, old, 0xffffffff, buf);
1079		}
1080
1081	+	void
1082	+	user_set_hostmask(struct Client *target_p, const char *hostname)
1083	+	{
1084	+	if (!valid_hostname(hostname))
1085	+	return;
1086	+
1087	+	if (IsUserHostIp(target_p))
1088	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1089	+
1090	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1091	+	SetIPSpoof(target_p);
1092	+
1093	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1094	+	SetUserHost(target_p);
1095	+
1096	+	if (MyClient(target_p))
1097	+	clear_ban_cache_client(target_p);
1098	+	}
1099	+
1100		/* user_welcome()
1101		*
1102		* inputs       - client pointer to client to welcome
#	Line 1065 | Line 1120 | user_welcome(struct Client *source_p)
1120		#endif
1121
1122		sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1123	<	ServerInfo.network_name, source_p->name);
1123	>	ServerInfo.network_name, source_p->name,
1124	>	source_p->username, source_p->host);
1125		sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1126		get_listener_name(source_p->localClient->listener), ircd_version);
1127		sendto_one(source_p, form_str(RPL_CREATED),
#	Line 1108 | Line 1164 | user_welcome(struct Client *source_p)
1164		static int
1165		check_xline(struct Client *source_p)
1166		{
1167	<	struct ConfItem *conf = NULL;
1167	>	struct MaskItem *conf = NULL;
1168		const char *reason = NULL;
1169
1170	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1115	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1170	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1171		{
1172	<	struct MatchItem *reg = map_to_conf(conf);
1118	<
1119	<	++reg->count;
1172	>	++conf->count;
1173
1174	<	if (reg->reason != NULL)
1175	<	reason = reg->reason;
1174	>	if (conf->reason != NULL)
1175	>	reason = conf->reason;
1176		else
1177		reason = "No Reason";
1178
1179	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1179	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1180		"X-line Rejecting [%s] [%s], user %s [%s]",
1181		source_p->info, reason,
1182		get_client_name(source_p, HIDE_IP),
1183		source_p->sockhost);
1184
1185		++ServerStats.is_ref;
1186	<	if (REJECT_HOLD_TIME > 0)
1134	<	{
1135	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1136	<	me.name, source_p->name);
1137	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1138	<	SetCaptured(source_p);
1139	<	}
1140	<	else
1141	<	exit_client(source_p, &me, "Bad user info");
1186	>	exit_client(source_p, &me, "Bad user info");
1187		return 1;
1188		}
1189
#	Line 1149 | Line 1194 | check_xline(struct Client *source_p)
1194		*
1195		* inputs       - pointer to given client to oper
1196		* output       - NONE
1197	<	* side effects - Blindly opers up given source_p, using aconf info
1197	>	* side effects - Blindly opers up given source_p, using conf info
1198		*                all checks on passwords have already been done.
1199		*                This could also be used by rsa oper routines.
1200		*/
1201		void
1202		oper_up(struct Client *source_p)
1203		{
1204	<	unsigned int old = source_p->umodes;
1205	<	const char *operprivs = "";
1161	<	const struct AccessItem *oconf = NULL;
1204	>	const unsigned int old = source_p->umodes;
1205	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1206
1207		assert(source_p->localClient->confs.head);
1164	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1208
1209		++Count.oper;
1210		SetOper(source_p);
1211
1212	<	if (oconf->modes)
1213	<	source_p->umodes |= oconf->modes;
1212	>	if (conf->modes)
1213	>	AddUMode(source_p, conf->modes);
1214		else if (ConfigFileEntry.oper_umodes)
1215	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1173	<	else
1174	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1175	<	UMODE_WALLOP|UMODE_LOCOPS);
1215	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1216
1217	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1217	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1218		++Count.invisi;
1219	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1219	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1220		--Count.invisi;
1221
1222		assert(dlinkFind(&oper_list, source_p) == NULL);
1223		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1224
1225	<	operprivs = oper_privs_as_string(oconf->port);
1186	<
1187	<	SetOFlag(source_p, oconf->port);
1225	>	AddOFlag(source_p, conf->port);
1226
1227	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1228	<	source_p->umodes |= UMODE_ADMIN;
1191	<	if (!IsOperN(source_p))
1192	<	source_p->umodes &= ~UMODE_NCHANGE;
1227	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1228	>	AddUMode(source_p, UMODE_ADMIN);
1229
1230	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1231	<	source_p->name, source_p->username, source_p->host);
1230	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1231	>	get_oper_name(source_p));
1232		send_umode_out(source_p, source_p, old);
1233		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1198	–	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1199	–	me.name, source_p->name, operprivs);
1200	–	send_message_file(source_p, &ConfigFileEntry.opermotd);
1234		}
1235
1236		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1225 | Line 1258 | valid_sid(const char *sid)
1258		void
1259		init_uid(void)
1260		{
1261	<	int i;
1261	>	unsigned int i;
1262
1263		memset(new_uid, 0, sizeof(new_uid));
1264
#	Line 1311 | Line 1344 | init_isupport(void)
1344		add_isupport("DEAF", "D", -1);
1345		add_isupport("KICKLEN", NULL, KICKLEN);
1346		add_isupport("MODES", NULL, MAXMODEPARAMS);
1314	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1347		#ifdef HALFOPS
1348		add_isupport("PREFIX", "(ohv)@%+", -1);
1349		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1319 | Line 1351 | init_isupport(void)
1351		add_isupport("PREFIX", "(ov)@+", -1);
1352		add_isupport("STATUSMSG", "@+", -1);
1353		#endif
1322	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1354		}
1355
1356		/*
#	Line 1354 | Line 1385 | add_isupport(const char *name, const cha
1385		dlinkAddTail(support, &support->node, &support_list);
1386		}
1387
1388	<	DupString(support->name, name);
1388	>	support->name = xstrdup(name);
1389		if (options != NULL)
1390	<	DupString(support->options, options);
1390	>	support->options = xstrdup(options);
1391		support->number = n;
1392
1393		rebuild_isupport_message_line();
#	Line 1415 | Line 1446 | rebuild_isupport_message_line(void)
1446		{
1447		struct Isupport *support = ptr->data;
1448
1449	<	p += (n = ircsprintf(p, "%s", support->name));
1449	>	p += (n = sprintf(p, "%s", support->name));
1450		len += n;
1451
1452		if (support->options != NULL)
1453		{
1454	<	p += (n = ircsprintf(p, "=%s", support->options));
1454	>	p += (n = sprintf(p, "=%s", support->options));
1455		len += n;
1456		}
1457
1458		if (support->number > 0)
1459		{
1460	<	p += (n = ircsprintf(p, "=%d", support->number));
1460	>	p += (n = sprintf(p, "=%d", support->number));
1461		len += n;
1462		}
1463

Diff Legend

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