ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_user.c (file contents), Revision 1176 by michael, Sun Aug 14 11:24:24 2011 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 3109 by michael, Thu Mar 6 19:25:12 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"
34		#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
37		#include "s_bsd.h"
38		#include "ircd.h"
39		#include "listener.h"
40		#include "motd.h"
41		#include "numeric.h"
42	<	#include "s_conf.h"
43	<	#include "s_log.h"
42	>	#include "conf.h"
43	>	#include "log.h"
44		#include "s_serv.h"
45		#include "send.h"
46		#include "supported.h"
#	Line 51 | Line 51
51		#include "userhost.h"
52		#include "hook.h"
53		#include "s_misc.h"
54	<	#include "msg.h"
54	>	#include "parse.h"
55		#include "watch.h"
56
57	–
58	–	struct Callback *entering_umode_cb = NULL;
59	–	struct Callback *umode_cb = NULL;
60	–
57		static char umode_buffer[IRCD_BUFSIZE];
58
59		static void user_welcome(struct Client *);
60	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
60	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
61		static int check_xline(struct Client *);
62		static void introduce_client(struct Client *);
63		static const char *uid_get(void);
#	Line 70 | Line 66 | static const char *uid_get(void);
66		* used with init_isupport, add_isupport, delete_isupport
67		*/
68
69	<	struct Isupport
69	>	struct Isupport
70		{
71		dlink_node node;
72		char *name;
#	Line 78 | Line 74 | struct Isupport
74		int number;
75		};
76
77	<	static dlink_list support_list = { NULL, NULL, 0 };
78	<	MessageFile *isupportFile;
77	>	static dlink_list support_list;
78	>	static dlink_list support_list_lines;
79
80		/* memory is cheap. map 0-255 to equivalent mode */
81	<	unsigned int user_modes[256] =
81	>	const unsigned int user_modes[256] =
82		{
83		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
84		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 91 | Line 87 | unsigned int user_modes[256] =
87		0,                  /* @ */
88		0,                  /* A */
89		0,                  /* B */
90	<	UMODE_CCONN_FULL,   /* C */
90	>	0,                  /* C */
91		UMODE_DEAF,         /* D */
92		0,                  /* E */
93	<	0,                  /* F */
93	>	UMODE_FARCONNECT,   /* F */
94		UMODE_SOFTCALLERID, /* G */
95	<	0,                  /* H */
95	>	UMODE_HIDDEN,       /* H */
96		0,                  /* I */
97		0,                  /* J */
98		0,                  /* K */
#	Line 107 | Line 103 | unsigned int user_modes[256] =
103		0,                  /* P */
104		0,                  /* Q */
105		UMODE_REGONLY,      /* R */
106	<	0,                  /* S */
106	>	UMODE_SSL,          /* S */
107		0,                  /* T */
108		0,                  /* U */
109		0,                  /* V */
110	<	0,                  /* W */
110	>	UMODE_WEBIRC,       /* W */
111		0,                  /* X */
112		0,                  /* Y */
113		0,                  /* Z 0x5A */
114	<	0, 0, 0, 0, 0,      /* 0x5F   */
114	>	0, 0, 0, 0, 0,      /* 0x5F   */
115		0,                  /* 0x60   */
116		UMODE_ADMIN,        /* a */
117		UMODE_BOTS,         /* b */
118		UMODE_CCONN,        /* c */
119		UMODE_DEBUG,        /* d */
120	<	0,                  /* e */
120	>	UMODE_EXTERNAL,     /* e */
121		UMODE_FULL,         /* f */
122		UMODE_CALLERID,     /* g */
123		0,                  /* h */
#	Line 140 | Line 136 | unsigned int user_modes[256] =
136		UMODE_UNAUTH,       /* u */
137		0,                  /* v */
138		UMODE_WALLOP,       /* w */
139	<	UMODE_EXTERNAL,     /* x */
139	>	UMODE_HIDDENHOST,   /* x */
140		UMODE_SPY,          /* y */
141		UMODE_OPERWALL,     /* z      0x7A */
142		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 175 | Line 171 | assemble_umode_buffer(void)
171		* side effects - display to client user counts etc.
172		*/
173		void
174	<	show_lusers(struct Client *source_p)
174	>	show_lusers(struct Client *source_p)
175		{
176	<	const char *from, *to;
177	<
178	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
183	<	{
184	<	from = me.id;
185	<	to = source_p->id;
186	<	}
176	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
177	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
178	>	Count.invisi, dlink_list_length(&global_serv_list));
179		else
180	<	{
181	<	from = me.name;
190	<	to = source_p->name;
191	<	}
192	<
193	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
194	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
195	<	from, to, (Count.total-Count.invisi),
196	<	Count.invisi, dlink_list_length(&global_serv_list));
197	<	else
198	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
199	<	(Count.total-Count.invisi), Count.invisi, 1);
180	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
181	>	(Count.total-Count.invisi), Count.invisi, 1);
182
183		if (Count.oper > 0)
184	<	sendto_one(source_p, form_str(RPL_LUSEROP),
203	<	from, to, Count.oper);
184	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
185
186		if (dlink_list_length(&unknown_list) > 0)
187	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
207	<	from, to, dlink_list_length(&unknown_list));
187	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
188
189		if (dlink_list_length(&global_channel_list) > 0)
190	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
211	<	from, to, dlink_list_length(&global_channel_list));
190	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
191
192	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
192	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
193		{
194	<	sendto_one(source_p, form_str(RPL_LUSERME),
195	<	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);
194	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
195	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
196		}
197		else
198		{
199	<	sendto_one(source_p, form_str(RPL_LUSERME),
200	<	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);
199	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
200	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
201		}
202
203	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
204	<	from, to, Count.total, Count.max_tot,
205	<	Count.total, Count.max_tot);
206	<
207	<	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);
203	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
204	>
205	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
206	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
207	>	Count.max_loc_cli, Count.totalrestartcount);
208
209		if (Count.local > Count.max_loc_cli)
210		Count.max_loc_cli = Count.local;
211
212		if ((Count.local + Count.myserver) > Count.max_loc_con)
213	<	Count.max_loc_con = Count.local + Count.myserver;
213	>	Count.max_loc_con = Count.local + Count.myserver;
214		}
215
216		/* show_isupport()
#	Line 249 | Line 220 | show_lusers(struct Client *source_p)
220		* side effects - display to client what we support (for them)
221		*/
222		void
223	<	show_isupport(struct Client *source_p)
223	>	show_isupport(struct Client *source_p)
224		{
225	<	send_message_file(source_p, isupportFile);
225	>	const dlink_node *ptr = NULL;
226	>
227	>	DLINK_FOREACH(ptr, support_list_lines.head)
228	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
229		}
230
231		/*
#	Line 281 | Line 255 | void
255		register_local_user(struct Client *source_p)
256		{
257		const char *id = NULL;
258	<	const struct AccessItem *aconf = NULL;
285	<	dlink_node *ptr = NULL;
258	>	const struct MaskItem *conf = NULL;
259
260		assert(source_p != NULL);
261		assert(source_p == source_p->from);
#	Line 293 | Line 266 | register_local_user(struct Client *sourc
266
267		if (ConfigFileEntry.ping_cookie)
268		{
269	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
269	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
270		{
271		do
272		source_p->localClient->random_ping = genrand_int32();
#	Line 313 | Line 286 | register_local_user(struct Client *sourc
286		/* Straight up the maximum rate of flooding... */
287		source_p->localClient->allow_read = MAX_FLOOD_BURST;
288
289	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
289	>	if (!check_client(source_p))
290		return;
291
292	<	if (valid_hostname(source_p->host) == 0)
292	>	if (!valid_hostname(source_p->host))
293		{
294		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
295		"character in your hostname", me.name, source_p->name);
#	Line 324 | Line 297 | register_local_user(struct Client *sourc
297		sizeof(source_p->host));
298		}
299
300	<	ptr   = source_p->localClient->confs.head;
328	<	aconf = map_to_conf(ptr->data);
300	>	conf = source_p->localClient->confs.head->data;
301
302		if (!IsGotId(source_p))
303		{
#	Line 333 | Line 305 | register_local_user(struct Client *sourc
305		const char *p = username;
306		unsigned int i = 0;
307
308	<	if (IsNeedIdentd(aconf))
308	>	if (IsNeedIdentd(conf))
309		{
310		++ServerStats.is_ref;
311		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
#	Line 344 | Line 316 | register_local_user(struct Client *sourc
316
317		strlcpy(username, source_p->username, sizeof(username));
318
319	<	if (!IsNoTilde(aconf))
319	>	if (!IsNoTilde(conf))
320		source_p->username[i++] = '~';
321
322		for (; *p && i < USERLEN; ++p)
#	Line 355 | Line 327 | register_local_user(struct Client *sourc
327		}
328
329		/* password check */
330	<	if (!EmptyString(aconf->passwd))
330	>	if (!EmptyString(conf->passwd))
331		{
332		const char *pass = source_p->localClient->passwd;
333
334	<	if (!match_conf_password(pass, aconf))
334	>	if (!match_conf_password(pass, conf))
335		{
336		++ServerStats.is_ref;
337	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
338	<	me.name, source_p->name);
337	>
338	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
339		exit_client(source_p, &me, "Bad Password");
340		return;
341		}
#	Line 375 | Line 347 | register_local_user(struct Client *sourc
347		*/
348
349		/* report if user has &^>= etc. and set flags as needed in source_p */
350	<	report_and_set_user_flags(source_p, aconf);
350	>	report_and_set_user_flags(source_p, conf);
351
352		if (IsDead(source_p))
353		return;
#	Line 391 | Line 363 | register_local_user(struct Client *sourc
363		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
364		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
365		{
366	<	sendto_realops_flags(UMODE_FULL, L_ALL,
366	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
367		"Too many clients, rejecting %s[%s].",
368		source_p->name, source_p->host);
369		++ServerStats.is_ref;
#	Line 400 | Line 372 | register_local_user(struct Client *sourc
372		}
373
374		/* valid user name check */
375	<	if (valid_username(source_p->username) == 0)
375	>	if (!valid_username(source_p->username, 1))
376		{
377		char tmpstr2[IRCD_BUFSIZE];
378
379	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
379	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
380	>	"Invalid username: %s (%s@%s)",
381		source_p->name, source_p->username, source_p->host);
382		++ServerStats.is_ref;
383		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
#	Line 422 | Line 395 | register_local_user(struct Client *sourc
395		strlcpy(source_p->id, id, sizeof(source_p->id));
396		hash_add_id(source_p);
397
398	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
398	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
399		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
400		source_p->name, source_p->username, source_p->host,
401		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
402		"255.255.255.255" : source_p->sockhost,
403	<	get_client_class(source_p),
403	>	get_client_class(&source_p->localClient->confs),
404		source_p->info, source_p->id);
405
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	–
406		if (ConfigFileEntry.invisible_on_connect)
407		{
408	<	source_p->umodes |= UMODE_INVISIBLE;
408	>	AddUMode(source_p, UMODE_INVISIBLE);
409		++Count.invisi;
410		}
411
412	<	if ((++Count.local) > Count.max_loc)
412	>	if (++Count.local > Count.max_loc)
413		{
414		Count.max_loc = Count.local;
415
416		if (!(Count.max_loc % 10))
417	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
417	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
418	>	"New Max Local Clients: %d",
419		Count.max_loc);
420		}
421
#	Line 487 | Line 448 | register_local_user(struct Client *sourc
448		*              - username to register as
449		*              - host name to register as
450		*              - server name
490	–	*              - realname (gecos)
451		* output       - NONE
452		* side effects - This function is called when a remote client
453		*                is introduced by a server.
454		*/
455		void
456	<	register_remote_user(struct Client *source_p,
457	<	const char *username, const char *host, const char *server,
498	<	const char *realname)
456	>	register_remote_user(struct Client *source_p, const char *username,
457	>	const char *host, const char *server)
458		{
459		struct Client *target_p = NULL;
460
461		assert(source_p != NULL);
462		assert(source_p->username != username);
463
464	<	strlcpy(source_p->host, host, sizeof(source_p->host));
464	>	strlcpy(source_p->host, host, sizeof(source_p->host));
465		strlcpy(source_p->username, username, sizeof(source_p->username));
466
467		/*
#	Line 510 | Line 469 | register_remote_user(struct Client *sour
469		*/
470		source_p->servptr = hash_find_server(server);
471
472	<	/* Super GhostDetect:
472	>	/*
473	>	* Super GhostDetect:
474		* If we can't find the server the user is supposed to be on,
475		* then simply blow the user away.        -Taner
476		*/
477		if (source_p->servptr == NULL)
478		{
479	<	sendto_realops_flags(UMODE_ALL, L_ALL,
479	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
480		"No server %s for user %s[%s@%s] from %s",
481		server, source_p->name, source_p->username,
482		source_p->host, source_p->from->name);
483		kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
484
485	<	SetKilled(source_p);
485	>	AddFlag(source_p, FLAGS_KILLED);
486		exit_client(source_p, &me, "Ghosted Client");
487		return;
488		}
489
490		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
491		{
492	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
492	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
493		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
494		source_p->from->name, source_p->name, source_p->username,
495		source_p->host, source_p->servptr->name,
#	Line 537 | Line 497 | register_remote_user(struct Client *sour
497		kill_client(source_p->from, source_p,
498		"%s (NICK from wrong direction (%s != %s))",
499		me.name, source_p->servptr->name, target_p->from->name);
500	<	SetKilled(source_p);
500	>	AddFlag(source_p, FLAGS_KILLED);
501		exit_client(source_p, &me, "USER server wrong direction");
502		return;
503		}
#	Line 546 | Line 506 | register_remote_user(struct Client *sour
506		* If the nick has been introduced by a services server,
507		* make it a service as well.
508		*/
509	<	if (IsService(source_p->servptr))
510	<	SetService(source_p);
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)
#	Line 558 | 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 573 | 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 582 | 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 595 | 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",
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);
565	>	if (IsCapable(server, CAP_SVS))
566	>	{
567	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
568	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
569	>	source_p->servptr->id,
570	>	source_p->name, source_p->hopcount+1,
571	>	(unsigned long)source_p->tsinfo,
572	>	ubuf, source_p->username, source_p->host,
573	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
574	>	"0" : source_p->sockhost, source_p->id,
575	>	source_p->svid,
576	>	source_p->info);
577	>	else
578	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
579	>	source_p->name, source_p->hopcount+1,
580	>	(unsigned long)source_p->tsinfo,
581	>	ubuf, source_p->username, source_p->host,
582	>	source_p->servptr->name, source_p->svid,
583	>	source_p->info);
584	>
585	>	}
586		else
587	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
588	<	source_p->name, source_p->hopcount+1,
589	<	(unsigned long)source_p->tsinfo,
590	<	ubuf, source_p->username, source_p->host,
591	<	source_p->servptr->name, source_p->info);
587	>	{
588	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
589	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
590	>	source_p->servptr->id,
591	>	source_p->name, source_p->hopcount+1,
592	>	(unsigned long)source_p->tsinfo,
593	>	ubuf, source_p->username, source_p->host,
594	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
595	>	"0" : source_p->sockhost, source_p->id, source_p->info);
596	>	else
597	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
598	>	source_p->name, source_p->hopcount+1,
599	>	(unsigned long)source_p->tsinfo,
600	>	ubuf, source_p->username, source_p->host,
601	>	source_p->servptr->name, source_p->info);
602	>	}
603	>
604	>	if (!EmptyString(source_p->certfp))
605	>	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
606		}
607		}
608
#	Line 628 | Line 622 | valid_hostname(const char *hostname)
622
623		assert(p != NULL);
624
625	<	if (*p == '.' || *p == ':')
625	>	if (EmptyString(p) || *p == '.' || *p == ':')
626		return 0;
627
628		for (; *p; ++p)
629		if (!IsHostChar(*p))
630		return 0;
631
632	<	return 1;
632	>	return p - hostname <= HOSTLEN;
633		}
634
635		/* valid_username()
#	Line 650 | Line 644 | valid_hostname(const char *hostname)
644		* style of username
645		*/
646		int
647	<	valid_username(const char *username)
647	>	valid_username(const char *username, const int local)
648		{
649		int dots      = 0;
650		const char *p = username;
#	Line 660 | Line 654 | valid_username(const char *username)
654		if (*p == '~')
655		++p;
656
657	<	/* reject usernames that don't start with an alphanum
657	>	/*
658	>	* Reject usernames that don't start with an alphanum
659		* i.e. reject jokers who have '-@somehost' or '.@somehost'
660		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
661		*/
662		if (!IsAlNum(*p))
663		return 0;
664
665	<	while (*++p)
665	>	if (local)
666		{
667	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
667	>	while (*++p)
668		{
669	<	if (++dots > ConfigFileEntry.dots_in_ident)
670	<	return 0;
671	<	if (!IsUserChar(*(p + 1)))
669	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
670	>	{
671	>	if (++dots > ConfigFileEntry.dots_in_ident)
672	>	return 0;
673	>	if (!IsUserChar(*(p + 1)))
674	>	return 0;
675	>	}
676	>	else if (!IsUserChar(*p))
677		return 0;
678		}
679	<	else if (!IsUserChar(*p))
680	<	return 0;
679	>	}
680	>	else
681	>	{
682	>	while (*++p)
683	>	if (!IsUserChar(*p))
684	>	return 0;
685		}
686
687	<	return 1;
687	>	return  p - username <= USERLEN;;
688		}
689
690		/* clean_nick_name()
#	Line 705 | Line 709 | valid_nickname(const char *nickname, con
709		if (!IsNickChar(*p))
710		return 0;
711
712	<	return p - nickname <= (NICKLEN - 1);
712	>	return p - nickname <= NICKLEN;
713		}
714
715		/* report_and_set_user_flags()
716		*
717		* inputs       - pointer to source_p
718	<	*              - pointer to aconf for this user
718	>	*              - pointer to conf for this user
719		* output       - NONE
720		* side effects - Report to user any special flags
721		*                they are getting, and set them.
722		*/
723		static void
724	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
724	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
725		{
726		/* If this user is being spoofed, tell them so */
727	<	if (IsConfDoSpoofIp(aconf))
724	<	{
727	>	if (IsConfDoSpoofIp(conf))
728		sendto_one(source_p,
729	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
729	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
730		me.name, source_p->name);
728	–	}
731
732		/* If this user is in the exception class, Set it "E lined" */
733	<	if (IsConfExemptKline(aconf))
733	>	if (IsConfExemptKline(conf))
734		{
735		SetExemptKline(source_p);
736		sendto_one(source_p,
737	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
737	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
738		me.name, source_p->name);
739		}
740
741	<	/* The else here is to make sure that G line exempt users
741	>	/*
742	>	* The else here is to make sure that G line exempt users
743		* do not get noticed twice.
744		*/
745	<	else if (IsConfExemptGline(aconf))
745	>	else if (IsConfExemptGline(conf))
746		{
747		SetExemptGline(source_p);
748	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
748	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
749		me.name, source_p->name);
750		}
751
752	<	if (IsConfExemptResv(aconf))
752	>	if (IsConfExemptResv(conf))
753		{
754		SetExemptResv(source_p);
755	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
755	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
756		me.name, source_p->name);
757		}
758
759		/* If this user is exempt from user limits set it "F lined" */
760	<	if (IsConfExemptLimits(aconf))
760	>	if (IsConfExemptLimits(conf))
761		{
762		SetExemptLimits(source_p);
763		sendto_one(source_p,
764	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
765	<	me.name,source_p->name);
764	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
765	>	me.name, source_p->name);
766		}
767
768	<	if (IsConfCanFlood(aconf))
768	>	if (IsConfCanFlood(conf))
769		{
770		SetCanFlood(source_p);
771		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 771 | Line 774 | report_and_set_user_flags(struct Client
774		}
775		}
776
774	–	/* change_simple_umode()
775	–	*
776	–	* this callback can be hooked to allow special handling of
777	–	* certain usermodes
778	–	*/
779	–	static void *
780	–	change_simple_umode(va_list args)
781	–	{
782	–	struct Client *client_p;
783	–	struct Client *source_p;
784	–	int what;
785	–	unsigned int flag;
786	–
787	–	client_p = va_arg(args, struct Client *);
788	–	source_p = va_arg(args, struct Client *);
789	–	what = va_arg(args, int);
790	–	flag = va_arg(args, unsigned int);
791	–
792	–	if (what == MODE_ADD)
793	–	source_p->umodes |= flag;
794	–	else
795	–	source_p->umodes &= ~flag;
796	–
797	–	return NULL;
798	–	}
799	–
777		/* set_user_mode()
778		*
779		* added 15/10/91 By Darren Reed.
#	Line 806 | Line 783 | change_simple_umode(va_list args)
783		*/
784		void
785		set_user_mode(struct Client *client_p, struct Client *source_p,
786	<	int parc, char *parv[])
786	>	const int parc, char *parv[])
787		{
788		unsigned int flag, setflags;
789		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 818 | Line 795 | set_user_mode(struct Client *client_p, s
795		if ((target_p = find_person(client_p, parv[1])) == NULL)
796		{
797		if (MyConnect(source_p))
798	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
822	<	me.name, source_p->name, parv[1]);
798	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
799		return;
800		}
801
826	–	if (IsServer(source_p))
827	–	{
828	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
829	–	parv[1], source_p->name);
830	–	return;
831	–	}
832	–
802		if (source_p != target_p)
803		{
804	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
836	<	me.name, source_p->name);
804	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
805		return;
806		}
807
#	Line 842 | Line 810 | set_user_mode(struct Client *client_p, s
810		m = buf;
811		*m++ = '+';
812
813	<	for (i = 0; i < 128; i++)
814	<	if (source_p->umodes & user_modes[i])
813	>	for (i = 0; i < 128; ++i)
814	>	if (HasUMode(source_p, user_modes[i]))
815		*m++ = (char)i;
816		*m = '\0';
817
818	<	sendto_one(source_p, form_str(RPL_UMODEIS),
851	<	me.name, source_p->name, buf);
818	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
819		return;
820		}
821
855	–	execute_callback(entering_umode_cb, client_p, source_p);
856	–
822		/* find flags already set for user */
823		setflags = source_p->umodes;
824
825		/* parse mode change string(s) */
826	<	for (p = &parv[2]; p && *p; p++)
826	>	for (p = &parv[2]; p && *p; ++p)
827		{
828	<	for (m = *p; *m; m++)
828	>	for (m = *p; *m; ++m)
829		{
830		switch (*m)
831		{
#	Line 873 | Line 838 | set_user_mode(struct Client *client_p, s
838		case 'o':
839		if (what == MODE_ADD)
840		{
841	<	if (IsServer(client_p) && !IsOper(source_p))
841	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
842		{
843		++Count.oper;
844		SetOper(source_p);
#	Line 881 | Line 846 | set_user_mode(struct Client *client_p, s
846		}
847		else
848		{
849	<	/* Only decrement the oper counts if an oper to begin with
885	<	* found by Pat Szuta, Perly , perly@xnet.com
886	<	*/
887	<	if (!IsOper(source_p))
849	>	if (!HasUMode(source_p, UMODE_OPER))
850		break;
851
852		ClearOper(source_p);
#	Line 892 | Line 854 | set_user_mode(struct Client *client_p, s
854
855		if (MyConnect(source_p))
856		{
857	<	dlink_node *dm;
857	>	dlink_node *dm = NULL;
858
859	<	detach_conf(source_p, OPER_TYPE);
860	<	ClearOperFlags(source_p);
861	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
859	>	detach_conf(source_p, CONF_OPER);
860	>	ClrOFlag(source_p);
861	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
862
863		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
864		free_dlink_node(dm);
#	Line 905 | Line 867 | set_user_mode(struct Client *client_p, s
867
868		break;
869
870	<	/* we may not get these,
871	<	* but they shouldnt be in default
872	<	*/
873	<	case 'r':
912	<	case ' ' :
913	<	case '\n':
914	<	case '\r':
915	<	case '\t':
870	>	case 'S':  /* Only servers may set +S in a burst */
871	>	case 'W':  /* Only servers may set +W in a burst */
872	>	case 'r':  /* Only services may set +r */
873	>	case 'x':  /* Only services may set +x */
874		break;
875
876		default:
877		if ((flag = user_modes[(unsigned char)*m]))
878		{
879	<	if (MyConnect(source_p) && !IsOper(source_p) &&
879	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
880		(ConfigFileEntry.oper_only_umodes & flag))
923	–	{
881		badflag = 1;
925	–	}
882		else
883	<	execute_callback(umode_cb, client_p, source_p, what, flag);
884	<	}
885	<	else
886	<	{
887	<	if (MyConnect(source_p))
888	<	badflag = 1;
883	>	{
884	>	if (what == MODE_ADD)
885	>	AddUMode(source_p, flag);
886	>	else
887	>	DelUMode(source_p, flag);
888	>	}
889		}
890	+	else if (MyConnect(source_p))
891	+	badflag = 1;
892
893		break;
894		}
#	Line 938 | Line 896 | set_user_mode(struct Client *client_p, s
896		}
897
898		if (badflag)
899	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
942	<	me.name, source_p->name);
899	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
900
901	<	if (HasUMode(source_p, UMODE_NCHANGE) && !IsOperN(source_p))
901	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
902	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
903		{
904		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
905		me.name, source_p->name);
906	<	DelUMode(source_p, UMODE_NCHANGE); /* only tcm's really need this */
906	>	DelUMode(source_p, UMODE_ADMIN);
907		}
908
909	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
952	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
953	<	{
954	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
955	<	me.name, source_p->name);
956	<	source_p->umodes &= ~UMODE_ADMIN;
957	<	}
958	<
959	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
909	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
910		++Count.invisi;
911	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
911	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
912		--Count.invisi;
913
914		/*
#	Line 992 | Line 942 | send_umode(struct Client *client_p, stru
942		* build a string in umode_buf to represent the change in the user's
943		* mode between the new (source_p->umodes) and 'old'.
944		*/
945	<	for (i = 0; i < 128; i++)
945	>	for (i = 0; i < 128; ++i)
946		{
947		flag = user_modes[i];
948		if (!flag)
#	Line 1001 | Line 951 | send_umode(struct Client *client_p, stru
951		if (MyClient(source_p) && !(flag & sendmask))
952		continue;
953
954	<	if ((flag & old) && !(source_p->umodes & flag))
954	>	if ((flag & old) && !HasUMode(source_p, flag))
955		{
956		if (what == MODE_DEL)
957		*m++ = (char)i;
#	Line 1012 | Line 962 | send_umode(struct Client *client_p, stru
962		*m++ = (char)i;
963		}
964		}
965	<	else if (!(flag & old) && (source_p->umodes & flag))
965	>	else if (!(flag & old) && HasUMode(source_p, flag))
966		{
967		if (what == MODE_ADD)
968		*m++ = (char)i;
#	Line 1046 | Line 996 | send_umode_out(struct Client *client_p,
996		char buf[IRCD_BUFSIZE] = { '\0' };
997		dlink_node *ptr = NULL;
998
999	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1050	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
999	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1000
1001		if (buf[0])
1002		{
#	Line 1066 | Line 1015 | send_umode_out(struct Client *client_p,
1015		send_umode(client_p, source_p, old, 0xffffffff, buf);
1016		}
1017
1018	+	void
1019	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1020	+	{
1021	+	dlink_node *ptr = NULL;
1022	+
1023	+	if (!strcmp(target_p->host, hostname))
1024	+	return;
1025	+
1026	+	switch (what)
1027	+	{
1028	+	case MODE_ADD:
1029	+	AddUMode(target_p, UMODE_HIDDENHOST);
1030	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1031	+	break;
1032	+	case MODE_DEL:
1033	+	DelUMode(target_p, UMODE_HIDDENHOST);
1034	+
1035	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1036	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1037	+	break;
1038	+	default: return;
1039	+	}
1040	+
1041	+	if (ConfigFileEntry.cycle_on_host_change)
1042	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1043	+	target_p->name, target_p->username, target_p->host);
1044	+
1045	+	if (IsUserHostIp(target_p))
1046	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1047	+
1048	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1049	+
1050	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1051	+	SetUserHost(target_p);
1052	+
1053	+	if (MyClient(target_p))
1054	+	{
1055	+	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1056	+	clear_ban_cache_client(target_p);
1057	+	}
1058	+
1059	+	if (!ConfigFileEntry.cycle_on_host_change)
1060	+	return;
1061	+
1062	+	DLINK_FOREACH(ptr, target_p->channel.head)
1063	+	{
1064	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1065	+	char *p = modebuf;
1066	+	int len = 0;
1067	+	const struct Membership *ms = ptr->data;
1068	+
1069	+	if (has_member_flags(ms, CHFL_CHANOP))
1070	+	{
1071	+	*p++ = 'o';
1072	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1073	+	}
1074	+
1075	+	if (has_member_flags(ms, CHFL_HALFOP))
1076	+	{
1077	+	*p++ = 'h';
1078	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1079	+	}
1080	+
1081	+	if (has_member_flags(ms, CHFL_VOICE))
1082	+	{
1083	+	*p++ = 'v';
1084	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1085	+	}
1086	+
1087	+	*p = '\0';
1088	+
1089	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1090	+	target_p->name, target_p->username, target_p->host,
1091	+	ms->chptr->chname);
1092	+	if (nickbuf[0])
1093	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1094	+	target_p->servptr->name, ms->chptr->chname,
1095	+	modebuf, nickbuf);
1096	+
1097	+	}
1098	+
1099	+	if (target_p->away[0])
1100	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1101	+	":%s!%s@%s AWAY :%s",
1102	+	target_p->name, target_p->username,
1103	+	target_p->host, target_p->away);
1104	+	}
1105	+
1106		/* user_welcome()
1107		*
1108		* inputs       - client pointer to client to welcome
#	Line 1082 | Line 1119 | user_welcome(struct Client *source_p)
1119		#endif
1120
1121		#ifdef HAVE_LIBCRYPTO
1122	<	if (source_p->localClient->fd.ssl != NULL)
1122	>	if (HasFlag(source_p, FLAGS_SSL))
1123	>	{
1124	>	AddUMode(source_p, UMODE_SSL);
1125		sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1126		me.name, source_p->name,
1127		ssl_get_cipher(source_p->localClient->fd.ssl));
1128	+	}
1129		#endif
1130
1131	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1132	<	ServerInfo.network_name, source_p->name);
1133	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1134	<	get_listener_name(source_p->localClient->listener), ircd_version);
1135	<	sendto_one(source_p, form_str(RPL_CREATED),
1136	<	me.name, source_p->name, built_date);
1097	<	sendto_one(source_p, form_str(RPL_MYINFO),
1098	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1131	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1132	>	source_p->name);
1133	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1134	>	get_listener_name(source_p->localClient->listener), ircd_version);
1135	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1136	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1137		show_isupport(source_p);
1138
1139		if (source_p->id[0] != '\0')
1140	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1103	<	source_p->name, source_p->id);
1140	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1141
1142		show_lusers(source_p);
1143	<
1107	<	if (ConfigFileEntry.short_motd)
1108	<	{
1109	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1110	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1111	<	sendto_one(source_p,
1112	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1113	<	"read it", me.name, source_p->name);
1114	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1115	<	me.name, source_p->name, me.name);
1116	<	sendto_one(source_p, form_str(RPL_MOTD),
1117	<	me.name, source_p->name,
1118	<	"*** This is the short motd ***");
1119	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1120	<	me.name, source_p->name);
1121	<	}
1122	<	else
1123	<	send_message_file(source_p, &ConfigFileEntry.motd);
1143	>	motd_signon(source_p);
1144		}
1145
1146		/* check_xline()
#	Line 1132 | Line 1152 | user_welcome(struct Client *source_p)
1152		static int
1153		check_xline(struct Client *source_p)
1154		{
1155	<	struct ConfItem *conf = NULL;
1155	>	struct MaskItem *conf = NULL;
1156		const char *reason = NULL;
1157
1158	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1139	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1158	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1159		{
1160	<	struct MatchItem *reg = map_to_conf(conf);
1160	>	++conf->count;
1161
1162	<	++reg->count;
1163	<
1145	<	if (reg->reason != NULL)
1146	<	reason = reg->reason;
1162	>	if (conf->reason != NULL)
1163	>	reason = conf->reason;
1164		else
1165		reason = "No Reason";
1166
1167	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1167	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1168		"X-line Rejecting [%s] [%s], user %s [%s]",
1169		source_p->info, reason,
1170		get_client_name(source_p, HIDE_IP),
1171		source_p->sockhost);
1172
1173		++ServerStats.is_ref;
1174	<	if (REJECT_HOLD_TIME > 0)
1158	<	{
1159	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1160	<	me.name, source_p->name);
1161	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1162	<	SetCaptured(source_p);
1163	<	}
1164	<	else
1165	<	exit_client(source_p, &me, "Bad user info");
1174	>	exit_client(source_p, &me, "Bad user info");
1175		return 1;
1176		}
1177
#	Line 1173 | Line 1182 | check_xline(struct Client *source_p)
1182		*
1183		* inputs       - pointer to given client to oper
1184		* output       - NONE
1185	<	* side effects - Blindly opers up given source_p, using aconf info
1185	>	* side effects - Blindly opers up given source_p, using conf info
1186		*                all checks on passwords have already been done.
1187	<	*                This could also be used by rsa oper routines.
1187	>	*                This could also be used by rsa oper routines.
1188		*/
1189		void
1190		oper_up(struct Client *source_p)
1191		{
1192	<	unsigned int old = source_p->umodes;
1193	<	const char *operprivs = "";
1185	<	const struct AccessItem *oconf = NULL;
1192	>	const unsigned int old = source_p->umodes;
1193	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1194
1195		assert(source_p->localClient->confs.head);
1188	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1196
1197		++Count.oper;
1198		SetOper(source_p);
1199
1200	<	if (oconf->modes)
1201	<	source_p->umodes |= oconf->modes;
1200	>	if (conf->modes)
1201	>	AddUMode(source_p, conf->modes);
1202		else if (ConfigFileEntry.oper_umodes)
1203	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1197	<	else
1198	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1199	<	UMODE_WALLOP|UMODE_LOCOPS);
1203	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1204
1205	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1205	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1206		++Count.invisi;
1207	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1207	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1208		--Count.invisi;
1209
1210		assert(dlinkFind(&oper_list, source_p) == NULL);
1211		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1212
1213	<	operprivs = oper_privs_as_string(oconf->port);
1210	<
1211	<	SetOFlag(source_p, oconf->port);
1213	>	AddOFlag(source_p, conf->port);
1214
1215	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1215	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1216		AddUMode(source_p, UMODE_ADMIN);
1215	–	if (!IsOperN(source_p))
1216	–	DelUMode(source_p, UMODE_NCHANGE);
1217
1218	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1219	<	source_p->name, source_p->username, source_p->host);
1218	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1219	>	get_oper_name(source_p));
1220		send_umode_out(source_p, source_p, old);
1221	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1222	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1223	<	me.name, source_p->name, operprivs);
1224	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1221	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1222		}
1223
1224		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1239 | Line 1236 | valid_sid(const char *sid)
1236
1237		/*
1238		* init_uid()
1239	<	*
1239	>	*
1240		* inputs       - NONE
1241		* output       - NONE
1242		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1249 | Line 1246 | valid_sid(const char *sid)
1246		void
1247		init_uid(void)
1248		{
1249	<	int i;
1249	>	unsigned int i;
1250
1251		memset(new_uid, 0, sizeof(new_uid));
1252
#	Line 1257 | Line 1254 | init_uid(void)
1254		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1255
1256		for (i = 0; i < IRC_MAXSID; ++i)
1257	<	if (new_uid[i] == '\0')
1257	>	if (new_uid[i] == '\0')
1258		new_uid[i] = 'A';
1259
1260		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1264	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1265	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1266	–	* -Dianora
1267	–	*/
1261		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1269	–
1270	–	entering_umode_cb = register_callback("entering_umode", NULL);
1271	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1262		}
1263
1264		/*
#	Line 1328 | Line 1318 | uid_get(void)
1318		void
1319		init_isupport(void)
1320		{
1331	–	isupportFile = init_MessageLine();
1332	–
1321		add_isupport("CALLERID", NULL, -1);
1322		add_isupport("CASEMAPPING", CASEMAP, -1);
1323		add_isupport("DEAF", "D", -1);
1324		add_isupport("KICKLEN", NULL, KICKLEN);
1325		add_isupport("MODES", NULL, MAXMODEPARAMS);
1338	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1326		#ifdef HALFOPS
1327		add_isupport("PREFIX", "(ohv)@%+", -1);
1328		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1343 | Line 1330 | init_isupport(void)
1330		add_isupport("PREFIX", "(ov)@+", -1);
1331		add_isupport("STATUSMSG", "@+", -1);
1332		#endif
1333	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1333	>	add_isupport("EXCEPTS", "e", -1);
1334	>	add_isupport("INVEX", "I", -1);
1335		}
1336
1337		/*
#	Line 1378 | Line 1366 | add_isupport(const char *name, const cha
1366		dlinkAddTail(support, &support->node, &support_list);
1367		}
1368
1369	<	DupString(support->name, name);
1369	>	support->name = xstrdup(name);
1370		if (options != NULL)
1371	<	DupString(support->options, options);
1371	>	support->options = xstrdup(options);
1372		support->number = n;
1373
1374		rebuild_isupport_message_line();
#	Line 1427 | Line 1415 | rebuild_isupport_message_line(void)
1415		{
1416		char isupportbuffer[IRCD_BUFSIZE];
1417		char *p = isupportbuffer;
1418	<	dlink_node *ptr = NULL;
1418	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1419		int n = 0;
1420		int tokens = 0;
1421		size_t len = 0;
1422	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1422	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1423
1424	<	destroy_MessageLine(isupportFile);
1424	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1425	>	{
1426	>	dlinkDelete(ptr, &support_list_lines);
1427	>	MyFree(ptr->data);
1428	>	free_dlink_node(ptr);
1429	>	}
1430
1431		DLINK_FOREACH(ptr, support_list.head)
1432		{
1433		struct Isupport *support = ptr->data;
1434
1435	<	p += (n = ircsprintf(p, "%s", support->name));
1435	>	p += (n = sprintf(p, "%s", support->name));
1436		len += n;
1437
1438		if (support->options != NULL)
1439		{
1440	<	p += (n = ircsprintf(p, "=%s", support->options));
1440	>	p += (n = sprintf(p, "=%s", support->options));
1441		len += n;
1442		}
1443
1444		if (support->number > 0)
1445		{
1446	<	p += (n = ircsprintf(p, "=%d", support->number));
1446	>	p += (n = sprintf(p, "=%d", support->number));
1447		len += n;
1448		}
1449
#	Line 1463 | Line 1456 | rebuild_isupport_message_line(void)
1456		if (*--p == ' ')
1457		*p = '\0';
1458
1459	<	addto_MessageLine(isupportFile, isupportbuffer);
1459	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1460		p = isupportbuffer;
1461		len = 0;
1462		n = tokens = 0;
#	Line 1474 | Line 1467 | rebuild_isupport_message_line(void)
1467		{
1468		if (*--p == ' ')
1469		*p = '\0';
1470	<	addto_MessageLine(isupportFile, isupportbuffer);
1470	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1471		}
1472		}

Diff Legend

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