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 3117 by michael, Fri Mar 7 19:28:54 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_user.c: User related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_user.c
23	>	* \brief User related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 29 | Line 31
31		#include "channel.h"
32		#include "channel_mode.h"
33		#include "client.h"
32	–	#include "common.h"
33	–	#include "fdlist.h"
34		#include "hash.h"
35		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
37	–	#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"
47	–	#include "whowas.h"
45		#include "memory.h"
46		#include "packet.h"
47		#include "rng_mt.h"
48		#include "userhost.h"
52	–	#include "hook.h"
49		#include "s_misc.h"
50	<	#include "msg.h"
50	>	#include "parse.h"
51		#include "watch.h"
52
57	–
58	–	struct Callback *entering_umode_cb = NULL;
59	–	struct Callback *umode_cb = NULL;
60	–
53		static char umode_buffer[IRCD_BUFSIZE];
54
55		static void user_welcome(struct Client *);
56	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
56	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
57		static int check_xline(struct Client *);
58		static void introduce_client(struct Client *);
59		static const char *uid_get(void);
#	Line 70 | Line 62 | static const char *uid_get(void);
62		* used with init_isupport, add_isupport, delete_isupport
63		*/
64
65	<	struct Isupport
65	>	struct Isupport
66		{
67		dlink_node node;
68		char *name;
#	Line 78 | Line 70 | struct Isupport
70		int number;
71		};
72
73	<	static dlink_list support_list = { NULL, NULL, 0 };
74	<	MessageFile *isupportFile;
73	>	static dlink_list support_list;
74	>	static dlink_list support_list_lines;
75
76		/* memory is cheap. map 0-255 to equivalent mode */
77	<	unsigned int user_modes[256] =
77	>	const unsigned int user_modes[256] =
78		{
79		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
80		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 91 | Line 83 | unsigned int user_modes[256] =
83		0,                  /* @ */
84		0,                  /* A */
85		0,                  /* B */
86	<	UMODE_CCONN_FULL,   /* C */
86	>	0,                  /* C */
87		UMODE_DEAF,         /* D */
88		0,                  /* E */
89	<	0,                  /* F */
89	>	UMODE_FARCONNECT,   /* F */
90		UMODE_SOFTCALLERID, /* G */
91	<	0,                  /* H */
91	>	UMODE_HIDDEN,       /* H */
92		0,                  /* I */
93		0,                  /* J */
94		0,                  /* K */
#	Line 107 | Line 99 | unsigned int user_modes[256] =
99		0,                  /* P */
100		0,                  /* Q */
101		UMODE_REGONLY,      /* R */
102	<	0,                  /* S */
102	>	UMODE_SSL,          /* S */
103		0,                  /* T */
104		0,                  /* U */
105		0,                  /* V */
106	<	0,                  /* W */
106	>	UMODE_WEBIRC,       /* W */
107		0,                  /* X */
108		0,                  /* Y */
109		0,                  /* Z 0x5A */
110	<	0, 0, 0, 0, 0,      /* 0x5F   */
110	>	0, 0, 0, 0, 0,      /* 0x5F   */
111		0,                  /* 0x60   */
112		UMODE_ADMIN,        /* a */
113		UMODE_BOTS,         /* b */
114		UMODE_CCONN,        /* c */
115		UMODE_DEBUG,        /* d */
116	<	0,                  /* e */
116	>	UMODE_EXTERNAL,     /* e */
117		UMODE_FULL,         /* f */
118		UMODE_CALLERID,     /* g */
119		0,                  /* h */
#	Line 140 | Line 132 | unsigned int user_modes[256] =
132		UMODE_UNAUTH,       /* u */
133		0,                  /* v */
134		UMODE_WALLOP,       /* w */
135	<	UMODE_EXTERNAL,     /* x */
135	>	UMODE_HIDDENHOST,   /* x */
136		UMODE_SPY,          /* y */
137		UMODE_OPERWALL,     /* z      0x7A */
138		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 175 | Line 167 | assemble_umode_buffer(void)
167		* side effects - display to client user counts etc.
168		*/
169		void
170	<	show_lusers(struct Client *source_p)
170	>	show_lusers(struct Client *source_p)
171		{
172	<	const char *from, *to;
173	<
174	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
183	<	{
184	<	from = me.id;
185	<	to = source_p->id;
186	<	}
172	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
173	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
174	>	Count.invisi, dlink_list_length(&global_serv_list));
175		else
176	<	{
177	<	from = me.name;
190	<	to = source_p->name;
191	<	}
192	<
193	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
194	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
195	<	from, to, (Count.total-Count.invisi),
196	<	Count.invisi, dlink_list_length(&global_serv_list));
197	<	else
198	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
199	<	(Count.total-Count.invisi), Count.invisi, 1);
176	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
177	>	(Count.total-Count.invisi), Count.invisi, 1);
178
179		if (Count.oper > 0)
180	<	sendto_one(source_p, form_str(RPL_LUSEROP),
203	<	from, to, Count.oper);
180	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
181
182		if (dlink_list_length(&unknown_list) > 0)
183	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
207	<	from, to, dlink_list_length(&unknown_list));
183	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
184
185		if (dlink_list_length(&global_channel_list) > 0)
186	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
211	<	from, to, dlink_list_length(&global_channel_list));
186	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
187
188	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
188	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
189		{
190	<	sendto_one(source_p, form_str(RPL_LUSERME),
191	<	from, to, Count.local, Count.myserver);
217	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
218	<	from, to, Count.local, Count.max_loc,
219	<	Count.local, Count.max_loc);
190	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
191	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
192		}
193		else
194		{
195	<	sendto_one(source_p, form_str(RPL_LUSERME),
196	<	from, to, Count.total, 0);
225	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
226	<	from, to, Count.total, Count.max_tot,
227	<	Count.total, Count.max_tot);
195	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
196	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
197		}
198
199	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
200	<	from, to, Count.total, Count.max_tot,
201	<	Count.total, Count.max_tot);
202	<
203	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
235	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
236	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
199	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
200	>
201	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
202	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
203	>	Count.max_loc_cli, Count.totalrestartcount);
204
205		if (Count.local > Count.max_loc_cli)
206		Count.max_loc_cli = Count.local;
207
208		if ((Count.local + Count.myserver) > Count.max_loc_con)
209	<	Count.max_loc_con = Count.local + Count.myserver;
209	>	Count.max_loc_con = Count.local + Count.myserver;
210		}
211
212		/* show_isupport()
#	Line 249 | Line 216 | show_lusers(struct Client *source_p)
216		* side effects - display to client what we support (for them)
217		*/
218		void
219	<	show_isupport(struct Client *source_p)
219	>	show_isupport(struct Client *source_p)
220		{
221	<	send_message_file(source_p, isupportFile);
221	>	const dlink_node *ptr = NULL;
222	>
223	>	DLINK_FOREACH(ptr, support_list_lines.head)
224	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
225		}
226
227		/*
#	Line 281 | Line 251 | void
251		register_local_user(struct Client *source_p)
252		{
253		const char *id = NULL;
254	<	const struct AccessItem *aconf = NULL;
285	<	dlink_node *ptr = NULL;
254	>	const struct MaskItem *conf = NULL;
255
256		assert(source_p != NULL);
257		assert(source_p == source_p->from);
#	Line 293 | Line 262 | register_local_user(struct Client *sourc
262
263		if (ConfigFileEntry.ping_cookie)
264		{
265	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
265	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
266		{
267		do
268		source_p->localClient->random_ping = genrand_int32();
#	Line 313 | Line 282 | register_local_user(struct Client *sourc
282		/* Straight up the maximum rate of flooding... */
283		source_p->localClient->allow_read = MAX_FLOOD_BURST;
284
285	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
285	>	if (!check_client(source_p))
286		return;
287
288	<	if (valid_hostname(source_p->host) == 0)
288	>	if (!valid_hostname(source_p->host))
289		{
290	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
291	<	"character in your hostname", me.name, source_p->name);
290	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
291	>	"character in your hostname");
292		strlcpy(source_p->host, source_p->sockhost,
293		sizeof(source_p->host));
294		}
295
296	<	ptr   = source_p->localClient->confs.head;
328	<	aconf = map_to_conf(ptr->data);
296	>	conf = source_p->localClient->confs.head->data;
297
298		if (!IsGotId(source_p))
299		{
#	Line 333 | Line 301 | register_local_user(struct Client *sourc
301		const char *p = username;
302		unsigned int i = 0;
303
304	<	if (IsNeedIdentd(aconf))
304	>	if (IsNeedIdentd(conf))
305		{
306		++ServerStats.is_ref;
307	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
308	<	"identd to use this server", me.name, source_p->name);
307	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
308	>	"identd to use this server");
309		exit_client(source_p, &me, "Install identd");
310		return;
311		}
312
313		strlcpy(username, source_p->username, sizeof(username));
314
315	<	if (!IsNoTilde(aconf))
315	>	if (!IsNoTilde(conf))
316		source_p->username[i++] = '~';
317
318		for (; *p && i < USERLEN; ++p)
#	Line 355 | Line 323 | register_local_user(struct Client *sourc
323		}
324
325		/* password check */
326	<	if (!EmptyString(aconf->passwd))
326	>	if (!EmptyString(conf->passwd))
327		{
328		const char *pass = source_p->localClient->passwd;
329
330	<	if (!match_conf_password(pass, aconf))
330	>	if (!match_conf_password(pass, conf))
331		{
332		++ServerStats.is_ref;
333	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
334	<	me.name, source_p->name);
333	>
334	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
335		exit_client(source_p, &me, "Bad Password");
336		return;
337		}
#	Line 375 | Line 343 | register_local_user(struct Client *sourc
343		*/
344
345		/* report if user has &^>= etc. and set flags as needed in source_p */
346	<	report_and_set_user_flags(source_p, aconf);
346	>	report_and_set_user_flags(source_p, conf);
347
348		if (IsDead(source_p))
349		return;
#	Line 391 | Line 359 | register_local_user(struct Client *sourc
359		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
360		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
361		{
362	<	sendto_realops_flags(UMODE_FULL, L_ALL,
362	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
363		"Too many clients, rejecting %s[%s].",
364		source_p->name, source_p->host);
365		++ServerStats.is_ref;
#	Line 400 | Line 368 | register_local_user(struct Client *sourc
368		}
369
370		/* valid user name check */
371	<	if (valid_username(source_p->username) == 0)
371	>	if (!valid_username(source_p->username, 1))
372		{
373		char tmpstr2[IRCD_BUFSIZE];
374
375	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
375	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
376	>	"Invalid username: %s (%s@%s)",
377		source_p->name, source_p->username, source_p->host);
378		++ServerStats.is_ref;
379		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
#	Line 422 | Line 391 | register_local_user(struct Client *sourc
391		strlcpy(source_p->id, id, sizeof(source_p->id));
392		hash_add_id(source_p);
393
394	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
394	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
395		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
396		source_p->name, source_p->username, source_p->host,
397		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
398		"255.255.255.255" : source_p->sockhost,
399	<	get_client_class(source_p),
399	>	get_client_class(&source_p->localClient->confs),
400		source_p->info, source_p->id);
401
433	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
434	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
435	–	source_p->name, source_p->username, source_p->host,
436	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
437	–	"255.255.255.255" : source_p->sockhost,
438	–	get_client_class(source_p),
439	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
440	–	"<hidden>" : source_p->localClient->client_host,
441	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
442	–	"<hidden>" : source_p->localClient->client_server,
443	–	source_p->info);
444	–
445	–
402		if (ConfigFileEntry.invisible_on_connect)
403		{
404	<	source_p->umodes |= UMODE_INVISIBLE;
404	>	AddUMode(source_p, UMODE_INVISIBLE);
405		++Count.invisi;
406		}
407
408	<	if ((++Count.local) > Count.max_loc)
408	>	if (++Count.local > Count.max_loc)
409		{
410		Count.max_loc = Count.local;
411
412		if (!(Count.max_loc % 10))
413	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
413	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
414	>	"New Max Local Clients: %d",
415		Count.max_loc);
416		}
417
#	Line 487 | Line 444 | register_local_user(struct Client *sourc
444		*              - username to register as
445		*              - host name to register as
446		*              - server name
490	–	*              - realname (gecos)
447		* output       - NONE
448		* side effects - This function is called when a remote client
449		*                is introduced by a server.
450		*/
451		void
452	<	register_remote_user(struct Client *source_p,
453	<	const char *username, const char *host, const char *server,
498	<	const char *realname)
452	>	register_remote_user(struct Client *source_p, const char *username,
453	>	const char *host, const char *server)
454		{
455		struct Client *target_p = NULL;
456
457		assert(source_p != NULL);
458		assert(source_p->username != username);
459
460	<	strlcpy(source_p->host, host, sizeof(source_p->host));
460	>	strlcpy(source_p->host, host, sizeof(source_p->host));
461		strlcpy(source_p->username, username, sizeof(source_p->username));
462
463		/*
#	Line 510 | Line 465 | register_remote_user(struct Client *sour
465		*/
466		source_p->servptr = hash_find_server(server);
467
468	<	/* Super GhostDetect:
468	>	/*
469	>	* Super GhostDetect:
470		* If we can't find the server the user is supposed to be on,
471		* then simply blow the user away.        -Taner
472		*/
473		if (source_p->servptr == NULL)
474		{
475	<	sendto_realops_flags(UMODE_ALL, L_ALL,
475	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
476		"No server %s for user %s[%s@%s] from %s",
477		server, source_p->name, source_p->username,
478		source_p->host, source_p->from->name);
479		kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
480
481	<	SetKilled(source_p);
481	>	AddFlag(source_p, FLAGS_KILLED);
482		exit_client(source_p, &me, "Ghosted Client");
483		return;
484		}
485
486		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
487		{
488	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
488	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
489		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
490		source_p->from->name, source_p->name, source_p->username,
491		source_p->host, source_p->servptr->name,
#	Line 537 | Line 493 | register_remote_user(struct Client *sour
493		kill_client(source_p->from, source_p,
494		"%s (NICK from wrong direction (%s != %s))",
495		me.name, source_p->servptr->name, target_p->from->name);
496	<	SetKilled(source_p);
496	>	AddFlag(source_p, FLAGS_KILLED);
497		exit_client(source_p, &me, "USER server wrong direction");
498		return;
499		}
#	Line 546 | Line 502 | register_remote_user(struct Client *sour
502		* If the nick has been introduced by a services server,
503		* make it a service as well.
504		*/
505	<	if (IsService(source_p->servptr))
506	<	SetService(source_p);
505	>	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
506	>	AddFlag(source_p, FLAGS_SERVICE);
507
508		/* Increment our total user count here */
509		if (++Count.total > Count.max_tot)
#	Line 558 | Line 514 | register_remote_user(struct Client *sour
514		add_user_host(source_p->username, source_p->host, 1);
515		SetUserHost(source_p);
516
517	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
518	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
519	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
520	+	source_p->servptr->name,
521	+	source_p->name, source_p->username, source_p->host,
522	+	source_p->info, source_p->id);
523	+
524		introduce_client(source_p);
525		}
526
#	Line 573 | Line 536 | static void
536		introduce_client(struct Client *source_p)
537		{
538		dlink_node *server_node = NULL;
539	<	static char ubuf[12];
539	>	char ubuf[IRCD_BUFSIZE];
540
541		if (MyClient(source_p))
542		send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
#	Line 582 | Line 545 | introduce_client(struct Client *source_p
545
546		watch_check_hash(source_p, RPL_LOGON);
547
548	<	if (*ubuf == '\0')
548	>	if (ubuf[0] == '\0')
549		{
550		ubuf[0] = '+';
551		ubuf[1] = '\0';
#	Line 595 | Line 558 | introduce_client(struct Client *source_p
558		if (server == source_p->from)
559		continue;
560
561	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
562	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
563	<	source_p->servptr->id,
564	<	source_p->name, source_p->hopcount+1,
565	<	(unsigned long)source_p->tsinfo,
566	<	ubuf, source_p->username, source_p->host,
567	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
568	<	"0" : source_p->sockhost, source_p->id, source_p->info);
561	>	if (IsCapable(server, CAP_SVS))
562	>	{
563	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
564	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
565	>	source_p->servptr->id,
566	>	source_p->name, source_p->hopcount+1,
567	>	(unsigned long)source_p->tsinfo,
568	>	ubuf, source_p->username, source_p->host,
569	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
570	>	"0" : source_p->sockhost, source_p->id,
571	>	source_p->svid,
572	>	source_p->info);
573	>	else
574	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
575	>	source_p->name, source_p->hopcount+1,
576	>	(unsigned long)source_p->tsinfo,
577	>	ubuf, source_p->username, source_p->host,
578	>	source_p->servptr->name, source_p->svid,
579	>	source_p->info);
580	>
581	>	}
582		else
583	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
584	<	source_p->name, source_p->hopcount+1,
585	<	(unsigned long)source_p->tsinfo,
586	<	ubuf, source_p->username, source_p->host,
587	<	source_p->servptr->name, source_p->info);
583	>	{
584	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
585	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
586	>	source_p->servptr->id,
587	>	source_p->name, source_p->hopcount+1,
588	>	(unsigned long)source_p->tsinfo,
589	>	ubuf, source_p->username, source_p->host,
590	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
591	>	"0" : source_p->sockhost, source_p->id, source_p->info);
592	>	else
593	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
594	>	source_p->name, source_p->hopcount+1,
595	>	(unsigned long)source_p->tsinfo,
596	>	ubuf, source_p->username, source_p->host,
597	>	source_p->servptr->name, source_p->info);
598	>	}
599	>
600	>	if (!EmptyString(source_p->certfp))
601	>	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
602		}
603		}
604
#	Line 628 | Line 618 | valid_hostname(const char *hostname)
618
619		assert(p != NULL);
620
621	<	if (*p == '.' || *p == ':')
621	>	if (EmptyString(p) || *p == '.' || *p == ':')
622		return 0;
623
624		for (; *p; ++p)
625		if (!IsHostChar(*p))
626		return 0;
627
628	<	return 1;
628	>	return p - hostname <= HOSTLEN;
629		}
630
631		/* valid_username()
#	Line 650 | Line 640 | valid_hostname(const char *hostname)
640		* style of username
641		*/
642		int
643	<	valid_username(const char *username)
643	>	valid_username(const char *username, const int local)
644		{
645		int dots      = 0;
646		const char *p = username;
#	Line 660 | Line 650 | valid_username(const char *username)
650		if (*p == '~')
651		++p;
652
653	<	/* reject usernames that don't start with an alphanum
653	>	/*
654	>	* Reject usernames that don't start with an alphanum
655		* i.e. reject jokers who have '-@somehost' or '.@somehost'
656		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
657		*/
658		if (!IsAlNum(*p))
659		return 0;
660
661	<	while (*++p)
661	>	if (local)
662		{
663	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
663	>	while (*++p)
664		{
665	<	if (++dots > ConfigFileEntry.dots_in_ident)
666	<	return 0;
667	<	if (!IsUserChar(*(p + 1)))
665	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
666	>	{
667	>	if (++dots > ConfigFileEntry.dots_in_ident)
668	>	return 0;
669	>	if (!IsUserChar(*(p + 1)))
670	>	return 0;
671	>	}
672	>	else if (!IsUserChar(*p))
673		return 0;
674		}
675	<	else if (!IsUserChar(*p))
676	<	return 0;
675	>	}
676	>	else
677	>	{
678	>	while (*++p)
679	>	if (!IsUserChar(*p))
680	>	return 0;
681		}
682
683	<	return 1;
683	>	return  p - username <= USERLEN;;
684		}
685
686		/* clean_nick_name()
#	Line 705 | Line 705 | valid_nickname(const char *nickname, con
705		if (!IsNickChar(*p))
706		return 0;
707
708	<	return p - nickname <= (NICKLEN - 1);
708	>	return p - nickname <= NICKLEN;
709		}
710
711		/* report_and_set_user_flags()
712		*
713		* inputs       - pointer to source_p
714	<	*              - pointer to aconf for this user
714	>	*              - pointer to conf for this user
715		* output       - NONE
716		* side effects - Report to user any special flags
717		*                they are getting, and set them.
718		*/
719		static void
720	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
720	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
721		{
722		/* If this user is being spoofed, tell them so */
723	<	if (IsConfDoSpoofIp(aconf))
724	<	{
725	<	sendto_one(source_p,
726	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
727	<	me.name, source_p->name);
728	<	}
723	>	if (IsConfDoSpoofIp(conf))
724	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
725
726		/* If this user is in the exception class, Set it "E lined" */
727	<	if (IsConfExemptKline(aconf))
727	>	if (IsConfExemptKline(conf))
728		{
729		SetExemptKline(source_p);
730	<	sendto_one(source_p,
735	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
736	<	me.name, source_p->name);
730	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
731		}
732
733	<	/* The else here is to make sure that G line exempt users
733	>	/*
734	>	* The else here is to make sure that G line exempt users
735		* do not get noticed twice.
736		*/
737	<	else if (IsConfExemptGline(aconf))
737	>	else if (IsConfExemptGline(conf))
738		{
739		SetExemptGline(source_p);
740	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
746	<	me.name, source_p->name);
740	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
741		}
742
743	<	if (IsConfExemptResv(aconf))
743	>	if (IsConfExemptResv(conf))
744		{
745		SetExemptResv(source_p);
746	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
753	<	me.name, source_p->name);
746	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
747		}
748
749		/* If this user is exempt from user limits set it "F lined" */
750	<	if (IsConfExemptLimits(aconf))
750	>	if (IsConfExemptLimits(conf))
751		{
752		SetExemptLimits(source_p);
753	<	sendto_one(source_p,
761	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
762	<	me.name,source_p->name);
753	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
754		}
755
756	<	if (IsConfCanFlood(aconf))
756	>	if (IsConfCanFlood(conf))
757		{
758		SetCanFlood(source_p);
759	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
760	<	"protection, aren't you fearsome.",
770	<	me.name, source_p->name);
759	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
760	>	"protection, aren't you fearsome.");
761		}
762		}
763
774	–	/* change_simple_umode()
775	–	*
776	–	* this callback can be hooked to allow special handling of
777	–	* certain usermodes
778	–	*/
779	–	static void *
780	–	change_simple_umode(va_list args)
781	–	{
782	–	struct Client *client_p;
783	–	struct Client *source_p;
784	–	int what;
785	–	unsigned int flag;
786	–
787	–	client_p = va_arg(args, struct Client *);
788	–	source_p = va_arg(args, struct Client *);
789	–	what = va_arg(args, int);
790	–	flag = va_arg(args, unsigned int);
791	–
792	–	if (what == MODE_ADD)
793	–	source_p->umodes |= flag;
794	–	else
795	–	source_p->umodes &= ~flag;
796	–
797	–	return NULL;
798	–	}
799	–
764		/* set_user_mode()
765		*
766		* added 15/10/91 By Darren Reed.
#	Line 806 | Line 770 | change_simple_umode(va_list args)
770		*/
771		void
772		set_user_mode(struct Client *client_p, struct Client *source_p,
773	<	int parc, char *parv[])
773	>	const int parc, char *parv[])
774		{
775		unsigned int flag, setflags;
776		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 818 | Line 782 | set_user_mode(struct Client *client_p, s
782		if ((target_p = find_person(client_p, parv[1])) == NULL)
783		{
784		if (MyConnect(source_p))
785	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
822	<	me.name, source_p->name, parv[1]);
785	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
786		return;
787		}
788
826	–	if (IsServer(source_p))
827	–	{
828	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
829	–	parv[1], source_p->name);
830	–	return;
831	–	}
832	–
789		if (source_p != target_p)
790		{
791	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
836	<	me.name, source_p->name);
791	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
792		return;
793		}
794
#	Line 842 | Line 797 | set_user_mode(struct Client *client_p, s
797		m = buf;
798		*m++ = '+';
799
800	<	for (i = 0; i < 128; i++)
801	<	if (source_p->umodes & user_modes[i])
800	>	for (i = 0; i < 128; ++i)
801	>	if (HasUMode(source_p, user_modes[i]))
802		*m++ = (char)i;
803		*m = '\0';
804
805	<	sendto_one(source_p, form_str(RPL_UMODEIS),
851	<	me.name, source_p->name, buf);
805	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
806		return;
807		}
808
855	–	execute_callback(entering_umode_cb, client_p, source_p);
856	–
809		/* find flags already set for user */
810		setflags = source_p->umodes;
811
812		/* parse mode change string(s) */
813	<	for (p = &parv[2]; p && *p; p++)
813	>	for (p = &parv[2]; p && *p; ++p)
814		{
815	<	for (m = *p; *m; m++)
815	>	for (m = *p; *m; ++m)
816		{
817		switch (*m)
818		{
#	Line 873 | Line 825 | set_user_mode(struct Client *client_p, s
825		case 'o':
826		if (what == MODE_ADD)
827		{
828	<	if (IsServer(client_p) && !IsOper(source_p))
828	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
829		{
830		++Count.oper;
831		SetOper(source_p);
#	Line 881 | Line 833 | set_user_mode(struct Client *client_p, s
833		}
834		else
835		{
836	<	/* Only decrement the oper counts if an oper to begin with
885	<	* found by Pat Szuta, Perly , perly@xnet.com
886	<	*/
887	<	if (!IsOper(source_p))
836	>	if (!HasUMode(source_p, UMODE_OPER))
837		break;
838
839		ClearOper(source_p);
#	Line 892 | Line 841 | set_user_mode(struct Client *client_p, s
841
842		if (MyConnect(source_p))
843		{
844	<	dlink_node *dm;
844	>	dlink_node *dm = NULL;
845
846	<	detach_conf(source_p, OPER_TYPE);
847	<	ClearOperFlags(source_p);
848	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
846	>	detach_conf(source_p, CONF_OPER);
847	>	ClrOFlag(source_p);
848	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
849
850		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
851		free_dlink_node(dm);
#	Line 905 | Line 854 | set_user_mode(struct Client *client_p, s
854
855		break;
856
857	<	/* we may not get these,
858	<	* but they shouldnt be in default
859	<	*/
860	<	case 'r':
912	<	case ' ' :
913	<	case '\n':
914	<	case '\r':
915	<	case '\t':
857	>	case 'S':  /* Only servers may set +S in a burst */
858	>	case 'W':  /* Only servers may set +W in a burst */
859	>	case 'r':  /* Only services may set +r */
860	>	case 'x':  /* Only services may set +x */
861		break;
862
863		default:
864		if ((flag = user_modes[(unsigned char)*m]))
865		{
866	<	if (MyConnect(source_p) && !IsOper(source_p) &&
866	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
867		(ConfigFileEntry.oper_only_umodes & flag))
923	–	{
868		badflag = 1;
925	–	}
869		else
870	<	execute_callback(umode_cb, client_p, source_p, what, flag);
871	<	}
872	<	else
873	<	{
874	<	if (MyConnect(source_p))
875	<	badflag = 1;
870	>	{
871	>	if (what == MODE_ADD)
872	>	AddUMode(source_p, flag);
873	>	else
874	>	DelUMode(source_p, flag);
875	>	}
876		}
877	+	else if (MyConnect(source_p))
878	+	badflag = 1;
879
880		break;
881		}
#	Line 938 | Line 883 | set_user_mode(struct Client *client_p, s
883		}
884
885		if (badflag)
886	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
942	<	me.name, source_p->name);
943	<
944	<	if (HasUMode(source_p, UMODE_NCHANGE) && !IsOperN(source_p))
945	<	{
946	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
947	<	me.name, source_p->name);
948	<	DelUMode(source_p, UMODE_NCHANGE); /* only tcm's really need this */
949	<	}
886	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
887
888	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
889	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
888	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
889	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
890		{
891	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
892	<	me.name, source_p->name);
956	<	source_p->umodes &= ~UMODE_ADMIN;
891	>	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
892	>	DelUMode(source_p, UMODE_ADMIN);
893		}
894
895	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
895	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
896		++Count.invisi;
897	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
897	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
898		--Count.invisi;
899
900		/*
#	Line 992 | Line 928 | send_umode(struct Client *client_p, stru
928		* build a string in umode_buf to represent the change in the user's
929		* mode between the new (source_p->umodes) and 'old'.
930		*/
931	<	for (i = 0; i < 128; i++)
931	>	for (i = 0; i < 128; ++i)
932		{
933		flag = user_modes[i];
934		if (!flag)
#	Line 1001 | Line 937 | send_umode(struct Client *client_p, stru
937		if (MyClient(source_p) && !(flag & sendmask))
938		continue;
939
940	<	if ((flag & old) && !(source_p->umodes & flag))
940	>	if ((flag & old) && !HasUMode(source_p, flag))
941		{
942		if (what == MODE_DEL)
943		*m++ = (char)i;
#	Line 1012 | Line 948 | send_umode(struct Client *client_p, stru
948		*m++ = (char)i;
949		}
950		}
951	<	else if (!(flag & old) && (source_p->umodes & flag))
951	>	else if (!(flag & old) && HasUMode(source_p, flag))
952		{
953		if (what == MODE_ADD)
954		*m++ = (char)i;
#	Line 1046 | Line 982 | send_umode_out(struct Client *client_p,
982		char buf[IRCD_BUFSIZE] = { '\0' };
983		dlink_node *ptr = NULL;
984
985	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1050	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
985	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
986
987		if (buf[0])
988		{
#	Line 1066 | Line 1001 | send_umode_out(struct Client *client_p,
1001		send_umode(client_p, source_p, old, 0xffffffff, buf);
1002		}
1003
1004	+	void
1005	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1006	+	{
1007	+	dlink_node *ptr = NULL;
1008	+
1009	+	if (!strcmp(target_p->host, hostname))
1010	+	return;
1011	+
1012	+	switch (what)
1013	+	{
1014	+	case MODE_ADD:
1015	+	AddUMode(target_p, UMODE_HIDDENHOST);
1016	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1017	+	break;
1018	+	case MODE_DEL:
1019	+	DelUMode(target_p, UMODE_HIDDENHOST);
1020	+
1021	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1022	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1023	+	break;
1024	+	default: return;
1025	+	}
1026	+
1027	+	if (ConfigFileEntry.cycle_on_host_change)
1028	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1029	+	target_p->name, target_p->username, target_p->host);
1030	+
1031	+	if (IsUserHostIp(target_p))
1032	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1033	+
1034	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1035	+
1036	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1037	+	SetUserHost(target_p);
1038	+
1039	+	if (MyClient(target_p))
1040	+	{
1041	+	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1042	+	clear_ban_cache_client(target_p);
1043	+	}
1044	+
1045	+	if (!ConfigFileEntry.cycle_on_host_change)
1046	+	return;
1047	+
1048	+	DLINK_FOREACH(ptr, target_p->channel.head)
1049	+	{
1050	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1051	+	char *p = modebuf;
1052	+	int len = 0;
1053	+	const struct Membership *ms = ptr->data;
1054	+
1055	+	if (has_member_flags(ms, CHFL_CHANOP))
1056	+	{
1057	+	*p++ = 'o';
1058	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1059	+	}
1060	+
1061	+	if (has_member_flags(ms, CHFL_HALFOP))
1062	+	{
1063	+	*p++ = 'h';
1064	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1065	+	}
1066	+
1067	+	if (has_member_flags(ms, CHFL_VOICE))
1068	+	{
1069	+	*p++ = 'v';
1070	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1071	+	}
1072	+
1073	+	*p = '\0';
1074	+
1075	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1076	+	target_p->name, target_p->username, target_p->host,
1077	+	ms->chptr->chname);
1078	+	if (nickbuf[0])
1079	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1080	+	target_p->servptr->name, ms->chptr->chname,
1081	+	modebuf, nickbuf);
1082	+
1083	+	}
1084	+
1085	+	if (target_p->away[0])
1086	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1087	+	":%s!%s@%s AWAY :%s",
1088	+	target_p->name, target_p->username,
1089	+	target_p->host, target_p->away);
1090	+	}
1091	+
1092		/* user_welcome()
1093		*
1094		* inputs       - client pointer to client to welcome
#	Line 1082 | Line 1105 | user_welcome(struct Client *source_p)
1105		#endif
1106
1107		#ifdef HAVE_LIBCRYPTO
1108	<	if (source_p->localClient->fd.ssl != NULL)
1109	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1110	<	me.name, source_p->name,
1111	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1108	>	if (HasFlag(source_p, FLAGS_SSL))
1109	>	{
1110	>	AddUMode(source_p, UMODE_SSL);
1111	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1112	>	ssl_get_cipher(source_p->localClient->fd.ssl));
1113	>	}
1114		#endif
1115
1116	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1117	<	ServerInfo.network_name, source_p->name);
1118	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1119	<	get_listener_name(source_p->localClient->listener), ircd_version);
1120	<	sendto_one(source_p, form_str(RPL_CREATED),
1121	<	me.name, source_p->name, built_date);
1097	<	sendto_one(source_p, form_str(RPL_MYINFO),
1098	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1116	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1117	>	source_p->name);
1118	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1119	>	get_listener_name(source_p->localClient->listener), ircd_version);
1120	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1121	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1122		show_isupport(source_p);
1123
1124		if (source_p->id[0] != '\0')
1125	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1103	<	source_p->name, source_p->id);
1125	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1126
1127		show_lusers(source_p);
1128	<
1107	<	if (ConfigFileEntry.short_motd)
1108	<	{
1109	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1110	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1111	<	sendto_one(source_p,
1112	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1113	<	"read it", me.name, source_p->name);
1114	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1115	<	me.name, source_p->name, me.name);
1116	<	sendto_one(source_p, form_str(RPL_MOTD),
1117	<	me.name, source_p->name,
1118	<	"*** This is the short motd ***");
1119	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1120	<	me.name, source_p->name);
1121	<	}
1122	<	else
1123	<	send_message_file(source_p, &ConfigFileEntry.motd);
1128	>	motd_signon(source_p);
1129		}
1130
1131		/* check_xline()
#	Line 1132 | Line 1137 | user_welcome(struct Client *source_p)
1137		static int
1138		check_xline(struct Client *source_p)
1139		{
1140	<	struct ConfItem *conf = NULL;
1140	>	struct MaskItem *conf = NULL;
1141		const char *reason = NULL;
1142
1143	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1139	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1143	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1144		{
1145	<	struct MatchItem *reg = map_to_conf(conf);
1145	>	++conf->count;
1146
1147	<	++reg->count;
1148	<
1145	<	if (reg->reason != NULL)
1146	<	reason = reg->reason;
1147	>	if (conf->reason != NULL)
1148	>	reason = conf->reason;
1149		else
1150		reason = "No Reason";
1151
1152	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1152	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1153		"X-line Rejecting [%s] [%s], user %s [%s]",
1154		source_p->info, reason,
1155		get_client_name(source_p, HIDE_IP),
1156		source_p->sockhost);
1157
1158		++ServerStats.is_ref;
1159	<	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");
1159	>	exit_client(source_p, &me, "Bad user info");
1160		return 1;
1161		}
1162
#	Line 1173 | Line 1167 | check_xline(struct Client *source_p)
1167		*
1168		* inputs       - pointer to given client to oper
1169		* output       - NONE
1170	<	* side effects - Blindly opers up given source_p, using aconf info
1170	>	* side effects - Blindly opers up given source_p, using conf info
1171		*                all checks on passwords have already been done.
1172	<	*                This could also be used by rsa oper routines.
1172	>	*                This could also be used by rsa oper routines.
1173		*/
1174		void
1175		oper_up(struct Client *source_p)
1176		{
1177	<	unsigned int old = source_p->umodes;
1178	<	const char *operprivs = "";
1185	<	const struct AccessItem *oconf = NULL;
1177	>	const unsigned int old = source_p->umodes;
1178	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1179
1180		assert(source_p->localClient->confs.head);
1188	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1181
1182		++Count.oper;
1183		SetOper(source_p);
1184
1185	<	if (oconf->modes)
1186	<	source_p->umodes |= oconf->modes;
1185	>	if (conf->modes)
1186	>	AddUMode(source_p, conf->modes);
1187		else if (ConfigFileEntry.oper_umodes)
1188	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1197	<	else
1198	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1199	<	UMODE_WALLOP|UMODE_LOCOPS);
1188	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1189
1190	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1190	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1191		++Count.invisi;
1192	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1192	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1193		--Count.invisi;
1194
1195		assert(dlinkFind(&oper_list, source_p) == NULL);
1196		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1197
1198	<	operprivs = oper_privs_as_string(oconf->port);
1210	<
1211	<	SetOFlag(source_p, oconf->port);
1198	>	AddOFlag(source_p, conf->port);
1199
1200	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1200	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1201		AddUMode(source_p, UMODE_ADMIN);
1215	–	if (!IsOperN(source_p))
1216	–	DelUMode(source_p, UMODE_NCHANGE);
1202
1203	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1204	<	source_p->name, source_p->username, source_p->host);
1203	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1204	>	get_oper_name(source_p));
1205		send_umode_out(source_p, source_p, old);
1206	<	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);
1206	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1207		}
1208
1209		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1239 | Line 1221 | valid_sid(const char *sid)
1221
1222		/*
1223		* init_uid()
1224	<	*
1224	>	*
1225		* inputs       - NONE
1226		* output       - NONE
1227		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1249 | Line 1231 | valid_sid(const char *sid)
1231		void
1232		init_uid(void)
1233		{
1234	<	int i;
1234	>	unsigned int i;
1235
1236		memset(new_uid, 0, sizeof(new_uid));
1237
#	Line 1257 | Line 1239 | init_uid(void)
1239		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1240
1241		for (i = 0; i < IRC_MAXSID; ++i)
1242	<	if (new_uid[i] == '\0')
1242	>	if (new_uid[i] == '\0')
1243		new_uid[i] = 'A';
1244
1245		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1264	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1265	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1266	–	* -Dianora
1267	–	*/
1246		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1269	–
1270	–	entering_umode_cb = register_callback("entering_umode", NULL);
1271	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1247		}
1248
1249		/*
#	Line 1328 | Line 1303 | uid_get(void)
1303		void
1304		init_isupport(void)
1305		{
1331	–	isupportFile = init_MessageLine();
1332	–
1306		add_isupport("CALLERID", NULL, -1);
1307		add_isupport("CASEMAPPING", CASEMAP, -1);
1308		add_isupport("DEAF", "D", -1);
1309		add_isupport("KICKLEN", NULL, KICKLEN);
1310		add_isupport("MODES", NULL, MAXMODEPARAMS);
1338	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1311		#ifdef HALFOPS
1312		add_isupport("PREFIX", "(ohv)@%+", -1);
1313		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1343 | Line 1315 | init_isupport(void)
1315		add_isupport("PREFIX", "(ov)@+", -1);
1316		add_isupport("STATUSMSG", "@+", -1);
1317		#endif
1318	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1318	>	add_isupport("EXCEPTS", "e", -1);
1319	>	add_isupport("INVEX", "I", -1);
1320		}
1321
1322		/*
#	Line 1378 | Line 1351 | add_isupport(const char *name, const cha
1351		dlinkAddTail(support, &support->node, &support_list);
1352		}
1353
1354	<	DupString(support->name, name);
1354	>	support->name = xstrdup(name);
1355		if (options != NULL)
1356	<	DupString(support->options, options);
1356	>	support->options = xstrdup(options);
1357		support->number = n;
1358
1359		rebuild_isupport_message_line();
#	Line 1427 | Line 1400 | rebuild_isupport_message_line(void)
1400		{
1401		char isupportbuffer[IRCD_BUFSIZE];
1402		char *p = isupportbuffer;
1403	<	dlink_node *ptr = NULL;
1403	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1404		int n = 0;
1405		int tokens = 0;
1406		size_t len = 0;
1407	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1407	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1408
1409	<	destroy_MessageLine(isupportFile);
1409	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1410	>	{
1411	>	dlinkDelete(ptr, &support_list_lines);
1412	>	MyFree(ptr->data);
1413	>	free_dlink_node(ptr);
1414	>	}
1415
1416		DLINK_FOREACH(ptr, support_list.head)
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
#	Line 1463 | Line 1441 | rebuild_isupport_message_line(void)
1441		if (*--p == ' ')
1442		*p = '\0';
1443
1444	<	addto_MessageLine(isupportFile, isupportbuffer);
1444	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1445		p = isupportbuffer;
1446		len = 0;
1447		n = tokens = 0;
#	Line 1474 | Line 1452 | rebuild_isupport_message_line(void)
1452		{
1453		if (*--p == ' ')
1454		*p = '\0';
1455	<	addto_MessageLine(isupportFile, isupportbuffer);
1455	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1456		}
1457		}

Diff Legend

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