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 1156 by michael, Tue Aug 9 20:29:20 2011 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 3156 by michael, Fri Mar 14 19:57:38 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 106 | 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 134 | 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 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	<	}
187	<	else
188	<	{
189	<	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));
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	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
177	<	(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 309 | 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;
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		/*
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);
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		}
500
501	+	/*
502	+	* If the nick has been introduced by a services server,
503	+	* make it a service as well.
504	+	*/
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)
510		Count.max_tot = Count.total;
#	Line 551 | 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 566 | 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 575 | 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 588 | 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",
561	>	if (IsCapable(server, CAP_SVS))
562	>	sendto_one(server, ":%s UID %s %d %lu %s %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);
568	>	"0" : source_p->sockhost, source_p->id,
569	>	source_p->svid,
570	>	source_p->info);
571		else
572	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
572	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
573	>	source_p->servptr->id,
574		source_p->name, source_p->hopcount+1,
575		(unsigned long)source_p->tsinfo,
576		ubuf, source_p->username, source_p->host,
577	<	source_p->servptr->name, source_p->info);
577	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
578	>	"0" : source_p->sockhost, source_p->id, source_p->info);
579	>
580	>	if (!EmptyString(source_p->certfp))
581	>	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
582		}
583		}
584
#	Line 621 | Line 598 | valid_hostname(const char *hostname)
598
599		assert(p != NULL);
600
601	<	if (*p == '.' || *p == ':')
601	>	if (EmptyString(p) || *p == '.' || *p == ':')
602		return 0;
603
604		for (; *p; ++p)
605		if (!IsHostChar(*p))
606		return 0;
607
608	<	return 1;
608	>	return p - hostname <= HOSTLEN;
609		}
610
611		/* valid_username()
#	Line 643 | Line 620 | valid_hostname(const char *hostname)
620		* style of username
621		*/
622		int
623	<	valid_username(const char *username)
623	>	valid_username(const char *username, const int local)
624		{
625		int dots      = 0;
626		const char *p = username;
#	Line 653 | Line 630 | valid_username(const char *username)
630		if (*p == '~')
631		++p;
632
633	<	/* reject usernames that don't start with an alphanum
633	>	/*
634	>	* Reject usernames that don't start with an alphanum
635		* i.e. reject jokers who have '-@somehost' or '.@somehost'
636		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
637		*/
638		if (!IsAlNum(*p))
639		return 0;
640
641	<	while (*++p)
641	>	if (local)
642		{
643	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
643	>	while (*++p)
644		{
645	<	if (++dots > ConfigFileEntry.dots_in_ident)
646	<	return 0;
647	<	if (!IsUserChar(*(p + 1)))
645	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
646	>	{
647	>	if (++dots > ConfigFileEntry.dots_in_ident)
648	>	return 0;
649	>	if (!IsUserChar(*(p + 1)))
650	>	return 0;
651	>	}
652	>	else if (!IsUserChar(*p))
653		return 0;
654		}
672	–	else if (!IsUserChar(*p))
673	–	return 0;
655		}
656	+	else
657	+	{
658	+	while (*++p)
659	+	if (!IsUserChar(*p))
660	+	return 0;
661	+	}
662	+
663	+	return  p - username <= USERLEN;;
664	+	}
665	+
666	+	/* clean_nick_name()
667	+	*
668	+	* input        - nickname
669	+	*              - whether it's a local nick (1) or remote (0)
670	+	* output       - none
671	+	* side effects - walks through the nickname, returning 0 if erroneous
672	+	*/
673	+	int
674	+	valid_nickname(const char *nickname, const int local)
675	+	{
676	+	const char *p = nickname;
677	+	assert(nickname && *nickname);
678	+
679	+	/* nicks can't start with a digit or - or be 0 length */
680	+	/* This closer duplicates behaviour of hybrid-6 */
681	+	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
682	+	return 0;
683	+
684	+	for (; *p; ++p)
685	+	if (!IsNickChar(*p))
686	+	return 0;
687
688	<	return 1;
688	>	return p - nickname <= NICKLEN;
689		}
690
691		/* report_and_set_user_flags()
692		*
693		* inputs       - pointer to source_p
694	<	*              - pointer to aconf for this user
694	>	*              - pointer to conf for this user
695		* output       - NONE
696		* side effects - Report to user any special flags
697		*                they are getting, and set them.
698		*/
699		static void
700	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
700	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
701		{
702		/* If this user is being spoofed, tell them so */
703	<	if (IsConfDoSpoofIp(aconf))
704	<	{
693	<	sendto_one(source_p,
694	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
695	<	me.name, source_p->name);
696	<	}
703	>	if (IsConfDoSpoofIp(conf))
704	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
705
706		/* If this user is in the exception class, Set it "E lined" */
707	<	if (IsConfExemptKline(aconf))
707	>	if (IsConfExemptKline(conf))
708		{
709		SetExemptKline(source_p);
710	<	sendto_one(source_p,
703	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
704	<	me.name, source_p->name);
710	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
711		}
712
713	<	/* The else here is to make sure that G line exempt users
713	>	/*
714	>	* The else here is to make sure that G line exempt users
715		* do not get noticed twice.
716		*/
717	<	else if (IsConfExemptGline(aconf))
717	>	else if (IsConfExemptGline(conf))
718		{
719		SetExemptGline(source_p);
720	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
714	<	me.name, source_p->name);
720	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
721		}
722
723	<	if (IsConfExemptResv(aconf))
723	>	if (IsConfExemptResv(conf))
724		{
725		SetExemptResv(source_p);
726	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
721	<	me.name, source_p->name);
726	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
727		}
728
729		/* If this user is exempt from user limits set it "F lined" */
730	<	if (IsConfExemptLimits(aconf))
730	>	if (IsConfExemptLimits(conf))
731		{
732		SetExemptLimits(source_p);
733	<	sendto_one(source_p,
729	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
730	<	me.name,source_p->name);
733	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
734		}
735
736	<	/* If this user is exempt from idle time outs */
734	<	if (IsConfIdlelined(aconf))
735	<	{
736	<	SetIdlelined(source_p);
737	<	sendto_one(source_p,
738	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
739	<	me.name, source_p->name);
740	<	}
741	<
742	<	if (IsConfCanFlood(aconf))
736	>	if (IsConfCanFlood(conf))
737		{
738		SetCanFlood(source_p);
739	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
740	<	"protection, aren't you fearsome.",
747	<	me.name, source_p->name);
739	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
740	>	"protection, aren't you fearsome.");
741		}
742		}
743
751	–	/* change_simple_umode()
752	–	*
753	–	* this callback can be hooked to allow special handling of
754	–	* certain usermodes
755	–	*/
756	–	static void *
757	–	change_simple_umode(va_list args)
758	–	{
759	–	struct Client *client_p;
760	–	struct Client *source_p;
761	–	int what;
762	–	unsigned int flag;
763	–
764	–	client_p = va_arg(args, struct Client *);
765	–	source_p = va_arg(args, struct Client *);
766	–	what = va_arg(args, int);
767	–	flag = va_arg(args, unsigned int);
768	–
769	–	if (what == MODE_ADD)
770	–	source_p->umodes |= flag;
771	–	else
772	–	source_p->umodes &= ~flag;
773	–
774	–	return NULL;
775	–	}
776	–
744		/* set_user_mode()
745		*
746		* added 15/10/91 By Darren Reed.
747	<	* parv[0] - sender
747	>	* parv[0] - command
748		* parv[1] - username to change mode for
749		* parv[2] - modes to change
750		*/
751		void
752	<	set_user_mode(struct Client *client_p, struct Client *source_p,
786	<	int parc, char *parv[])
752	>	set_user_mode(struct Client *source_p, const int parc, char *parv[])
753		{
754		unsigned int flag, setflags;
755		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 792 | Line 758 | set_user_mode(struct Client *client_p, s
758
759		assert(!(parc < 2));
760
761	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
761	>	if ((target_p = find_person(source_p, parv[1])) == NULL)
762		{
763		if (MyConnect(source_p))
764	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
799	<	me.name, source_p->name, parv[1]);
764	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
765		return;
766		}
767
803	–	if (IsServer(source_p))
804	–	{
805	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
806	–	parv[1], source_p->name);
807	–	return;
808	–	}
809	–
768		if (source_p != target_p)
769		{
770	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
813	<	me.name, source_p->name);
770	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
771		return;
772		}
773
#	Line 819 | Line 776 | set_user_mode(struct Client *client_p, s
776		m = buf;
777		*m++ = '+';
778
779	<	for (i = 0; i < 128; i++)
780	<	if (source_p->umodes & user_modes[i])
779	>	for (i = 0; i < 128; ++i)
780	>	if (HasUMode(source_p, user_modes[i]))
781		*m++ = (char)i;
782		*m = '\0';
783
784	<	sendto_one(source_p, form_str(RPL_UMODEIS),
828	<	me.name, source_p->name, buf);
784	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
785		return;
786		}
787
832	–	execute_callback(entering_umode_cb, client_p, source_p);
833	–
788		/* find flags already set for user */
789		setflags = source_p->umodes;
790
791		/* parse mode change string(s) */
792	<	for (p = &parv[2]; p && *p; p++)
792	>	for (p = &parv[2]; p && *p; ++p)
793		{
794	<	for (m = *p; *m; m++)
794	>	for (m = *p; *m; ++m)
795		{
796		switch (*m)
797		{
#	Line 850 | Line 804 | set_user_mode(struct Client *client_p, s
804		case 'o':
805		if (what == MODE_ADD)
806		{
807	<	if (IsServer(client_p) && !IsOper(source_p))
807	>	if (IsServer(source_p->from) && !HasUMode(source_p, UMODE_OPER))
808		{
809		++Count.oper;
810		SetOper(source_p);
#	Line 858 | Line 812 | set_user_mode(struct Client *client_p, s
812		}
813		else
814		{
815	<	/* Only decrement the oper counts if an oper to begin with
862	<	* found by Pat Szuta, Perly , perly@xnet.com
863	<	*/
864	<	if (!IsOper(source_p))
815	>	if (!HasUMode(source_p, UMODE_OPER))
816		break;
817
818		ClearOper(source_p);
#	Line 869 | Line 820 | set_user_mode(struct Client *client_p, s
820
821		if (MyConnect(source_p))
822		{
823	<	dlink_node *dm;
823	>	dlink_node *dm = NULL;
824
825	<	detach_conf(source_p, OPER_TYPE);
826	<	ClearOperFlags(source_p);
827	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
825	>	detach_conf(source_p, CONF_OPER);
826	>	ClrOFlag(source_p);
827	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
828
829		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
830		free_dlink_node(dm);
#	Line 882 | Line 833 | set_user_mode(struct Client *client_p, s
833
834		break;
835
836	<	/* we may not get these,
837	<	* but they shouldnt be in default
838	<	*/
839	<	case ' ' :
889	<	case '\n':
890	<	case '\r':
891	<	case '\t':
836	>	case 'S':  /* Only servers may set +S in a burst */
837	>	case 'W':  /* Only servers may set +W in a burst */
838	>	case 'r':  /* Only services may set +r */
839	>	case 'x':  /* Only services may set +x */
840		break;
841
842		default:
843		if ((flag = user_modes[(unsigned char)*m]))
844		{
845	<	if (MyConnect(source_p) && !IsOper(source_p) &&
845	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
846		(ConfigFileEntry.oper_only_umodes & flag))
899	–	{
847		badflag = 1;
901	–	}
848		else
849	<	execute_callback(umode_cb, client_p, source_p, what, flag);
850	<	}
851	<	else
852	<	{
853	<	if (MyConnect(source_p))
854	<	badflag = 1;
849	>	{
850	>	if (what == MODE_ADD)
851	>	AddUMode(source_p, flag);
852	>	else
853	>	DelUMode(source_p, flag);
854	>	}
855		}
856	+	else if (MyConnect(source_p))
857	+	badflag = 1;
858
859		break;
860		}
#	Line 914 | Line 862 | set_user_mode(struct Client *client_p, s
862		}
863
864		if (badflag)
865	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
918	<	me.name, source_p->name);
865	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
866
867	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
867	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
868	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
869		{
870	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
871	<	me.name, source_p->name);
924	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
870	>	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
871	>	DelUMode(source_p, UMODE_ADMIN);
872		}
873
874	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
928	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
929	<	{
930	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
931	<	me.name, source_p->name);
932	<	source_p->umodes &= ~UMODE_ADMIN;
933	<	}
934	<
935	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
874	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
875		++Count.invisi;
876	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
876	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
877		--Count.invisi;
878
879		/*
880		* compare new flags with old flags and send string which
881		* will cause servers to update correctly.
882		*/
883	<	send_umode_out(client_p, source_p, setflags);
883	>	send_umode_out(source_p, source_p, setflags);
884		}
885
886		/* send_umode()
#	Line 968 | Line 907 | send_umode(struct Client *client_p, stru
907		* build a string in umode_buf to represent the change in the user's
908		* mode between the new (source_p->umodes) and 'old'.
909		*/
910	<	for (i = 0; i < 128; i++)
910	>	for (i = 0; i < 128; ++i)
911		{
912		flag = user_modes[i];
913		if (!flag)
#	Line 977 | Line 916 | send_umode(struct Client *client_p, stru
916		if (MyClient(source_p) && !(flag & sendmask))
917		continue;
918
919	<	if ((flag & old) && !(source_p->umodes & flag))
919	>	if ((flag & old) && !HasUMode(source_p, flag))
920		{
921		if (what == MODE_DEL)
922		*m++ = (char)i;
#	Line 988 | Line 927 | send_umode(struct Client *client_p, stru
927		*m++ = (char)i;
928		}
929		}
930	<	else if (!(flag & old) && (source_p->umodes & flag))
930	>	else if (!(flag & old) && HasUMode(source_p, flag))
931		{
932		if (what == MODE_ADD)
933		*m++ = (char)i;
#	Line 1022 | Line 961 | send_umode_out(struct Client *client_p,
961		char buf[IRCD_BUFSIZE] = { '\0' };
962		dlink_node *ptr = NULL;
963
964	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1026	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
964	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
965
966		if (buf[0])
967	+	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
968	+	ID(source_p), ID(source_p), buf);
969	+
970	+	if (client_p && MyClient(client_p))
971	+	send_umode(client_p, source_p, old, 0xffffffff, buf);
972	+	}
973	+
974	+	void
975	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
976	+	{
977	+	dlink_node *ptr = NULL;
978	+
979	+	if (!strcmp(target_p->host, hostname))
980	+	return;
981	+
982	+	switch (what)
983	+	{
984	+	case MODE_ADD:
985	+	AddUMode(target_p, UMODE_HIDDENHOST);
986	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
987	+	break;
988	+	case MODE_DEL:
989	+	DelUMode(target_p, UMODE_HIDDENHOST);
990	+
991	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
992	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
993	+	break;
994	+	default: return;
995	+	}
996	+
997	+	if (ConfigFileEntry.cycle_on_host_change)
998	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
999	+	target_p->name, target_p->username, target_p->host);
1000	+
1001	+	if (IsUserHostIp(target_p))
1002	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1003	+
1004	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1005	+
1006	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1007	+	SetUserHost(target_p);
1008	+
1009	+	if (MyClient(target_p))
1010		{
1011	<	DLINK_FOREACH(ptr, serv_list.head)
1011	>	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1012	>	clear_ban_cache_client(target_p);
1013	>	}
1014	>
1015	>	if (!ConfigFileEntry.cycle_on_host_change)
1016	>	return;
1017	>
1018	>	DLINK_FOREACH(ptr, target_p->channel.head)
1019	>	{
1020	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1021	>	char *p = modebuf;
1022	>	int len = 0;
1023	>	const struct Membership *ms = ptr->data;
1024	>
1025	>	if (has_member_flags(ms, CHFL_CHANOP))
1026	>	{
1027	>	*p++ = 'o';
1028	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1029	>	}
1030	>
1031	>	if (has_member_flags(ms, CHFL_HALFOP))
1032		{
1033	<	struct Client *target_p = ptr->data;
1033	>	*p++ = 'h';
1034	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1035	>	}
1036
1037	<	if ((target_p != client_p) && (target_p != source_p))
1038	<	sendto_one(target_p, ":%s MODE %s :%s",
1039	<	ID_or_name(source_p, target_p),
1040	<	ID_or_name(source_p, target_p), buf);
1037	>	if (has_member_flags(ms, CHFL_VOICE))
1038	>	{
1039	>	*p++ = 'v';
1040	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1041		}
1042	+
1043	+	*p = '\0';
1044	+
1045	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1046	+	target_p->name, target_p->username, target_p->host,
1047	+	ms->chptr->chname);
1048	+	if (nickbuf[0])
1049	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1050	+	target_p->servptr->name, ms->chptr->chname,
1051	+	modebuf, nickbuf);
1052	+
1053		}
1054
1055	<	if (client_p && MyClient(client_p))
1056	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
1055	>	if (target_p->away[0])
1056	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1057	>	":%s!%s@%s AWAY :%s",
1058	>	target_p->name, target_p->username,
1059	>	target_p->host, target_p->away);
1060		}
1061
1062		/* user_welcome()
#	Line 1058 | Line 1075 | user_welcome(struct Client *source_p)
1075		#endif
1076
1077		#ifdef HAVE_LIBCRYPTO
1078	<	if (source_p->localClient->fd.ssl != NULL)
1079	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1080	<	me.name, source_p->name,
1081	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1078	>	if (HasFlag(source_p, FLAGS_SSL))
1079	>	{
1080	>	AddUMode(source_p, UMODE_SSL);
1081	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1082	>	ssl_get_cipher(source_p->localClient->fd.ssl));
1083	>	}
1084		#endif
1085
1086	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1087	<	ServerInfo.network_name, source_p->name);
1088	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1089	<	get_listener_name(source_p->localClient->listener), ircd_version);
1090	<	sendto_one(source_p, form_str(RPL_CREATED),
1091	<	me.name, source_p->name, built_date);
1073	<	sendto_one(source_p, form_str(RPL_MYINFO),
1074	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1086	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1087	>	source_p->name);
1088	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1089	>	get_listener_name(source_p->localClient->listener), ircd_version);
1090	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1091	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1092		show_isupport(source_p);
1093
1094		if (source_p->id[0] != '\0')
1095	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1079	<	source_p->name, source_p->id);
1095	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1096
1097		show_lusers(source_p);
1098	<
1083	<	if (ConfigFileEntry.short_motd)
1084	<	{
1085	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1086	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1087	<	sendto_one(source_p,
1088	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1089	<	"read it", me.name, source_p->name);
1090	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1091	<	me.name, source_p->name, me.name);
1092	<	sendto_one(source_p, form_str(RPL_MOTD),
1093	<	me.name, source_p->name,
1094	<	"*** This is the short motd ***");
1095	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1096	<	me.name, source_p->name);
1097	<	}
1098	<	else
1099	<	send_message_file(source_p, &ConfigFileEntry.motd);
1098	>	motd_signon(source_p);
1099		}
1100
1101		/* check_xline()
#	Line 1108 | Line 1107 | user_welcome(struct Client *source_p)
1107		static int
1108		check_xline(struct Client *source_p)
1109		{
1110	<	struct ConfItem *conf = NULL;
1110	>	struct MaskItem *conf = NULL;
1111		const char *reason = NULL;
1112
1113	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1115	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1113	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1114		{
1115	<	struct MatchItem *reg = map_to_conf(conf);
1118	<
1119	<	++reg->count;
1115	>	++conf->count;
1116
1117	<	if (reg->reason != NULL)
1118	<	reason = reg->reason;
1117	>	if (conf->reason != NULL)
1118	>	reason = conf->reason;
1119		else
1120		reason = "No Reason";
1121
1122	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1122	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1123		"X-line Rejecting [%s] [%s], user %s [%s]",
1124		source_p->info, reason,
1125		get_client_name(source_p, HIDE_IP),
1126		source_p->sockhost);
1127
1128		++ServerStats.is_ref;
1129	<	if (REJECT_HOLD_TIME > 0)
1134	<	{
1135	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1136	<	me.name, source_p->name);
1137	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1138	<	SetCaptured(source_p);
1139	<	}
1140	<	else
1141	<	exit_client(source_p, &me, "Bad user info");
1129	>	exit_client(source_p, &me, "Bad user info");
1130		return 1;
1131		}
1132
#	Line 1149 | Line 1137 | check_xline(struct Client *source_p)
1137		*
1138		* inputs       - pointer to given client to oper
1139		* output       - NONE
1140	<	* side effects - Blindly opers up given source_p, using aconf info
1140	>	* side effects - Blindly opers up given source_p, using conf info
1141		*                all checks on passwords have already been done.
1142	<	*                This could also be used by rsa oper routines.
1142	>	*                This could also be used by rsa oper routines.
1143		*/
1144		void
1145		oper_up(struct Client *source_p)
1146		{
1147	<	unsigned int old = source_p->umodes;
1148	<	const char *operprivs = "";
1161	<	const struct AccessItem *oconf = NULL;
1147	>	const unsigned int old = source_p->umodes;
1148	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1149
1150		assert(source_p->localClient->confs.head);
1164	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1151
1152		++Count.oper;
1153		SetOper(source_p);
1154
1155	<	if (oconf->modes)
1156	<	source_p->umodes |= oconf->modes;
1155	>	if (conf->modes)
1156	>	AddUMode(source_p, conf->modes);
1157		else if (ConfigFileEntry.oper_umodes)
1158	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1173	<	else
1174	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1175	<	UMODE_WALLOP|UMODE_LOCOPS);
1158	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1159
1160	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1160	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1161		++Count.invisi;
1162	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1162	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1163		--Count.invisi;
1164
1165		assert(dlinkFind(&oper_list, source_p) == NULL);
1166		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1167
1168	<	operprivs = oper_privs_as_string(oconf->port);
1168	>	AddOFlag(source_p, conf->port);
1169
1170	<	SetOFlag(source_p, oconf->port);
1170	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1171	>	AddUMode(source_p, UMODE_ADMIN);
1172
1173	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1174	<	source_p->umodes |= UMODE_ADMIN;
1191	<	if (!IsOperN(source_p))
1192	<	source_p->umodes &= ~UMODE_NCHANGE;
1193	<
1194	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1195	<	source_p->name, source_p->username, source_p->host);
1173	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1174	>	get_oper_name(source_p));
1175		send_umode_out(source_p, source_p, old);
1176	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1198	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1199	<	me.name, source_p->name, operprivs);
1200	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1176	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1177		}
1178
1179		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1215 | Line 1191 | valid_sid(const char *sid)
1191
1192		/*
1193		* init_uid()
1194	<	*
1194	>	*
1195		* inputs       - NONE
1196		* output       - NONE
1197		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1225 | Line 1201 | valid_sid(const char *sid)
1201		void
1202		init_uid(void)
1203		{
1204	<	int i;
1204	>	unsigned int i;
1205
1206		memset(new_uid, 0, sizeof(new_uid));
1207
#	Line 1233 | Line 1209 | init_uid(void)
1209		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1210
1211		for (i = 0; i < IRC_MAXSID; ++i)
1212	<	if (new_uid[i] == '\0')
1212	>	if (new_uid[i] == '\0')
1213		new_uid[i] = 'A';
1214
1215		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1240	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1241	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1242	–	* -Dianora
1243	–	*/
1216		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1245	–
1246	–	entering_umode_cb = register_callback("entering_umode", NULL);
1247	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1217		}
1218
1219		/*
#	Line 1304 | Line 1273 | uid_get(void)
1273		void
1274		init_isupport(void)
1275		{
1307	–	isupportFile = init_MessageLine();
1308	–
1276		add_isupport("CALLERID", NULL, -1);
1277		add_isupport("CASEMAPPING", CASEMAP, -1);
1278		add_isupport("DEAF", "D", -1);
1279		add_isupport("KICKLEN", NULL, KICKLEN);
1280		add_isupport("MODES", NULL, MAXMODEPARAMS);
1314	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1281		#ifdef HALFOPS
1282		add_isupport("PREFIX", "(ohv)@%+", -1);
1283		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1319 | Line 1285 | init_isupport(void)
1285		add_isupport("PREFIX", "(ov)@+", -1);
1286		add_isupport("STATUSMSG", "@+", -1);
1287		#endif
1288	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1288	>	add_isupport("EXCEPTS", "e", -1);
1289	>	add_isupport("INVEX", "I", -1);
1290		}
1291
1292		/*
#	Line 1354 | Line 1321 | add_isupport(const char *name, const cha
1321		dlinkAddTail(support, &support->node, &support_list);
1322		}
1323
1324	<	DupString(support->name, name);
1324	>	support->name = xstrdup(name);
1325		if (options != NULL)
1326	<	DupString(support->options, options);
1326	>	support->options = xstrdup(options);
1327		support->number = n;
1328
1329		rebuild_isupport_message_line();
#	Line 1403 | Line 1370 | rebuild_isupport_message_line(void)
1370		{
1371		char isupportbuffer[IRCD_BUFSIZE];
1372		char *p = isupportbuffer;
1373	<	dlink_node *ptr = NULL;
1373	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1374		int n = 0;
1375		int tokens = 0;
1376		size_t len = 0;
1377	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1377	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1378
1379	<	destroy_MessageLine(isupportFile);
1379	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1380	>	{
1381	>	dlinkDelete(ptr, &support_list_lines);
1382	>	MyFree(ptr->data);
1383	>	free_dlink_node(ptr);
1384	>	}
1385
1386		DLINK_FOREACH(ptr, support_list.head)
1387		{
1388		struct Isupport *support = ptr->data;
1389
1390	<	p += (n = ircsprintf(p, "%s", support->name));
1390	>	p += (n = sprintf(p, "%s", support->name));
1391		len += n;
1392
1393		if (support->options != NULL)
1394		{
1395	<	p += (n = ircsprintf(p, "=%s", support->options));
1395	>	p += (n = sprintf(p, "=%s", support->options));
1396		len += n;
1397		}
1398
1399		if (support->number > 0)
1400		{
1401	<	p += (n = ircsprintf(p, "=%d", support->number));
1401	>	p += (n = sprintf(p, "=%d", support->number));
1402		len += n;
1403		}
1404
#	Line 1439 | Line 1411 | rebuild_isupport_message_line(void)
1411		if (*--p == ' ')
1412		*p = '\0';
1413
1414	<	addto_MessageLine(isupportFile, isupportbuffer);
1414	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1415		p = isupportbuffer;
1416		len = 0;
1417		n = tokens = 0;
#	Line 1450 | Line 1422 | rebuild_isupport_message_line(void)
1422		{
1423		if (*--p == ' ')
1424		*p = '\0';
1425	<	addto_MessageLine(isupportFile, isupportbuffer);
1425	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1426		}
1427		}

Diff Legend

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