ViewVC Help

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

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

Comparing:
ircd-hybrid-7.3/src/s_user.c (file contents), Revision 1125 by michael, Sun Feb 20 13:44:39 2011 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 3186 by michael, Thu Mar 20 18:09:34 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	–	unsigned int MaxClientCount     = 1;
58	–	unsigned int MaxConnectionCount = 1;
59	–	struct Callback *entering_umode_cb = NULL;
60	–	struct Callback *umode_cb = NULL;
61	–
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 71 | 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 79 | 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 92 | 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 98 | unsigned int user_modes[256] =
98		0,                  /* O */
99		0,                  /* P */
100		0,                  /* Q */
101	<	0,                  /* R */
102	<	0,                  /* S */
101	>	UMODE_REGONLY,      /* R */
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 */
120		UMODE_INVISIBLE,    /* i */
121	<	0,                  /* j */
121	>	UMODE_REJ,          /* j */
122		UMODE_SKILL,        /* k */
123		UMODE_LOCOPS,       /* l */
124		0,                  /* m */
#	Line 135 | Line 126 | unsigned int user_modes[256] =
126		UMODE_OPER,         /* o */
127		0,                  /* p */
128		0,                  /* q */
129	<	UMODE_REJ,          /* r */
129	>	UMODE_REGISTERED,   /* r */
130		UMODE_SERVNOTICE,   /* s */
131		0,                  /* t */
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 176 | 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))
184	<	{
185	<	from = me.id;
186	<	to = source_p->id;
187	<	}
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;
191	<	to = source_p->name;
192	<	}
193	<
194	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
195	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
196	<	from, to, (Count.total-Count.invisi),
197	<	Count.invisi, dlink_list_length(&global_serv_list));
198	<	else
199	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
200	<	(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),
204	<	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),
208	<	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),
212	<	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);
218	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.local, Count.max_loc,
220	<	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);
197	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
198	<	from, to, Count.total, Count.max_tot,
199	<	Count.total, Count.max_tot);
229	<	}
230	<
231	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
232	<	from, to, Count.total, Count.max_tot,
233	<	Count.total, Count.max_tot);
234	<
235	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
236	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
237	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
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_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
200
201	<	if (Count.local > MaxClientCount)
202	<	MaxClientCount = Count.local;
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.myserver) > MaxConnectionCount)
206	<	MaxConnectionCount = Count.local + Count.myserver;
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;
210		}
211
212		/* show_isupport()
#	Line 250 | 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 282 | Line 251 | void
251		register_local_user(struct Client *source_p)
252		{
253		const char *id = NULL;
254	<	const struct AccessItem *aconf = NULL;
286	<	dlink_node *ptr = NULL;
287	<	dlink_node *m = NULL;
254	>	const struct MaskItem *conf = NULL;
255
256		assert(source_p != NULL);
257		assert(source_p == source_p->from);
#	Line 295 | 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 311 | Line 278 | register_local_user(struct Client *sourc
278		return;
279		}
280
281	<	source_p->localClient->last = CurrentTime;
281	>	source_p->localClient->last_privmsg = CurrentTime;
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;
330	<	aconf = map_to_conf(ptr->data);
296	>	conf = source_p->localClient->confs.head->data;
297
298		if (!IsGotId(source_p))
299		{
#	Line 335 | 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);
309	<	exit_client(source_p, &me, "Install identd");
307	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
308	>	"identd to use this server");
309	>	exit_client(source_p, "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 357 | 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);
335	<	exit_client(source_p, &me, "Bad Password");
333	>
334	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
335	>	exit_client(source_p, "Bad Password");
336		return;
337		}
338		}
#	Line 377 | 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 393 | 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;
366	<	exit_client(source_p, &me, "Sorry, server is full - try later");
366	>	exit_client(source_p, "Sorry, server is full - try later");
367		return;
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]",
380		source_p->username);
381	<	exit_client(source_p, &me, tmpstr2);
381	>	exit_client(source_p, tmpstr2);
382		return;
383		}
384
#	Line 424 | 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,
395	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
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),
400	<	source_p->info);
434	<
435	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
436	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
437	<	source_p->name, source_p->username, source_p->host,
438	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
439	<	"255.255.255.255" : source_p->sockhost,
440	<	get_client_class(source_p),
441	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
442	<	"<hidden>" : source_p->localClient->client_host,
443	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
444	<	"<hidden>" : source_p->localClient->client_server,
445	<	source_p->info);
446	<
399	>	get_client_class(&source_p->localClient->confs),
400	>	source_p->info, source_p->id);
401
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 473 | Line 428 | register_local_user(struct Client *sourc
428
429		assert(dlinkFind(&unknown_list, source_p));
430
431	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
432	<	{
478	<	free_dlink_node(m);
479	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
480	<	}
431	>	dlink_move_node(&source_p->localClient->lclient_node,
432	>	&unknown_list, &local_client_list);
433
434		user_welcome(source_p);
435		add_user_host(source_p->username, source_p->host, 0);
#	Line 492 | Line 444 | register_local_user(struct Client *sourc
444		*              - username to register as
445		*              - host name to register as
446		*              - server name
495	–	*              - 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,
503	<	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		/*
464		* coming from another server, take the servers word for it
465		*/
466	<	source_p->servptr = find_server(server);
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);
479	>	sendto_one(source_p->from,
480	>	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
481	>	me.id, source_p->id, me.name, server);
482
483	<	SetKilled(source_p);
484	<	exit_client(source_p, &me, "Ghosted Client");
483	>	AddFlag(source_p, FLAGS_KILLED);
484	>	exit_client(source_p, "Ghosted Client");
485		return;
486		}
487
488		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
489		{
490	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
490	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
491		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
492		source_p->from->name, source_p->name, source_p->username,
493		source_p->host, source_p->servptr->name,
494		target_p->name, target_p->from->name);
495	<	kill_client(source_p->from, source_p,
496	<	"%s (NICK from wrong direction (%s != %s))",
497	<	me.name, source_p->servptr->name, target_p->from->name);
498	<	SetKilled(source_p);
499	<	exit_client(source_p, &me, "USER server wrong direction");
495	>	sendto_one(source_p->from,
496	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
497	>	me.id, source_p->id, me.name, source_p->servptr->name,
498	>	target_p->from->name);
499	>
500	>	AddFlag(source_p, FLAGS_KILLED);
501	>	exit_client(source_p, "USER server wrong direction");
502		return;
503		}
504
505	+	/*
506	+	* If the nick has been introduced by a services server,
507	+	* make it a service as well.
508	+	*/
509	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
510	+	AddFlag(source_p, FLAGS_SERVICE);
511	+
512		/* Increment our total user count here */
513		if (++Count.total > Count.max_tot)
514		Count.max_tot = Count.total;
#	Line 556 | Line 518 | register_remote_user(struct Client *sour
518		add_user_host(source_p->username, source_p->host, 1);
519		SetUserHost(source_p);
520
521	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
522	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
523	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
524	+	source_p->servptr->name,
525	+	source_p->name, source_p->username, source_p->host,
526	+	source_p->info, source_p->id);
527	+
528		introduce_client(source_p);
529		}
530
#	Line 571 | Line 540 | static void
540		introduce_client(struct Client *source_p)
541		{
542		dlink_node *server_node = NULL;
543	<	static char ubuf[12];
543	>	char ubuf[IRCD_BUFSIZE];
544
545		if (MyClient(source_p))
546		send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
#	Line 580 | Line 549 | introduce_client(struct Client *source_p
549
550		watch_check_hash(source_p, RPL_LOGON);
551
552	<	if (*ubuf == '\0')
552	>	if (ubuf[0] == '\0')
553		{
554		ubuf[0] = '+';
555		ubuf[1] = '\0';
#	Line 593 | Line 562 | introduce_client(struct Client *source_p
562		if (server == source_p->from)
563		continue;
564
565	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
566	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
565	>	if (IsCapable(server, CAP_SVS))
566	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
567		source_p->servptr->id,
568		source_p->name, source_p->hopcount+1,
569		(unsigned long)source_p->tsinfo,
570		ubuf, source_p->username, source_p->host,
571		(MyClient(source_p) && IsIPSpoof(source_p)) ?
572	<	"0" : source_p->sockhost, source_p->id, source_p->info);
572	>	"0" : source_p->sockhost, source_p->id,
573	>	source_p->svid,
574	>	source_p->info);
575		else
576	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
576	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
577	>	source_p->servptr->id,
578		source_p->name, source_p->hopcount+1,
579		(unsigned long)source_p->tsinfo,
580		ubuf, source_p->username, source_p->host,
581	<	source_p->servptr->name, source_p->info);
581	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
582	>	"0" : source_p->sockhost, source_p->id, source_p->info);
583	>
584	>	if (!EmptyString(source_p->certfp))
585	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
586		}
587		}
588
#	Line 626 | Line 602 | valid_hostname(const char *hostname)
602
603		assert(p != NULL);
604
605	<	if (*p == '.' || *p == ':')
605	>	if (EmptyString(p) || *p == '.' || *p == ':')
606		return 0;
607
608		for (; *p; ++p)
609		if (!IsHostChar(*p))
610		return 0;
611
612	<	return 1;
612	>	return p - hostname <= HOSTLEN;
613		}
614
615		/* valid_username()
#	Line 648 | Line 624 | valid_hostname(const char *hostname)
624		* style of username
625		*/
626		int
627	<	valid_username(const char *username)
627	>	valid_username(const char *username, const int local)
628		{
629		int dots      = 0;
630		const char *p = username;
#	Line 658 | Line 634 | valid_username(const char *username)
634		if (*p == '~')
635		++p;
636
637	<	/* reject usernames that don't start with an alphanum
637	>	/*
638	>	* Reject usernames that don't start with an alphanum
639		* i.e. reject jokers who have '-@somehost' or '.@somehost'
640		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
641		*/
642		if (!IsAlNum(*p))
643		return 0;
644
645	<	while (*++p)
645	>	if (local)
646		{
647	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
647	>	while (*++p)
648		{
649	<	if (++dots > ConfigFileEntry.dots_in_ident)
650	<	return 0;
651	<	if (!IsUserChar(*(p + 1)))
649	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
650	>	{
651	>	if (++dots > ConfigFileEntry.dots_in_ident)
652	>	return 0;
653	>	if (!IsUserChar(*(p + 1)))
654	>	return 0;
655	>	}
656	>	else if (!IsUserChar(*p))
657		return 0;
658		}
659	<	else if (!IsUserChar(*p))
660	<	return 0;
659	>	}
660	>	else
661	>	{
662	>	while (*++p)
663	>	if (!IsUserChar(*p))
664	>	return 0;
665		}
666
667	<	return 1;
667	>	return  p - username <= USERLEN;;
668	>	}
669	>
670	>	/* clean_nick_name()
671	>	*
672	>	* input        - nickname
673	>	*              - whether it's a local nick (1) or remote (0)
674	>	* output       - none
675	>	* side effects - walks through the nickname, returning 0 if erroneous
676	>	*/
677	>	int
678	>	valid_nickname(const char *nickname, const int local)
679	>	{
680	>	const char *p = nickname;
681	>	assert(nickname && *nickname);
682	>
683	>	/* nicks can't start with a digit or - or be 0 length */
684	>	/* This closer duplicates behaviour of hybrid-6 */
685	>	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
686	>	return 0;
687	>
688	>	for (; *p; ++p)
689	>	if (!IsNickChar(*p))
690	>	return 0;
691	>
692	>	return p - nickname <= NICKLEN;
693		}
694
695		/* report_and_set_user_flags()
696		*
697		* inputs       - pointer to source_p
698	<	*              - pointer to aconf for this user
698	>	*              - pointer to conf for this user
699		* output       - NONE
700		* side effects - Report to user any special flags
701		*                they are getting, and set them.
702		*/
703		static void
704	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
704	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
705		{
706		/* If this user is being spoofed, tell them so */
707	<	if (IsConfDoSpoofIp(aconf))
708	<	{
698	<	sendto_one(source_p,
699	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
700	<	me.name, source_p->name);
701	<	}
707	>	if (IsConfDoSpoofIp(conf))
708	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
709
710		/* If this user is in the exception class, Set it "E lined" */
711	<	if (IsConfExemptKline(aconf))
711	>	if (IsConfExemptKline(conf))
712		{
713		SetExemptKline(source_p);
714	<	sendto_one(source_p,
708	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
709	<	me.name, source_p->name);
714	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
715		}
716
717	<	/* The else here is to make sure that G line exempt users
717	>	/*
718	>	* The else here is to make sure that G line exempt users
719		* do not get noticed twice.
720		*/
721	<	else if (IsConfExemptGline(aconf))
721	>	else if (IsConfExemptGline(conf))
722		{
723		SetExemptGline(source_p);
724	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
719	<	me.name, source_p->name);
724	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
725		}
726
727	<	if (IsConfExemptResv(aconf))
727	>	if (IsConfExemptResv(conf))
728		{
729		SetExemptResv(source_p);
730	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
726	<	me.name, source_p->name);
730	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
731		}
732
733		/* If this user is exempt from user limits set it "F lined" */
734	<	if (IsConfExemptLimits(aconf))
734	>	if (IsConfExemptLimits(conf))
735		{
736		SetExemptLimits(source_p);
737	<	sendto_one(source_p,
734	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
735	<	me.name,source_p->name);
737	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
738		}
739
740	<	/* If this user is exempt from idle time outs */
739	<	if (IsConfIdlelined(aconf))
740	<	{
741	<	SetIdlelined(source_p);
742	<	sendto_one(source_p,
743	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
744	<	me.name, source_p->name);
745	<	}
746	<
747	<	if (IsConfCanFlood(aconf))
740	>	if (IsConfCanFlood(conf))
741		{
742		SetCanFlood(source_p);
743	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
744	<	"protection, aren't you fearsome.",
752	<	me.name, source_p->name);
743	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
744	>	"protection, aren't you fearsome.");
745		}
746		}
747
756	–	/* change_simple_umode()
757	–	*
758	–	* this callback can be hooked to allow special handling of
759	–	* certain usermodes
760	–	*/
761	–	static void *
762	–	change_simple_umode(va_list args)
763	–	{
764	–	struct Client *client_p;
765	–	struct Client *source_p;
766	–	int what;
767	–	unsigned int flag;
768	–
769	–	client_p = va_arg(args, struct Client *);
770	–	source_p = va_arg(args, struct Client *);
771	–	what = va_arg(args, int);
772	–	flag = va_arg(args, unsigned int);
773	–
774	–	if (what == MODE_ADD)
775	–	source_p->umodes |= flag;
776	–	else
777	–	source_p->umodes &= ~flag;
778	–
779	–	return NULL;
780	–	}
781	–
748		/* set_user_mode()
749		*
750		* added 15/10/91 By Darren Reed.
751	<	* parv[0] - sender
751	>	* parv[0] - command
752		* parv[1] - username to change mode for
753		* parv[2] - modes to change
754		*/
755		void
756	<	set_user_mode(struct Client *client_p, struct Client *source_p,
791	<	int parc, char *parv[])
756	>	set_user_mode(struct Client *source_p, const int parc, char *parv[])
757		{
758		unsigned int flag, setflags;
759		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 797 | Line 762 | set_user_mode(struct Client *client_p, s
762
763		assert(!(parc < 2));
764
765	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
765	>	if ((target_p = find_person(source_p, parv[1])) == NULL)
766		{
767		if (MyConnect(source_p))
768	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
804	<	me.name, source_p->name, parv[1]);
768	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
769		return;
770		}
771
808	–	if (IsServer(source_p))
809	–	{
810	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
811	–	parv[1], source_p->name);
812	–	return;
813	–	}
814	–
772		if (source_p != target_p)
773		{
774	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
818	<	me.name, source_p->name);
774	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
775		return;
776		}
777
#	Line 824 | Line 780 | set_user_mode(struct Client *client_p, s
780		m = buf;
781		*m++ = '+';
782
783	<	for (i = 0; i < 128; i++)
784	<	if (source_p->umodes & user_modes[i])
783	>	for (i = 0; i < 128; ++i)
784	>	if (HasUMode(source_p, user_modes[i]))
785		*m++ = (char)i;
786		*m = '\0';
787
788	<	sendto_one(source_p, form_str(RPL_UMODEIS),
833	<	me.name, source_p->name, buf);
788	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
789		return;
790		}
791
837	–	execute_callback(entering_umode_cb, client_p, source_p);
838	–
792		/* find flags already set for user */
793		setflags = source_p->umodes;
794
795		/* parse mode change string(s) */
796	<	for (p = &parv[2]; p && *p; p++)
796	>	for (p = &parv[2]; p && *p; ++p)
797		{
798	<	for (m = *p; *m; m++)
798	>	for (m = *p; *m; ++m)
799		{
800		switch (*m)
801		{
#	Line 855 | Line 808 | set_user_mode(struct Client *client_p, s
808		case 'o':
809		if (what == MODE_ADD)
810		{
811	<	if (IsServer(client_p) && !IsOper(source_p))
811	>	if (!MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
812		{
813		++Count.oper;
814		SetOper(source_p);
#	Line 863 | Line 816 | set_user_mode(struct Client *client_p, s
816		}
817		else
818		{
819	<	/* Only decrement the oper counts if an oper to begin with
867	<	* found by Pat Szuta, Perly , perly@xnet.com
868	<	*/
869	<	if (!IsOper(source_p))
819	>	if (!HasUMode(source_p, UMODE_OPER))
820		break;
821
822		ClearOper(source_p);
#	Line 874 | Line 824 | set_user_mode(struct Client *client_p, s
824
825		if (MyConnect(source_p))
826		{
827	<	dlink_node *dm;
827	>	dlink_node *dm = NULL;
828
829	<	detach_conf(source_p, OPER_TYPE);
830	<	ClearOperFlags(source_p);
831	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
829	>	detach_conf(source_p, CONF_OPER);
830	>	ClrOFlag(source_p);
831	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
832
833		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
834		free_dlink_node(dm);
#	Line 887 | Line 837 | set_user_mode(struct Client *client_p, s
837
838		break;
839
840	<	/* we may not get these,
841	<	* but they shouldnt be in default
842	<	*/
843	<	case ' ' :
894	<	case '\n':
895	<	case '\r':
896	<	case '\t':
840	>	case 'S':  /* Only servers may set +S in a burst */
841	>	case 'W':  /* Only servers may set +W in a burst */
842	>	case 'r':  /* Only services may set +r */
843	>	case 'x':  /* Only services may set +x */
844		break;
845
846		default:
847		if ((flag = user_modes[(unsigned char)*m]))
848		{
849	<	if (MyConnect(source_p) && !IsOper(source_p) &&
849	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
850		(ConfigFileEntry.oper_only_umodes & flag))
904	–	{
851		badflag = 1;
906	–	}
852		else
853	<	execute_callback(umode_cb, client_p, source_p, what, flag);
854	<	}
855	<	else
856	<	{
857	<	if (MyConnect(source_p))
858	<	badflag = 1;
853	>	{
854	>	if (what == MODE_ADD)
855	>	AddUMode(source_p, flag);
856	>	else
857	>	DelUMode(source_p, flag);
858	>	}
859		}
860	+	else if (MyConnect(source_p))
861	+	badflag = 1;
862
863		break;
864		}
#	Line 919 | Line 866 | set_user_mode(struct Client *client_p, s
866		}
867
868		if (badflag)
869	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
923	<	me.name, source_p->name);
869	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
870
871	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
871	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
872	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
873		{
874	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
875	<	me.name, source_p->name);
929	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
874	>	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
875	>	DelUMode(source_p, UMODE_ADMIN);
876		}
877
878	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
933	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
934	<	{
935	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
936	<	me.name, source_p->name);
937	<	source_p->umodes &= ~UMODE_ADMIN;
938	<	}
939	<
940	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
878	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
879		++Count.invisi;
880	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
880	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
881		--Count.invisi;
882
883		/*
884		* compare new flags with old flags and send string which
885		* will cause servers to update correctly.
886		*/
887	<	send_umode_out(client_p, source_p, setflags);
887	>	send_umode_out(source_p, source_p, setflags);
888		}
889
890		/* send_umode()
#	Line 973 | Line 911 | send_umode(struct Client *client_p, stru
911		* build a string in umode_buf to represent the change in the user's
912		* mode between the new (source_p->umodes) and 'old'.
913		*/
914	<	for (i = 0; i < 128; i++)
914	>	for (i = 0; i < 128; ++i)
915		{
916		flag = user_modes[i];
917		if (!flag)
#	Line 982 | Line 920 | send_umode(struct Client *client_p, stru
920		if (MyClient(source_p) && !(flag & sendmask))
921		continue;
922
923	<	if ((flag & old) && !(source_p->umodes & flag))
923	>	if ((flag & old) && !HasUMode(source_p, flag))
924		{
925		if (what == MODE_DEL)
926		*m++ = (char)i;
#	Line 993 | Line 931 | send_umode(struct Client *client_p, stru
931		*m++ = (char)i;
932		}
933		}
934	<	else if (!(flag & old) && (source_p->umodes & flag))
934	>	else if (!(flag & old) && HasUMode(source_p, flag))
935		{
936		if (what == MODE_ADD)
937		*m++ = (char)i;
#	Line 1027 | Line 965 | send_umode_out(struct Client *client_p,
965		char buf[IRCD_BUFSIZE] = { '\0' };
966		dlink_node *ptr = NULL;
967
968	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1031	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
968	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
969
970		if (buf[0])
971	+	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
972	+	source_p->id, source_p->id, buf);
973	+
974	+	if (client_p && MyClient(client_p))
975	+	send_umode(client_p, source_p, old, 0xffffffff, buf);
976	+	}
977	+
978	+	void
979	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
980	+	{
981	+	dlink_node *ptr = NULL;
982	+
983	+	if (!strcmp(target_p->host, hostname))
984	+	return;
985	+
986	+	switch (what)
987	+	{
988	+	case MODE_ADD:
989	+	AddUMode(target_p, UMODE_HIDDENHOST);
990	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
991	+	break;
992	+	case MODE_DEL:
993	+	DelUMode(target_p, UMODE_HIDDENHOST);
994	+
995	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
996	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
997	+	break;
998	+	default: return;
999	+	}
1000	+
1001	+	if (ConfigFileEntry.cycle_on_host_change)
1002	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1003	+	target_p->name, target_p->username, target_p->host);
1004	+
1005	+	if (IsUserHostIp(target_p))
1006	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1007	+
1008	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1009	+
1010	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1011	+	SetUserHost(target_p);
1012	+
1013	+	if (MyClient(target_p))
1014	+	{
1015	+	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1016	+	clear_ban_cache_client(target_p);
1017	+	}
1018	+
1019	+	if (!ConfigFileEntry.cycle_on_host_change)
1020	+	return;
1021	+
1022	+	DLINK_FOREACH(ptr, target_p->channel.head)
1023		{
1024	<	DLINK_FOREACH(ptr, serv_list.head)
1024	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1025	>	char *p = modebuf;
1026	>	int len = 0;
1027	>	const struct Membership *ms = ptr->data;
1028	>
1029	>	if (has_member_flags(ms, CHFL_CHANOP))
1030		{
1031	<	struct Client *target_p = ptr->data;
1031	>	*p++ = 'o';
1032	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1033	>	}
1034
1035	<	if ((target_p != client_p) && (target_p != source_p))
1036	<	sendto_one(target_p, ":%s MODE %s :%s",
1037	<	ID_or_name(source_p, target_p),
1038	<	ID_or_name(source_p, target_p), buf);
1035	>	if (has_member_flags(ms, CHFL_HALFOP))
1036	>	{
1037	>	*p++ = 'h';
1038	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1039		}
1040	+
1041	+	if (has_member_flags(ms, CHFL_VOICE))
1042	+	{
1043	+	*p++ = 'v';
1044	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1045	+	}
1046	+
1047	+	*p = '\0';
1048	+
1049	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1050	+	target_p->name, target_p->username, target_p->host,
1051	+	ms->chptr->chname);
1052	+	if (nickbuf[0])
1053	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1054	+	target_p->servptr->name, ms->chptr->chname,
1055	+	modebuf, nickbuf);
1056	+
1057		}
1058
1059	<	if (client_p && MyClient(client_p))
1060	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
1059	>	if (target_p->away[0])
1060	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1061	>	":%s!%s@%s AWAY :%s",
1062	>	target_p->name, target_p->username,
1063	>	target_p->host, target_p->away);
1064		}
1065
1066		/* user_welcome()
#	Line 1063 | Line 1079 | user_welcome(struct Client *source_p)
1079		#endif
1080
1081		#ifdef HAVE_LIBCRYPTO
1082	<	if (source_p->localClient->fd.ssl != NULL)
1083	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1084	<	me.name, source_p->name,
1085	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1082	>	if (HasFlag(source_p, FLAGS_SSL))
1083	>	{
1084	>	AddUMode(source_p, UMODE_SSL);
1085	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1086	>	ssl_get_cipher(source_p->localClient->fd.ssl));
1087	>	}
1088		#endif
1089
1090	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1091	<	ServerInfo.network_name, source_p->name);
1092	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1093	<	get_listener_name(source_p->localClient->listener), ircd_version);
1094	<	sendto_one(source_p, form_str(RPL_CREATED),
1095	<	me.name, source_p->name, built_date);
1078	<	sendto_one(source_p, form_str(RPL_MYINFO),
1079	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1090	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1091	>	source_p->name);
1092	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1093	>	get_listener_name(source_p->localClient->listener), ircd_version);
1094	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1095	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1096		show_isupport(source_p);
1097
1098		if (source_p->id[0] != '\0')
1099	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1084	<	source_p->name, source_p->id);
1099	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1100
1101		show_lusers(source_p);
1102	<
1088	<	if (ConfigFileEntry.short_motd)
1089	<	{
1090	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1091	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1092	<	sendto_one(source_p,
1093	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1094	<	"read it", me.name, source_p->name);
1095	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1096	<	me.name, source_p->name, me.name);
1097	<	sendto_one(source_p, form_str(RPL_MOTD),
1098	<	me.name, source_p->name,
1099	<	"*** This is the short motd ***");
1100	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1101	<	me.name, source_p->name);
1102	<	}
1103	<	else
1104	<	send_message_file(source_p, &ConfigFileEntry.motd);
1102	>	motd_signon(source_p);
1103		}
1104
1105		/* check_xline()
#	Line 1113 | Line 1111 | user_welcome(struct Client *source_p)
1111		static int
1112		check_xline(struct Client *source_p)
1113		{
1114	<	struct ConfItem *conf = NULL;
1114	>	struct MaskItem *conf = NULL;
1115		const char *reason = NULL;
1116
1117	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1120	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1117	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1118		{
1119	<	struct MatchItem *reg = map_to_conf(conf);
1123	<
1124	<	++reg->count;
1119	>	++conf->count;
1120
1121	<	if (reg->reason != NULL)
1122	<	reason = reg->reason;
1121	>	if (conf->reason != NULL)
1122	>	reason = conf->reason;
1123		else
1124	<	reason = "No Reason";
1124	>	reason = CONF_NOREASON;
1125
1126	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1126	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1127		"X-line Rejecting [%s] [%s], user %s [%s]",
1128		source_p->info, reason,
1129		get_client_name(source_p, HIDE_IP),
1130		source_p->sockhost);
1131
1132		++ServerStats.is_ref;
1133	<	if (REJECT_HOLD_TIME > 0)
1139	<	{
1140	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1141	<	me.name, source_p->name);
1142	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1143	<	SetCaptured(source_p);
1144	<	}
1145	<	else
1146	<	exit_client(source_p, &me, "Bad user info");
1133	>	exit_client(source_p, "Bad user info");
1134		return 1;
1135		}
1136
#	Line 1154 | Line 1141 | check_xline(struct Client *source_p)
1141		*
1142		* inputs       - pointer to given client to oper
1143		* output       - NONE
1144	<	* side effects - Blindly opers up given source_p, using aconf info
1144	>	* side effects - Blindly opers up given source_p, using conf info
1145		*                all checks on passwords have already been done.
1146	<	*                This could also be used by rsa oper routines.
1146	>	*                This could also be used by rsa oper routines.
1147		*/
1148		void
1149		oper_up(struct Client *source_p)
1150		{
1151	<	unsigned int old = source_p->umodes;
1152	<	const char *operprivs = "";
1166	<	const struct AccessItem *oconf = NULL;
1151	>	const unsigned int old = source_p->umodes;
1152	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1153
1154		assert(source_p->localClient->confs.head);
1169	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1155
1156		++Count.oper;
1157		SetOper(source_p);
1158
1159	<	if (oconf->modes)
1160	<	source_p->umodes |= oconf->modes;
1159	>	if (conf->modes)
1160	>	AddUMode(source_p, conf->modes);
1161		else if (ConfigFileEntry.oper_umodes)
1162	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1178	<	else
1179	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1180	<	UMODE_WALLOP|UMODE_LOCOPS);
1162	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1163
1164	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1164	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1165		++Count.invisi;
1166	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1166	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1167		--Count.invisi;
1168
1169		assert(dlinkFind(&oper_list, source_p) == NULL);
1170		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1171
1172	<	operprivs = oper_privs_as_string(oconf->port);
1172	>	AddOFlag(source_p, conf->port);
1173
1174	<	SetOFlag(source_p, oconf->port);
1174	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1175	>	AddUMode(source_p, UMODE_ADMIN);
1176
1177	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1178	<	source_p->umodes |= UMODE_ADMIN;
1196	<	if (!IsOperN(source_p))
1197	<	source_p->umodes &= ~UMODE_NCHANGE;
1198	<
1199	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1200	<	source_p->name, source_p->username, source_p->host);
1177	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1178	>	get_oper_name(source_p));
1179		send_umode_out(source_p, source_p, old);
1180	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1203	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1204	<	me.name, source_p->name, operprivs);
1205	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1180	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1181		}
1182
1183		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1220 | Line 1195 | valid_sid(const char *sid)
1195
1196		/*
1197		* init_uid()
1198	<	*
1198	>	*
1199		* inputs       - NONE
1200		* output       - NONE
1201		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1230 | Line 1205 | valid_sid(const char *sid)
1205		void
1206		init_uid(void)
1207		{
1208	<	int i;
1208	>	unsigned int i;
1209
1210		memset(new_uid, 0, sizeof(new_uid));
1211
#	Line 1238 | Line 1213 | init_uid(void)
1213		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1214
1215		for (i = 0; i < IRC_MAXSID; ++i)
1216	<	if (new_uid[i] == '\0')
1216	>	if (new_uid[i] == '\0')
1217		new_uid[i] = 'A';
1218
1219		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1245	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1246	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1247	–	* -Dianora
1248	–	*/
1220		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1250	–
1251	–	entering_umode_cb = register_callback("entering_umode", NULL);
1252	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1221		}
1222
1223		/*
#	Line 1309 | Line 1277 | uid_get(void)
1277		void
1278		init_isupport(void)
1279		{
1312	–	isupportFile = init_MessageLine();
1313	–
1280		add_isupport("CALLERID", NULL, -1);
1281		add_isupport("CASEMAPPING", CASEMAP, -1);
1282		add_isupport("DEAF", "D", -1);
1283		add_isupport("KICKLEN", NULL, KICKLEN);
1284		add_isupport("MODES", NULL, MAXMODEPARAMS);
1319	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1285		#ifdef HALFOPS
1286		add_isupport("PREFIX", "(ohv)@%+", -1);
1287		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1324 | Line 1289 | init_isupport(void)
1289		add_isupport("PREFIX", "(ov)@+", -1);
1290		add_isupport("STATUSMSG", "@+", -1);
1291		#endif
1292	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1292	>	add_isupport("EXCEPTS", "e", -1);
1293	>	add_isupport("INVEX", "I", -1);
1294		}
1295
1296		/*
#	Line 1359 | Line 1325 | add_isupport(const char *name, const cha
1325		dlinkAddTail(support, &support->node, &support_list);
1326		}
1327
1328	<	DupString(support->name, name);
1328	>	support->name = xstrdup(name);
1329		if (options != NULL)
1330	<	DupString(support->options, options);
1330	>	support->options = xstrdup(options);
1331		support->number = n;
1332
1333		rebuild_isupport_message_line();
#	Line 1408 | Line 1374 | rebuild_isupport_message_line(void)
1374		{
1375		char isupportbuffer[IRCD_BUFSIZE];
1376		char *p = isupportbuffer;
1377	<	dlink_node *ptr = NULL;
1377	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1378		int n = 0;
1379		int tokens = 0;
1380		size_t len = 0;
1381	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1381	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1382
1383	<	destroy_MessageLine(isupportFile);
1383	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1384	>	{
1385	>	dlinkDelete(ptr, &support_list_lines);
1386	>	MyFree(ptr->data);
1387	>	free_dlink_node(ptr);
1388	>	}
1389
1390		DLINK_FOREACH(ptr, support_list.head)
1391		{
1392		struct Isupport *support = ptr->data;
1393
1394	<	p += (n = ircsprintf(p, "%s", support->name));
1394	>	p += (n = sprintf(p, "%s", support->name));
1395		len += n;
1396
1397		if (support->options != NULL)
1398		{
1399	<	p += (n = ircsprintf(p, "=%s", support->options));
1399	>	p += (n = sprintf(p, "=%s", support->options));
1400		len += n;
1401		}
1402
1403		if (support->number > 0)
1404		{
1405	<	p += (n = ircsprintf(p, "=%d", support->number));
1405	>	p += (n = sprintf(p, "=%d", support->number));
1406		len += n;
1407		}
1408
#	Line 1444 | Line 1415 | rebuild_isupport_message_line(void)
1415		if (*--p == ' ')
1416		*p = '\0';
1417
1418	<	addto_MessageLine(isupportFile, isupportbuffer);
1418	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1419		p = isupportbuffer;
1420		len = 0;
1421		n = tokens = 0;
#	Line 1455 | Line 1426 | rebuild_isupport_message_line(void)
1426		{
1427		if (*--p == ' ')
1428		*p = '\0';
1429	<	addto_MessageLine(isupportFile, isupportbuffer);
1429	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1430		}
1431		}

Diff Legend

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