ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_user.c (file contents), Revision 1458 by michael, Fri Jul 6 10:27:33 2012 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2138 by michael, Wed May 29 21:14:02 2013 UTC

#	Line 32 | Line 32
32		#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
35	–	#include "sprintf_irc.h"
35		#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
#	Line 54 | Line 53
53		#include "watch.h"
54
55
57	–	struct Callback *entering_umode_cb = NULL;
58	–	struct Callback *umode_cb = NULL;
59	–
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 81 | 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 93 | 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		UMODE_HIDDEN,       /* H */
95		0,                  /* I */
#	Line 120 | 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 139 | Line 135 | unsigned int user_modes[256] =
135		UMODE_UNAUTH,       /* u */
136		0,                  /* v */
137		UMODE_WALLOP,       /* w */
138	<	UMODE_EXTERNAL,     /* x */
138	>	UMODE_HIDDENHOST,   /* x */
139		UMODE_SPY,          /* y */
140		UMODE_OPERWALL,     /* z      0x7A */
141		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 214 | Line 210 | show_lusers(struct Client *source_p)
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,
218	<	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,
226	<	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,
231	<	Count.total, Count.max_tot);
224	>	from, to, Count.total, Count.max_tot);
225
226		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
227		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
#	Line 280 | Line 273 | void
273		register_local_user(struct Client *source_p)
274		{
275		const char *id = NULL;
276	<	const struct AccessItem *aconf = NULL;
284	<	dlink_node *ptr = NULL;
276	>	const struct MaskItem *conf = NULL;
277
278		assert(source_p != NULL);
279		assert(source_p == source_p->from);
#	Line 312 | Line 304 | register_local_user(struct Client *sourc
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 323 | Line 315 | register_local_user(struct Client *sourc
315		sizeof(source_p->host));
316		}
317
318	<	ptr   = source_p->localClient->confs.head;
327	<	aconf = map_to_conf(ptr->data);
318	>	conf = source_p->localClient->confs.head->data;
319
320		if (!IsGotId(source_p))
321		{
#	Line 332 | 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 343 | 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 354 | 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 374 | 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 390 | 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 399 | 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 421 | 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 453 | 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 509 | 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);
#	Line 528 | Line 522 | register_remote_user(struct Client *sour
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 557 | 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 597 | Line 598 | introduce_client(struct Client *source_p
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 %lu :%s",
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	<	(unsigned long)source_p->servicestamp,
608	>	source_p->svid,
609		source_p->info);
610		else
611	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s %lu :%s",
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, (unsigned long)source_p->servicestamp,
615	>	source_p->servptr->name, source_p->svid,
616		source_p->info);
617
618		}
#	Line 658 | 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 673 | 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 683 | 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 734 | Line 745 | valid_nickname(const char *nickname, con
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))
747	<	{
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);
751	–	}
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 (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 794 | Line 803 | report_and_set_user_flags(struct Client
803		}
804		}
805
797	–	/* change_simple_umode()
798	–	*
799	–	* this callback can be hooked to allow special handling of
800	–	* certain usermodes
801	–	*/
802	–	static void *
803	–	change_simple_umode(va_list args)
804	–	{
805	–	struct Client *client_p;
806	–	struct Client *source_p;
807	–	int what;
808	–	unsigned int flag;
809	–
810	–	client_p = va_arg(args, struct Client *);
811	–	source_p = va_arg(args, struct Client *);
812	–	what = va_arg(args, int);
813	–	flag = va_arg(args, unsigned int);
814	–
815	–	if (what == MODE_ADD)
816	–	AddUMode(source_p, flag);
817	–	else
818	–	DelUMode(source_p, flag);
819	–
820	–	return NULL;
821	–	}
822	–
806		/* set_user_mode()
807		*
808		* added 15/10/91 By Darren Reed.
#	Line 829 | 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 846 | Line 829 | set_user_mode(struct Client *client_p, s
829		return;
830		}
831
849	–	if (IsServer(source_p))
850	–	{
851	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
852	–	parv[1], source_p->name);
853	–	return;
854	–	}
855	–
832		if (source_p != target_p)
833		{
834		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
#	Line 875 | Line 851 | set_user_mode(struct Client *client_p, s
851		return;
852		}
853
878	–	execute_callback(entering_umode_cb, client_p, source_p);
879	–
854		/* find flags already set for user */
855		setflags = source_p->umodes;
856
#	Line 917 | Line 891 | set_user_mode(struct Client *client_p, s
891		{
892		dlink_node *dm;
893
894	<	detach_conf(source_p, OPER_TYPE);
894	>	detach_conf(source_p, CONF_OPER);
895		ClrOFlag(source_p);
896		DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
897
#	Line 928 | Line 902 | set_user_mode(struct Client *client_p, s
902
903		break;
904
905	<	/* we may not get these,
906	<	* but they shouldnt be in default
933	<	*/
934	<	case 'r':
935	<	case ' ' :
936	<	case '\n':
937	<	case '\r':
938	<	case '\t':
905	>	case 'r':  /* Only services may set +r */
906	>	case 'x':  /* Only services may set +x */
907		break;
908
909		default:
#	Line 943 | Line 911 | set_user_mode(struct Client *client_p, s
911		{
912		if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
913		(ConfigFileEntry.oper_only_umodes & flag))
946	–	{
914		badflag = 1;
948	–	}
915		else
916	<	execute_callback(umode_cb, client_p, source_p, what, flag);
916	>	{
917	>	if (what == MODE_ADD)
918	>	AddUMode(source_p, flag);
919	>	else
920	>	DelUMode(source_p, flag);
921	>	}
922		}
923		else
924		{
#	Line 964 | Line 935 | set_user_mode(struct Client *client_p, s
935		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
936		me.name, source_p->name);
937
967	–	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
968	–	{
969	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
970	–	me.name, source_p->name);
971	–	DelUMode(source_p, UMODE_NCHANGE);
972	–	}
973	–
938		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
939		!HasOFlag(source_p, OPER_FLAG_ADMIN))
940		{
#	Line 1088 | Line 1052 | send_umode_out(struct Client *client_p,
1052		send_umode(client_p, source_p, old, 0xffffffff, buf);
1053		}
1054
1055	+	void
1056	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1057	+	{
1058	+	if (IsUserHostIp(target_p))
1059	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1060	+
1061	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1062	+
1063	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1064	+	SetUserHost(target_p);
1065	+
1066	+	switch (what)
1067	+	{
1068	+	case MODE_ADD:
1069	+	AddUMode(target_p, UMODE_HIDDENHOST);
1070	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1071	+	break;
1072	+	case MODE_DEL:
1073	+	DelUMode(target_p, UMODE_HIDDENHOST);
1074	+
1075	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF));
1076	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1077	+	break;
1078	+	default: break;
1079	+	}
1080	+
1081	+	if (MyClient(target_p))
1082	+	{
1083	+	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1084	+	target_p->name, target_p->username,
1085	+	target_p->host);
1086	+	clear_ban_cache_client(target_p);
1087	+	}
1088	+	}
1089	+
1090		/* user_welcome()
1091		*
1092		* inputs       - client pointer to client to welcome
#	Line 1154 | Line 1153 | user_welcome(struct Client *source_p)
1153		static int
1154		check_xline(struct Client *source_p)
1155		{
1156	<	struct ConfItem *conf = NULL;
1156	>	struct MaskItem *conf = NULL;
1157		const char *reason = NULL;
1158
1159	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1161	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1159	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1160		{
1161	<	struct MatchItem *reg = map_to_conf(conf);
1164	<
1165	<	++reg->count;
1161	>	++conf->count;
1162
1163	<	if (reg->reason != NULL)
1164	<	reason = reg->reason;
1163	>	if (conf->reason != NULL)
1164	>	reason = conf->reason;
1165		else
1166		reason = "No Reason";
1167
1168	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1168	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1169		"X-line Rejecting [%s] [%s], user %s [%s]",
1170		source_p->info, reason,
1171		get_client_name(source_p, HIDE_IP),
1172		source_p->sockhost);
1173
1174		++ServerStats.is_ref;
1175	<	if (REJECT_HOLD_TIME > 0)
1180	<	{
1181	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1182	<	me.name, source_p->name);
1183	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1184	<	SetCaptured(source_p);
1185	<	}
1186	<	else
1187	<	exit_client(source_p, &me, "Bad user info");
1175	>	exit_client(source_p, &me, "Bad user info");
1176		return 1;
1177		}
1178
#	Line 1195 | Line 1183 | check_xline(struct Client *source_p)
1183		*
1184		* inputs       - pointer to given client to oper
1185		* output       - NONE
1186	<	* side effects - Blindly opers up given source_p, using aconf info
1186	>	* side effects - Blindly opers up given source_p, using conf info
1187		*                all checks on passwords have already been done.
1188		*                This could also be used by rsa oper routines.
1189		*/
1190		void
1191		oper_up(struct Client *source_p)
1192		{
1193	<	unsigned int old = source_p->umodes;
1194	<	const char *operprivs = "";
1207	<	const struct AccessItem *oconf = NULL;
1193	>	const unsigned int old = source_p->umodes;
1194	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1195
1196		assert(source_p->localClient->confs.head);
1210	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1197
1198		++Count.oper;
1199		SetOper(source_p);
1200
1201	<	if (oconf->modes)
1202	<	AddUMode(source_p, oconf->modes);
1201	>	if (conf->modes)
1202	>	AddUMode(source_p, conf->modes);
1203		else if (ConfigFileEntry.oper_umodes)
1204		AddUMode(source_p, ConfigFileEntry.oper_umodes);
1205
#	Line 1225 | Line 1211 | oper_up(struct Client *source_p)
1211		assert(dlinkFind(&oper_list, source_p) == NULL);
1212		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1213
1214	<	operprivs = oper_privs_as_string(oconf->port);
1229	<
1230	<	AddOFlag(source_p, oconf->port);
1214	>	AddOFlag(source_p, conf->port);
1215
1216		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1217		AddUMode(source_p, UMODE_ADMIN);
1234	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1235	–	DelUMode(source_p, UMODE_NCHANGE);
1218
1219	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s is now an operator",
1219	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1220		get_oper_name(source_p));
1221		send_umode_out(source_p, source_p, old);
1222		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1241	–	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1242	–	me.name, source_p->name, operprivs);
1223		}
1224
1225		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1267 | Line 1247 | valid_sid(const char *sid)
1247		void
1248		init_uid(void)
1249		{
1250	<	int i;
1250	>	unsigned int i;
1251
1252		memset(new_uid, 0, sizeof(new_uid));
1253
#	Line 1284 | Line 1264 | init_uid(void)
1264		* -Dianora
1265		*/
1266		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1287	–
1288	–	entering_umode_cb = register_callback("entering_umode", NULL);
1289	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1267		}
1268
1269		/*
#	Line 1353 | Line 1330 | init_isupport(void)
1330		add_isupport("DEAF", "D", -1);
1331		add_isupport("KICKLEN", NULL, KICKLEN);
1332		add_isupport("MODES", NULL, MAXMODEPARAMS);
1356	–	add_isupport("NICKLEN", NULL, NICKLEN);
1333		#ifdef HALFOPS
1334		add_isupport("PREFIX", "(ohv)@%+", -1);
1335		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1361 | Line 1337 | init_isupport(void)
1337		add_isupport("PREFIX", "(ov)@+", -1);
1338		add_isupport("STATUSMSG", "@+", -1);
1339		#endif
1364	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1340		}
1341
1342		/*
#	Line 1396 | Line 1371 | add_isupport(const char *name, const cha
1371		dlinkAddTail(support, &support->node, &support_list);
1372		}
1373
1374	<	DupString(support->name, name);
1374	>	support->name = xstrdup(name);
1375		if (options != NULL)
1376	<	DupString(support->options, options);
1376	>	support->options = xstrdup(options);
1377		support->number = n;
1378
1379		rebuild_isupport_message_line();
#	Line 1457 | Line 1432 | rebuild_isupport_message_line(void)
1432		{
1433		struct Isupport *support = ptr->data;
1434
1435	<	p += (n = ircsprintf(p, "%s", support->name));
1435	>	p += (n = sprintf(p, "%s", support->name));
1436		len += n;
1437
1438		if (support->options != NULL)
1439		{
1440	<	p += (n = ircsprintf(p, "=%s", support->options));
1440	>	p += (n = sprintf(p, "=%s", support->options));
1441		len += n;
1442		}
1443
1444		if (support->number > 0)
1445		{
1446	<	p += (n = ircsprintf(p, "=%d", support->number));
1446	>	p += (n = sprintf(p, "=%d", support->number));
1447		len += n;
1448		}
1449

Diff Legend

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