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 1176 by michael, Sun Aug 14 11:24:24 2011 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 1795 by michael, Sun Mar 31 14:31:45 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 96 | Line 94 | unsigned int user_modes[256] =
94		0,                  /* E */
95		0,                  /* F */
96		UMODE_SOFTCALLERID, /* G */
97	<	0,                  /* H */
97	>	UMODE_HIDDEN,       /* H */
98		0,                  /* I */
99		0,                  /* J */
100		0,                  /* K */
#	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);
#	Line 231 | Line 229 | show_lusers(struct Client *source_p)
229		from, to, Count.total, Count.max_tot,
230		Count.total, Count.max_tot);
231
232	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
232	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
233		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
234		Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
235
#	Line 281 | Line 279 | void
279		register_local_user(struct Client *source_p)
280		{
281		const char *id = NULL;
282	<	const struct AccessItem *aconf = NULL;
285	<	dlink_node *ptr = NULL;
282	>	const struct MaskItem *conf = NULL;
283
284		assert(source_p != NULL);
285		assert(source_p == source_p->from);
#	Line 313 | Line 310 | register_local_user(struct Client *sourc
310		/* Straight up the maximum rate of flooding... */
311		source_p->localClient->allow_read = MAX_FLOOD_BURST;
312
313	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
313	>	if (!check_client(source_p))
314		return;
315
316		if (valid_hostname(source_p->host) == 0)
#	Line 324 | Line 321 | register_local_user(struct Client *sourc
321		sizeof(source_p->host));
322		}
323
324	<	ptr   = source_p->localClient->confs.head;
328	<	aconf = map_to_conf(ptr->data);
324	>	conf = source_p->localClient->confs.head->data;
325
326		if (!IsGotId(source_p))
327		{
#	Line 333 | Line 329 | register_local_user(struct Client *sourc
329		const char *p = username;
330		unsigned int i = 0;
331
332	<	if (IsNeedIdentd(aconf))
332	>	if (IsNeedIdentd(conf))
333		{
334		++ServerStats.is_ref;
335		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
#	Line 344 | Line 340 | register_local_user(struct Client *sourc
340
341		strlcpy(username, source_p->username, sizeof(username));
342
343	<	if (!IsNoTilde(aconf))
343	>	if (!IsNoTilde(conf))
344		source_p->username[i++] = '~';
345
346		for (; *p && i < USERLEN; ++p)
#	Line 355 | Line 351 | register_local_user(struct Client *sourc
351		}
352
353		/* password check */
354	<	if (!EmptyString(aconf->passwd))
354	>	if (!EmptyString(conf->passwd))
355		{
356		const char *pass = source_p->localClient->passwd;
357
358	<	if (!match_conf_password(pass, aconf))
358	>	if (!match_conf_password(pass, conf))
359		{
360		++ServerStats.is_ref;
361		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
#	Line 375 | Line 371 | register_local_user(struct Client *sourc
371		*/
372
373		/* report if user has &^>= etc. and set flags as needed in source_p */
374	<	report_and_set_user_flags(source_p, aconf);
374	>	report_and_set_user_flags(source_p, conf);
375
376		if (IsDead(source_p))
377		return;
#	Line 391 | Line 387 | register_local_user(struct Client *sourc
387		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
388		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
389		{
390	<	sendto_realops_flags(UMODE_FULL, L_ALL,
390	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
391		"Too many clients, rejecting %s[%s].",
392		source_p->name, source_p->host);
393		++ServerStats.is_ref;
#	Line 404 | Line 400 | register_local_user(struct Client *sourc
400		{
401		char tmpstr2[IRCD_BUFSIZE];
402
403	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
403	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
404	>	"Invalid username: %s (%s@%s)",
405		source_p->name, source_p->username, source_p->host);
406		++ServerStats.is_ref;
407		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
#	Line 422 | Line 419 | register_local_user(struct Client *sourc
419		strlcpy(source_p->id, id, sizeof(source_p->id));
420		hash_add_id(source_p);
421
422	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
422	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
423		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
424		source_p->name, source_p->username, source_p->host,
425		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
426		"255.255.255.255" : source_p->sockhost,
427	<	get_client_class(source_p),
427	>	get_client_class(&source_p->localClient->confs),
428		source_p->info, source_p->id);
429
430	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
430	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
431		"CLICONN %s %s %s %s %s %s %s 0 %s",
432		source_p->name, source_p->username, source_p->host,
433		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434		"255.255.255.255" : source_p->sockhost,
435	<	get_client_class(source_p),
435	>	get_client_class(&source_p->localClient->confs),
436		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
437		"<hidden>" : source_p->localClient->client_host,
438		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
#	Line 445 | Line 442 | register_local_user(struct Client *sourc
442
443		if (ConfigFileEntry.invisible_on_connect)
444		{
445	<	source_p->umodes |= UMODE_INVISIBLE;
445	>	AddUMode(source_p, UMODE_INVISIBLE);
446		++Count.invisi;
447		}
448
#	Line 454 | Line 451 | register_local_user(struct Client *sourc
451		Count.max_loc = Count.local;
452
453		if (!(Count.max_loc % 10))
454	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
454	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
455	>	"New Max Local Clients: %d",
456		Count.max_loc);
457		}
458
#	Line 510 | Line 508 | register_remote_user(struct Client *sour
508		*/
509		source_p->servptr = hash_find_server(server);
510
511	<	/* Super GhostDetect:
511	>	/*
512	>	* Super GhostDetect:
513		* If we can't find the server the user is supposed to be on,
514		* then simply blow the user away.        -Taner
515		*/
516		if (source_p->servptr == NULL)
517		{
518	<	sendto_realops_flags(UMODE_ALL, L_ALL,
518	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
519		"No server %s for user %s[%s@%s] from %s",
520		server, source_p->name, source_p->username,
521		source_p->host, source_p->from->name);
522		kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
523
524	<	SetKilled(source_p);
524	>	AddFlag(source_p, FLAGS_KILLED);
525		exit_client(source_p, &me, "Ghosted Client");
526		return;
527		}
528
529		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
530		{
531	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
531	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
532		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
533		source_p->from->name, source_p->name, source_p->username,
534		source_p->host, source_p->servptr->name,
#	Line 537 | Line 536 | register_remote_user(struct Client *sour
536		kill_client(source_p->from, source_p,
537		"%s (NICK from wrong direction (%s != %s))",
538		me.name, source_p->servptr->name, target_p->from->name);
539	<	SetKilled(source_p);
539	>	AddFlag(source_p, FLAGS_KILLED);
540		exit_client(source_p, &me, "USER server wrong direction");
541		return;
542		}
#	Line 546 | Line 545 | register_remote_user(struct Client *sour
545		* If the nick has been introduced by a services server,
546		* make it a service as well.
547		*/
548	<	if (IsService(source_p->servptr))
549	<	SetService(source_p);
548	>	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
549	>	AddFlag(source_p, FLAGS_SERVICE);
550
551		/* Increment our total user count here */
552		if (++Count.total > Count.max_tot)
#	Line 595 | Line 594 | introduce_client(struct Client *source_p
594		if (server == source_p->from)
595		continue;
596
597	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
598	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
599	<	source_p->servptr->id,
600	<	source_p->name, source_p->hopcount+1,
601	<	(unsigned long)source_p->tsinfo,
602	<	ubuf, source_p->username, source_p->host,
603	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
604	<	"0" : source_p->sockhost, source_p->id, source_p->info);
597	>	if (IsCapable(server, CAP_SVS))
598	>	{
599	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
600	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
601	>	source_p->servptr->id,
602	>	source_p->name, source_p->hopcount+1,
603	>	(unsigned long)source_p->tsinfo,
604	>	ubuf, source_p->username, source_p->host,
605	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
606	>	"0" : source_p->sockhost, source_p->id,
607	>	source_p->svid,
608	>	source_p->info);
609	>	else
610	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
611	>	source_p->name, source_p->hopcount+1,
612	>	(unsigned long)source_p->tsinfo,
613	>	ubuf, source_p->username, source_p->host,
614	>	source_p->servptr->name, source_p->svid,
615	>	source_p->info);
616	>
617	>	}
618		else
619	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
620	<	source_p->name, source_p->hopcount+1,
621	<	(unsigned long)source_p->tsinfo,
622	<	ubuf, source_p->username, source_p->host,
623	<	source_p->servptr->name, source_p->info);
619	>	{
620	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
621	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
622	>	source_p->servptr->id,
623	>	source_p->name, source_p->hopcount+1,
624	>	(unsigned long)source_p->tsinfo,
625	>	ubuf, source_p->username, source_p->host,
626	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
627	>	"0" : source_p->sockhost, source_p->id, source_p->info);
628	>	else
629	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
630	>	source_p->name, source_p->hopcount+1,
631	>	(unsigned long)source_p->tsinfo,
632	>	ubuf, source_p->username, source_p->host,
633	>	source_p->servptr->name, source_p->info);
634	>	}
635		}
636		}
637
#	Line 635 | Line 658 | valid_hostname(const char *hostname)
658		if (!IsHostChar(*p))
659		return 0;
660
661	<	return 1;
661	>	return p - hostname <= HOSTLEN;
662		}
663
664		/* valid_username()
#	Line 705 | Line 728 | valid_nickname(const char *nickname, con
728		if (!IsNickChar(*p))
729		return 0;
730
731	<	return p - nickname <= (NICKLEN - 1);
731	>	return p - nickname <= NICKLEN;
732		}
733
734		/* report_and_set_user_flags()
735		*
736		* inputs       - pointer to source_p
737	<	*              - pointer to aconf for this user
737	>	*              - pointer to conf for this user
738		* output       - NONE
739		* side effects - Report to user any special flags
740		*                they are getting, and set them.
741		*/
742		static void
743	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
743	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
744		{
745		/* If this user is being spoofed, tell them so */
746	<	if (IsConfDoSpoofIp(aconf))
746	>	if (IsConfDoSpoofIp(conf))
747		{
748		sendto_one(source_p,
749		":%s NOTICE %s :*** Spoofing your IP. congrats.",
#	Line 728 | Line 751 | report_and_set_user_flags(struct Client
751		}
752
753		/* If this user is in the exception class, Set it "E lined" */
754	<	if (IsConfExemptKline(aconf))
754	>	if (IsConfExemptKline(conf))
755		{
756		SetExemptKline(source_p);
757		sendto_one(source_p,
#	Line 739 | Line 762 | report_and_set_user_flags(struct Client
762		/* The else here is to make sure that G line exempt users
763		* do not get noticed twice.
764		*/
765	<	else if (IsConfExemptGline(aconf))
765	>	else if (IsConfExemptGline(conf))
766		{
767		SetExemptGline(source_p);
768		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
769		me.name, source_p->name);
770		}
771
772	<	if (IsConfExemptResv(aconf))
772	>	if (IsConfExemptResv(conf))
773		{
774		SetExemptResv(source_p);
775		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
#	Line 754 | Line 777 | report_and_set_user_flags(struct Client
777		}
778
779		/* If this user is exempt from user limits set it "F lined" */
780	<	if (IsConfExemptLimits(aconf))
780	>	if (IsConfExemptLimits(conf))
781		{
782		SetExemptLimits(source_p);
783		sendto_one(source_p,
#	Line 762 | Line 785 | report_and_set_user_flags(struct Client
785		me.name,source_p->name);
786		}
787
788	<	if (IsConfCanFlood(aconf))
788	>	if (IsConfCanFlood(conf))
789		{
790		SetCanFlood(source_p);
791		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 790 | Line 813 | change_simple_umode(va_list args)
813		flag = va_arg(args, unsigned int);
814
815		if (what == MODE_ADD)
816	<	source_p->umodes |= flag;
816	>	AddUMode(source_p, flag);
817		else
818	<	source_p->umodes &= ~flag;
818	>	DelUMode(source_p, flag);
819
820		return NULL;
821		}
#	Line 825 | Line 848 | set_user_mode(struct Client *client_p, s
848
849		if (IsServer(source_p))
850		{
851	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
851	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
852	>	"*** Mode for User %s from %s",
853		parv[1], source_p->name);
854		return;
855		}
#	Line 843 | Line 867 | set_user_mode(struct Client *client_p, s
867		*m++ = '+';
868
869		for (i = 0; i < 128; i++)
870	<	if (source_p->umodes & user_modes[i])
870	>	if (HasUMode(source_p, user_modes[i]))
871		*m++ = (char)i;
872		*m = '\0';
873
#	Line 873 | Line 897 | set_user_mode(struct Client *client_p, s
897		case 'o':
898		if (what == MODE_ADD)
899		{
900	<	if (IsServer(client_p) && !IsOper(source_p))
900	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
901		{
902		++Count.oper;
903		SetOper(source_p);
#	Line 884 | Line 908 | set_user_mode(struct Client *client_p, s
908		/* Only decrement the oper counts if an oper to begin with
909		* found by Pat Szuta, Perly , perly@xnet.com
910		*/
911	<	if (!IsOper(source_p))
911	>	if (!HasUMode(source_p, UMODE_OPER))
912		break;
913
914		ClearOper(source_p);
#	Line 894 | Line 918 | set_user_mode(struct Client *client_p, s
918		{
919		dlink_node *dm;
920
921	<	detach_conf(source_p, OPER_TYPE);
922	<	ClearOperFlags(source_p);
923	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
921	>	detach_conf(source_p, CONF_OPER);
922	>	ClrOFlag(source_p);
923	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
924
925		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
926		free_dlink_node(dm);
#	Line 918 | Line 942 | set_user_mode(struct Client *client_p, s
942		default:
943		if ((flag = user_modes[(unsigned char)*m]))
944		{
945	<	if (MyConnect(source_p) && !IsOper(source_p) &&
945	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
946		(ConfigFileEntry.oper_only_umodes & flag))
947		{
948		badflag = 1;
#	Line 941 | Line 965 | set_user_mode(struct Client *client_p, s
965		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
966		me.name, source_p->name);
967
968	<	if (HasUMode(source_p, UMODE_NCHANGE) && !IsOperN(source_p))
968	>	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
969		{
970	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
970	>	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
971		me.name, source_p->name);
972	<	DelUMode(source_p, UMODE_NCHANGE); /* only tcm's really need this */
972	>	DelUMode(source_p, UMODE_NCHANGE);
973		}
974
975	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
976	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
975	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
976	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
977		{
978		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
979		me.name, source_p->name);
980	<	source_p->umodes &= ~UMODE_ADMIN;
980	>	DelUMode(source_p, UMODE_ADMIN);
981		}
982
983	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
983	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
984		++Count.invisi;
985	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
985	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
986		--Count.invisi;
987
988		/*
#	Line 1001 | Line 1025 | send_umode(struct Client *client_p, stru
1025		if (MyClient(source_p) && !(flag & sendmask))
1026		continue;
1027
1028	<	if ((flag & old) && !(source_p->umodes & flag))
1028	>	if ((flag & old) && !HasUMode(source_p, flag))
1029		{
1030		if (what == MODE_DEL)
1031		*m++ = (char)i;
#	Line 1012 | Line 1036 | send_umode(struct Client *client_p, stru
1036		*m++ = (char)i;
1037		}
1038		}
1039	<	else if (!(flag & old) && (source_p->umodes & flag))
1039	>	else if (!(flag & old) && HasUMode(source_p, flag))
1040		{
1041		if (what == MODE_ADD)
1042		*m++ = (char)i;
#	Line 1046 | Line 1070 | send_umode_out(struct Client *client_p,
1070		char buf[IRCD_BUFSIZE] = { '\0' };
1071		dlink_node *ptr = NULL;
1072
1073	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1050	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1073	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1074
1075		if (buf[0])
1076		{
#	Line 1132 | Line 1155 | user_welcome(struct Client *source_p)
1155		static int
1156		check_xline(struct Client *source_p)
1157		{
1158	<	struct ConfItem *conf = NULL;
1158	>	struct MaskItem *conf = NULL;
1159		const char *reason = NULL;
1160
1161	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1162	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1161	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
1162	>	(conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
1163		{
1164	<	struct MatchItem *reg = map_to_conf(conf);
1142	<
1143	<	++reg->count;
1164	>	++conf->count;
1165
1166	<	if (reg->reason != NULL)
1167	<	reason = reg->reason;
1166	>	if (conf->reason != NULL)
1167	>	reason = conf->reason;
1168		else
1169		reason = "No Reason";
1170
1171	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1171	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1172		"X-line Rejecting [%s] [%s], user %s [%s]",
1173		source_p->info, reason,
1174		get_client_name(source_p, HIDE_IP),
1175		source_p->sockhost);
1176
1177		++ServerStats.is_ref;
1178	<	if (REJECT_HOLD_TIME > 0)
1158	<	{
1159	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1160	<	me.name, source_p->name);
1161	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1162	<	SetCaptured(source_p);
1163	<	}
1164	<	else
1165	<	exit_client(source_p, &me, "Bad user info");
1178	>	exit_client(source_p, &me, "Bad user info");
1179		return 1;
1180		}
1181
#	Line 1173 | Line 1186 | check_xline(struct Client *source_p)
1186		*
1187		* inputs       - pointer to given client to oper
1188		* output       - NONE
1189	<	* side effects - Blindly opers up given source_p, using aconf info
1189	>	* side effects - Blindly opers up given source_p, using conf info
1190		*                all checks on passwords have already been done.
1191		*                This could also be used by rsa oper routines.
1192		*/
1193		void
1194		oper_up(struct Client *source_p)
1195		{
1196	<	unsigned int old = source_p->umodes;
1197	<	const char *operprivs = "";
1185	<	const struct AccessItem *oconf = NULL;
1196	>	const unsigned int old = source_p->umodes;
1197	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1198
1199		assert(source_p->localClient->confs.head);
1188	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1200
1201		++Count.oper;
1202		SetOper(source_p);
1203
1204	<	if (oconf->modes)
1205	<	source_p->umodes |= oconf->modes;
1204	>	if (conf->modes)
1205	>	AddUMode(source_p, conf->modes);
1206		else if (ConfigFileEntry.oper_umodes)
1207	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1197	<	else
1198	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1199	<	UMODE_WALLOP|UMODE_LOCOPS);
1207	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1208
1209	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1209	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1210		++Count.invisi;
1211	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1211	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1212		--Count.invisi;
1213
1214		assert(dlinkFind(&oper_list, source_p) == NULL);
1215		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1216
1217	<	operprivs = oper_privs_as_string(oconf->port);
1210	<
1211	<	SetOFlag(source_p, oconf->port);
1217	>	AddOFlag(source_p, conf->port);
1218
1219	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1219	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1220		AddUMode(source_p, UMODE_ADMIN);
1221	<	if (!IsOperN(source_p))
1221	>	if (!HasOFlag(source_p, OPER_FLAG_N))
1222		DelUMode(source_p, UMODE_NCHANGE);
1223
1224	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1225	<	source_p->name, source_p->username, source_p->host);
1224	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1225	>	get_oper_name(source_p));
1226		send_umode_out(source_p, source_p, old);
1227		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1222	–	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1223	–	me.name, source_p->name, operprivs);
1224	–	send_message_file(source_p, &ConfigFileEntry.opermotd);
1228		}
1229
1230		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1335 | Line 1338 | init_isupport(void)
1338		add_isupport("DEAF", "D", -1);
1339		add_isupport("KICKLEN", NULL, KICKLEN);
1340		add_isupport("MODES", NULL, MAXMODEPARAMS);
1338	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1341		#ifdef HALFOPS
1342		add_isupport("PREFIX", "(ohv)@%+", -1);
1343		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1343 | Line 1345 | init_isupport(void)
1345		add_isupport("PREFIX", "(ov)@+", -1);
1346		add_isupport("STATUSMSG", "@+", -1);
1347		#endif
1346	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1348		}
1349
1350		/*
#	Line 1378 | Line 1379 | add_isupport(const char *name, const cha
1379		dlinkAddTail(support, &support->node, &support_list);
1380		}
1381
1382	<	DupString(support->name, name);
1382	>	support->name = xstrdup(name);
1383		if (options != NULL)
1384	<	DupString(support->options, options);
1384	>	support->options = xstrdup(options);
1385		support->number = n;
1386
1387		rebuild_isupport_message_line();
#	Line 1439 | Line 1440 | rebuild_isupport_message_line(void)
1440		{
1441		struct Isupport *support = ptr->data;
1442
1443	<	p += (n = ircsprintf(p, "%s", support->name));
1443	>	p += (n = sprintf(p, "%s", support->name));
1444		len += n;
1445
1446		if (support->options != NULL)
1447		{
1448	<	p += (n = ircsprintf(p, "=%s", support->options));
1448	>	p += (n = sprintf(p, "=%s", support->options));
1449		len += n;
1450		}
1451
1452		if (support->number > 0)
1453		{
1454	<	p += (n = ircsprintf(p, "=%d", support->number));
1454	>	p += (n = sprintf(p, "=%d", support->number));
1455		len += n;
1456		}
1457

Diff Legend

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