ViewVC Help

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

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

Comparing:
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2022 by michael, Sun May 12 18:07:07 2013 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 3528 by michael, Wed May 14 15:44:52 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"
28		#include "list.h"
29	<	#include "s_user.h"
28	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
35	–	#include "s_bsd.h"
35		#include "ircd.h"
36		#include "listener.h"
37		#include "motd.h"
38		#include "numeric.h"
39		#include "conf.h"
40		#include "log.h"
41	<	#include "s_serv.h"
41	>	#include "server.h"
42		#include "send.h"
43		#include "supported.h"
45	–	#include "whowas.h"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
47		#include "userhost.h"
48	<	#include "hook.h"
51	<	#include "s_misc.h"
48	>	#include "misc.h"
49		#include "parse.h"
50		#include "watch.h"
51
55	–
52		static char umode_buffer[IRCD_BUFSIZE];
57	–
58	–	static void user_welcome(struct Client *);
59	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
60	–	static int check_xline(struct Client *);
61	–	static void introduce_client(struct Client *);
53		static const char *uid_get(void);
54
55		/* Used for building up the isupport string,
56		* used with init_isupport, add_isupport, delete_isupport
57		*/
58	<
68	<	struct Isupport
58	>	struct Isupport
59		{
60		dlink_node node;
61		char *name;
#	Line 73 | Line 63 | struct Isupport
63		int number;
64		};
65
66	<	static dlink_list support_list = { NULL, NULL, 0 };
67	<	MessageFile *isupportFile;
66	>	static dlink_list support_list;
67	>	static dlink_list support_list_lines;
68
69		/* memory is cheap. map 0-255 to equivalent mode */
70		const unsigned int user_modes[256] =
#	Line 86 | Line 76 | const unsigned int user_modes[256] =
76		0,                  /* @ */
77		0,                  /* A */
78		0,                  /* B */
79	<	UMODE_CCONN_FULL,   /* C */
79	>	0,                  /* C */
80		UMODE_DEAF,         /* D */
81		0,                  /* E */
82		UMODE_FARCONNECT,   /* F */
#	Line 102 | Line 92 | const unsigned int user_modes[256] =
92		0,                  /* P */
93		0,                  /* Q */
94		UMODE_REGONLY,      /* R */
95	<	0,                  /* S */
95	>	UMODE_SSL,          /* S */
96		0,                  /* T */
97		0,                  /* U */
98		0,                  /* V */
99	<	0,                  /* W */
99	>	UMODE_WEBIRC,       /* W */
100		0,                  /* X */
101		0,                  /* Y */
102		0,                  /* Z 0x5A */
103	<	0, 0, 0, 0, 0,      /* 0x5F   */
103	>	0, 0, 0, 0, 0,      /* 0x5F   */
104		0,                  /* 0x60   */
105		UMODE_ADMIN,        /* a */
106		UMODE_BOTS,         /* b */
#	Line 127 | Line 117 | const unsigned int user_modes[256] =
117		0,                  /* m */
118		UMODE_NCHANGE,      /* n */
119		UMODE_OPER,         /* o */
120	<	0,                  /* p */
121	<	0,                  /* q */
120	>	UMODE_HIDECHANS,    /* p */
121	>	UMODE_HIDEIDLE,     /* q */
122		UMODE_REGISTERED,   /* r */
123		UMODE_SERVNOTICE,   /* s */
124		0,                  /* t */
125		UMODE_UNAUTH,       /* u */
126		0,                  /* v */
127		UMODE_WALLOP,       /* w */
128	<	0,                  /* x */
128	>	UMODE_HIDDENHOST,   /* x */
129		UMODE_SPY,          /* y */
130		UMODE_OPERWALL,     /* z      0x7A */
131		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 170 | Line 160 | assemble_umode_buffer(void)
160		* side effects - display to client user counts etc.
161		*/
162		void
163	<	show_lusers(struct Client *source_p)
163	>	show_lusers(struct Client *source_p)
164		{
175	–	const char *from, *to;
176	–
177	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
178	–	{
179	–	from = me.id;
180	–	to = source_p->id;
181	–	}
182	–	else
183	–	{
184	–	from = me.name;
185	–	to = source_p->name;
186	–	}
187	–
165		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
166	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
167	<	from, to, (Count.total-Count.invisi),
191	<	Count.invisi, dlink_list_length(&global_serv_list));
166	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
167	>	Count.invisi, dlink_list_length(&global_serv_list));
168		else
169	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
170	<	(Count.total-Count.invisi), Count.invisi, 1);
169	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
170	>	(Count.total - Count.invisi), Count.invisi, 1);
171
172	<	if (Count.oper > 0)
173	<	sendto_one(source_p, form_str(RPL_LUSEROP),
174	<	from, to, Count.oper);
175	<
176	<	if (dlink_list_length(&unknown_list) > 0)
177	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
178	<	from, to, dlink_list_length(&unknown_list));
179	<
204	<	if (dlink_list_length(&global_channel_list) > 0)
205	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
206	<	from, to, dlink_list_length(&global_channel_list));
172	>	if (Count.oper)
173	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
174	>
175	>	if (dlink_list_length(&unknown_list))
176	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
177	>
178	>	if (dlink_list_length(&global_channel_list))
179	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
180
181		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
182		{
183	<	sendto_one(source_p, form_str(RPL_LUSERME),
184	<	from, to, Count.local, Count.myserver);
212	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
213	<	from, to, Count.local, Count.max_loc);
183	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
184	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
185		}
186		else
187		{
188	<	sendto_one(source_p, form_str(RPL_LUSERME),
189	<	from, to, Count.total, 0);
219	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
220	<	from, to, Count.total, Count.max_tot);
188	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
189	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
190		}
191
192	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
224	<	from, to, Count.total, Count.max_tot);
192	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
193
194		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
195	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
196	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
195	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
196	>	Count.max_loc_cli, Count.totalrestartcount);
197
198		if (Count.local > Count.max_loc_cli)
199		Count.max_loc_cli = Count.local;
200
201		if ((Count.local + Count.myserver) > Count.max_loc_con)
202	<	Count.max_loc_con = Count.local + Count.myserver;
202	>	Count.max_loc_con = Count.local + Count.myserver;
203		}
204
205		/* show_isupport()
#	Line 241 | Line 209 | show_lusers(struct Client *source_p)
209		* side effects - display to client what we support (for them)
210		*/
211		void
212	<	show_isupport(struct Client *source_p)
212	>	show_isupport(struct Client *source_p)
213		{
214	<	send_message_file(source_p, isupportFile);
214	>	const dlink_node *ptr = NULL;
215	>
216	>	DLINK_FOREACH(ptr, support_list_lines.head)
217	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
218		}
219
220	<	/*
221	<	** register_local_user
222	<	**      This function is called when both NICK and USER messages
223	<	**      have been accepted for the client, in whatever order. Only
224	<	**      after this, is the USER message propagated.
225	<	**
226	<	**      NICK's must be propagated at once when received, although
227	<	**      it would be better to delay them too until full info is
228	<	**      available. Doing it is not so simple though, would have
229	<	**      to implement the following:
230	<	**
231	<	**      (actually it has been implemented already for a while) -orabidoo
232	<	**
233	<	**      1) user telnets in and gives only "NICK foobar" and waits
234	<	**      2) another user far away logs in normally with the nick
235	<	**         "foobar" (quite legal, as this server didn't propagate
236	<	**         it).
237	<	**      3) now this server gets nick "foobar" from outside, but
238	<	**         has alread the same defined locally. Current server
239	<	**         would just issue "KILL foobar" to clean out dups. But,
240	<	**         this is not fair. It should actually request another
241	<	**         nick from local user or kill him/her...
242	<	*/
220	>
221	>	/* report_and_set_user_flags()
222	>	*
223	>	* inputs       - pointer to source_p
224	>	*              - pointer to conf for this user
225	>	* output       - NONE
226	>	* side effects - Report to user any special flags
227	>	*                they are getting, and set them.
228	>	*/
229	>	static void
230	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
231	>	{
232	>	/* If this user is being spoofed, tell them so */
233	>	if (IsConfDoSpoofIp(conf))
234	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
235	>
236	>	/* If this user is in the exception class, Set it "E lined" */
237	>	if (IsConfExemptKline(conf))
238	>	{
239	>	SetExemptKline(source_p);
240	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
241	>	}
242	>
243	>	/*
244	>	* The else here is to make sure that G line exempt users
245	>	* do not get noticed twice.
246	>	*/
247	>	else if (IsConfExemptGline(conf))
248	>	{
249	>	SetExemptGline(source_p);
250	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
251	>	}
252	>
253	>	if (IsConfExemptResv(conf))
254	>	{
255	>	SetExemptResv(source_p);
256	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
257	>	}
258	>
259	>	/* If this user is exempt from user limits set it "F lined" */
260	>	if (IsConfExemptLimits(conf))
261	>	{
262	>	SetExemptLimits(source_p);
263	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
264	>	}
265	>
266	>	if (IsConfCanFlood(conf))
267	>	{
268	>	SetCanFlood(source_p);
269	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
270	>	"protection, aren't you fearsome.");
271	>	}
272	>	}
273	>
274	>	/* introduce_client()
275	>	*
276	>	* inputs       - source_p
277	>	* output       - NONE
278	>	* side effects - This common function introduces a client to the rest
279	>	*                of the net, either from a local client connect or
280	>	*                from a remote connect.
281	>	*/
282	>	static void
283	>	introduce_client(struct Client *source_p)
284	>	{
285	>	dlink_node *ptr = NULL;
286	>	char ubuf[IRCD_BUFSIZE] = "";
287	>
288	>	if (MyClient(source_p))
289	>	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
290	>	else
291	>	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
292	>
293	>	watch_check_hash(source_p, RPL_LOGON);
294	>
295	>	if (ubuf[0] == '\0')
296	>	{
297	>	ubuf[0] = '+';
298	>	ubuf[1] = '\0';
299	>	}
300	>
301	>	DLINK_FOREACH(ptr, serv_list.head)
302	>	{
303	>	struct Client *server = ptr->data;
304	>
305	>	if (server == source_p->from)
306	>	continue;
307	>
308	>	if (IsCapable(server, CAP_SVS))
309	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
310	>	source_p->servptr->id,
311	>	source_p->name, source_p->hopcount+1,
312	>	(unsigned long)source_p->tsinfo,
313	>	ubuf, source_p->username, source_p->host,
314	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
315	>	"0" : source_p->sockhost, source_p->id,
316	>	source_p->svid,
317	>	source_p->info);
318	>	else
319	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
320	>	source_p->servptr->id,
321	>	source_p->name, source_p->hopcount+1,
322	>	(unsigned long)source_p->tsinfo,
323	>	ubuf, source_p->username, source_p->host,
324	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
325	>	"0" : source_p->sockhost, source_p->id, source_p->info);
326	>
327	>	if (!EmptyString(source_p->certfp))
328	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
329	>	}
330	>	}
331	>
332	>	/* user_welcome()
333	>	*
334	>	* inputs       - client pointer to client to welcome
335	>	* output       - NONE
336	>	* side effects -
337	>	*/
338	>	static void
339	>	user_welcome(struct Client *source_p)
340	>	{
341	>	#if defined(__TIME__) && defined(__DATE__)
342	>	static const char built_date[] = __DATE__ " at " __TIME__;
343	>	#else
344	>	static const char built_date[] = "unknown";
345	>	#endif
346	>
347	>	#ifdef HAVE_LIBCRYPTO
348	>	if (HasFlag(source_p, FLAGS_SSL))
349	>	{
350	>	AddUMode(source_p, UMODE_SSL);
351	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
352	>	ssl_get_cipher(source_p->localClient->fd.ssl));
353	>	}
354	>	#endif
355	>
356	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
357	>	source_p->name);
358	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
359	>	get_listener_name(source_p->localClient->listener), ircd_version);
360	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
361	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
362	>	show_isupport(source_p);
363	>
364	>	if (source_p->id[0])
365	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
366	>
367	>	show_lusers(source_p);
368	>	motd_signon(source_p);
369	>	}
370	>
371	>	/* check_xline()
372	>	*
373	>	* inputs       - pointer to client to test
374	>	* outupt       - 1 if exiting 0 if ok
375	>	* side effects -
376	>	*/
377	>	static int
378	>	check_xline(struct Client *source_p)
379	>	{
380	>	struct MaskItem *conf = NULL;
381	>	const char *reason = NULL;
382	>
383	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
384	>	{
385	>	++conf->count;
386	>
387	>	if (conf->reason)
388	>	reason = conf->reason;
389	>	else
390	>	reason = CONF_NOREASON;
391	>
392	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
393	>	"X-line Rejecting [%s] [%s], user %s [%s]",
394	>	source_p->info, reason,
395	>	get_client_name(source_p, HIDE_IP),
396	>	source_p->sockhost);
397	>
398	>	++ServerStats.is_ref;
399	>	exit_client(source_p, "Bad user info");
400	>	return 1;
401	>	}
402	>
403	>	return 0;
404	>	}
405	>
406	>	/*! \brief This function is called when both NICK and USER messages
407	>	*      have been accepted for the client, in whatever order. Only
408	>	*      after this, is the UID message propagated.
409	>	* \param source_p Pointer to given client to introduce
410	>	*/
411		void
412		register_local_user(struct Client *source_p)
413		{
414		const char *id = NULL;
415		const struct MaskItem *conf = NULL;
416
278	–	assert(source_p != NULL);
417		assert(source_p == source_p->from);
418		assert(MyConnect(source_p));
419		assert(!source_p->localClient->registration);
#	Line 284 | Line 422 | register_local_user(struct Client *sourc
422
423		if (ConfigFileEntry.ping_cookie)
424		{
425	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
425	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
426		{
427		do
428		source_p->localClient->random_ping = genrand_int32();
#	Line 307 | Line 445 | register_local_user(struct Client *sourc
445		if (!check_client(source_p))
446		return;
447
448	<	if (valid_hostname(source_p->host) == 0)
448	>	if (!valid_hostname(source_p->host))
449		{
450	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
451	<	"character in your hostname", me.name, source_p->name);
450	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
451	>	"character in your hostname");
452		strlcpy(source_p->host, source_p->sockhost,
453		sizeof(source_p->host));
454		}
#	Line 319 | Line 457 | register_local_user(struct Client *sourc
457
458		if (!IsGotId(source_p))
459		{
460	<	char username[USERLEN + 1];
460	>	char username[USERLEN + 1] = "";
461		const char *p = username;
462		unsigned int i = 0;
463
464		if (IsNeedIdentd(conf))
465		{
466		++ServerStats.is_ref;
467	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
468	<	"identd to use this server", me.name, source_p->name);
469	<	exit_client(source_p, &me, "Install identd");
467	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
468	>	"identd to use this server");
469	>	exit_client(source_p, "Install identd");
470		return;
471		}
472
#	Line 344 | Line 482 | register_local_user(struct Client *sourc
482		source_p->username[i] = '\0';
483		}
484
485	<	/* password check */
485	>	/* Password check */
486		if (!EmptyString(conf->passwd))
487		{
488	<	const char *pass = source_p->localClient->passwd;
351	<
352	<	if (!match_conf_password(pass, conf))
488	>	if (!match_conf_password(source_p->localClient->passwd, conf))
489		{
490		++ServerStats.is_ref;
491	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
492	<	me.name, source_p->name);
493	<	exit_client(source_p, &me, "Bad Password");
491	>
492	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
493	>	exit_client(source_p, "Bad Password");
494		return;
495		}
496		}
497
498	<	/* don't free source_p->localClient->passwd here - it can be required
498	>	/*
499	>	* Don't free source_p->localClient->passwd here - it can be required
500		* by masked /stats I if there are auth{} blocks with need_password = no;
501		* --adx
502		*/
503
504	<	/* report if user has &^>= etc. and set flags as needed in source_p */
504	>	/*
505	>	* Report if user has &^>= etc. and set flags as needed in source_p
506	>	*/
507		report_and_set_user_flags(source_p, conf);
508
509		if (IsDead(source_p))
510		return;
511
512	<	/* Limit clients -
512	>	/*
513	>	* Limit clients -
514		* We want to be able to have servers and F-line clients
515		* connect, so save room for "buffer" connections.
516		* Smaller servers may want to decrease this, and it should
517		* probably be just a percentage of the MAXCLIENTS...
518		*   -Taner
519		*/
380	–	/* Except "F:" clients */
520		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
521		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
522		{
#	Line 385 | Line 524 | register_local_user(struct Client *sourc
524		"Too many clients, rejecting %s[%s].",
525		source_p->name, source_p->host);
526		++ServerStats.is_ref;
527	<	exit_client(source_p, &me, "Sorry, server is full - try later");
527	>	exit_client(source_p, "Sorry, server is full - try later");
528		return;
529		}
530
531	<	/* valid user name check */
393	<	if (valid_username(source_p->username) == 0)
531	>	if (!valid_username(source_p->username, 1))
532		{
533	<	char tmpstr2[IRCD_BUFSIZE];
533	>	char buf[IRCD_BUFSIZE] = "";
534
535		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
536		"Invalid username: %s (%s@%s)",
537		source_p->name, source_p->username, source_p->host);
538		++ServerStats.is_ref;
539	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
540	<	source_p->username);
403	<	exit_client(source_p, &me, tmpstr2);
539	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
540	>	exit_client(source_p, buf);
541		return;
542		}
543
544		if (check_xline(source_p))
545		return;
546
547	<	while (hash_find_id((id = uid_get())) != NULL)
547	>	while (hash_find_id((id = uid_get())))
548		;
549
550		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 421 | Line 558 | register_local_user(struct Client *sourc
558		get_client_class(&source_p->localClient->confs),
559		source_p->info, source_p->id);
560
424	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
425	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
426	–	source_p->name, source_p->username, source_p->host,
427	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
428	–	"255.255.255.255" : source_p->sockhost,
429	–	get_client_class(&source_p->localClient->confs),
430	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	–	"<hidden>" : source_p->localClient->client_host,
432	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
433	–	"<hidden>" : source_p->localClient->client_server,
434	–	source_p->info);
435	–
436	–
561		if (ConfigFileEntry.invisible_on_connect)
562		{
563		AddUMode(source_p, UMODE_INVISIBLE);
564		++Count.invisi;
565		}
566
567	<	if ((++Count.local) > Count.max_loc)
567	>	if (++Count.local > Count.max_loc)
568		{
569		Count.max_loc = Count.local;
570
#	Line 450 | Line 574 | register_local_user(struct Client *sourc
574		Count.max_loc);
575		}
576
453	–	/* Increment our total user count here */
577		if (++Count.total > Count.max_tot)
578		Count.max_tot = Count.total;
579		++Count.totalrestartcount;
#	Line 479 | Line 602 | register_local_user(struct Client *sourc
602		*              - username to register as
603		*              - host name to register as
604		*              - server name
482	–	*              - realname (gecos)
605		* output       - NONE
606		* side effects - This function is called when a remote client
607		*                is introduced by a server.
608		*/
609		void
610	<	register_remote_user(struct Client *source_p,
611	<	const char *username, const char *host, const char *server,
490	<	const char *realname)
610	>	register_remote_user(struct Client *source_p, const char *username,
611	>	const char *host, const char *server)
612		{
613		struct Client *target_p = NULL;
614
494	–	assert(source_p != NULL);
615		assert(source_p->username != username);
616
617	<	strlcpy(source_p->host, host, sizeof(source_p->host));
617	>	strlcpy(source_p->host, host, sizeof(source_p->host));
618		strlcpy(source_p->username, username, sizeof(source_p->username));
619
620		/*
621	<	* coming from another server, take the servers word for it
621	>	* Coming from another server, take the servers word for it
622		*/
623		source_p->servptr = hash_find_server(server);
624
#	Line 513 | Line 633 | register_remote_user(struct Client *sour
633		"No server %s for user %s[%s@%s] from %s",
634		server, source_p->name, source_p->username,
635		source_p->host, source_p->from->name);
636	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
636	>	sendto_one(source_p->from,
637	>	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
638	>	me.id, source_p->id, me.name, server);
639
640		AddFlag(source_p, FLAGS_KILLED);
641	<	exit_client(source_p, &me, "Ghosted Client");
641	>	exit_client(source_p, "Ghosted Client");
642		return;
643		}
644
#	Line 527 | Line 649 | register_remote_user(struct Client *sour
649		source_p->from->name, source_p->name, source_p->username,
650		source_p->host, source_p->servptr->name,
651		target_p->name, target_p->from->name);
652	<	kill_client(source_p->from, source_p,
653	<	"%s (NICK from wrong direction (%s != %s))",
654	<	me.name, source_p->servptr->name, target_p->from->name);
652	>	sendto_one(source_p->from,
653	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
654	>	me.id, source_p->id, me.name, source_p->servptr->name,
655	>	target_p->from->name);
656	>
657		AddFlag(source_p, FLAGS_KILLED);
658	<	exit_client(source_p, &me, "USER server wrong direction");
658	>	exit_client(source_p, "USER server wrong direction");
659		return;
660		}
661
#	Line 542 | Line 666 | register_remote_user(struct Client *sour
666		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
667		AddFlag(source_p, FLAGS_SERVICE);
668
545	–	/* Increment our total user count here */
669		if (++Count.total > Count.max_tot)
670		Count.max_tot = Count.total;
671
#	Line 561 | Line 684 | register_remote_user(struct Client *sour
684		introduce_client(source_p);
685		}
686
564	–	/* introduce_client()
565	–	*
566	–	* inputs       - source_p
567	–	* output       - NONE
568	–	* side effects - This common function introduces a client to the rest
569	–	*                of the net, either from a local client connect or
570	–	*                from a remote connect.
571	–	*/
572	–	static void
573	–	introduce_client(struct Client *source_p)
574	–	{
575	–	dlink_node *server_node = NULL;
576	–	static char ubuf[12];
577	–
578	–	if (MyClient(source_p))
579	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
580	–	else
581	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
582	–
583	–	watch_check_hash(source_p, RPL_LOGON);
584	–
585	–	if (*ubuf == '\0')
586	–	{
587	–	ubuf[0] = '+';
588	–	ubuf[1] = '\0';
589	–	}
590	–
591	–	DLINK_FOREACH(server_node, serv_list.head)
592	–	{
593	–	struct Client *server = server_node->data;
594	–
595	–	if (server == source_p->from)
596	–	continue;
597	–
598	–	if (IsCapable(server, CAP_SVS))
599	–	{
600	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
601	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
602	–	source_p->servptr->id,
603	–	source_p->name, source_p->hopcount+1,
604	–	(unsigned long)source_p->tsinfo,
605	–	ubuf, source_p->username, source_p->host,
606	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
607	–	"0" : source_p->sockhost, source_p->id,
608	–	source_p->svid,
609	–	source_p->info);
610	–	else
611	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
612	–	source_p->name, source_p->hopcount+1,
613	–	(unsigned long)source_p->tsinfo,
614	–	ubuf, source_p->username, source_p->host,
615	–	source_p->servptr->name, source_p->svid,
616	–	source_p->info);
617	–
618	–	}
619	–	else
620	–	{
621	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
622	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
623	–	source_p->servptr->id,
624	–	source_p->name, source_p->hopcount+1,
625	–	(unsigned long)source_p->tsinfo,
626	–	ubuf, source_p->username, source_p->host,
627	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
628	–	"0" : source_p->sockhost, source_p->id, source_p->info);
629	–	else
630	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
631	–	source_p->name, source_p->hopcount+1,
632	–	(unsigned long)source_p->tsinfo,
633	–	ubuf, source_p->username, source_p->host,
634	–	source_p->servptr->name, source_p->info);
635	–	}
636	–	}
637	–	}
638	–
687		/* valid_hostname()
688		*
689		* Inputs       - pointer to hostname
#	Line 650 | Line 698 | valid_hostname(const char *hostname)
698		{
699		const char *p = hostname;
700
701	<	assert(p != NULL);
701	>	assert(p);
702
703	<	if (*p == '.' || *p == ':')
703	>	if (EmptyString(p) || *p == '.' || *p == ':')
704		return 0;
705
706		for (; *p; ++p)
#	Line 674 | Line 722 | valid_hostname(const char *hostname)
722		* style of username
723		*/
724		int
725	<	valid_username(const char *username)
725	>	valid_username(const char *username, const int local)
726		{
727		int dots      = 0;
728		const char *p = username;
729
730	<	assert(p != NULL);
730	>	assert(p);
731
732		if (*p == '~')
733		++p;
734
735	<	/* reject usernames that don't start with an alphanum
735	>	/*
736	>	* Reject usernames that don't start with an alphanum
737		* i.e. reject jokers who have '-@somehost' or '.@somehost'
738		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
739		*/
740		if (!IsAlNum(*p))
741		return 0;
742
743	<	while (*++p)
743	>	if (local)
744		{
745	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
745	>	while (*++p)
746		{
747	<	if (++dots > ConfigFileEntry.dots_in_ident)
748	<	return 0;
749	<	if (!IsUserChar(*(p + 1)))
747	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
748	>	{
749	>	if (++dots > ConfigFileEntry.dots_in_ident)
750	>	return 0;
751	>	if (!IsUserChar(*(p + 1)))
752	>	return 0;
753	>	}
754	>	else if (!IsUserChar(*p))
755		return 0;
756		}
757	<	else if (!IsUserChar(*p))
758	<	return 0;
757	>	}
758	>	else
759	>	{
760	>	while (*++p)
761	>	if (!IsUserChar(*p))
762	>	return 0;
763		}
764
765	<	return 1;
765	>	return  p - username <= USERLEN;;
766		}
767
768		/* clean_nick_name()
#	Line 718 | Line 776 | int
776		valid_nickname(const char *nickname, const int local)
777		{
778		const char *p = nickname;
779	+
780		assert(nickname && *nickname);
781
782	<	/* nicks can't start with a digit or - or be 0 length */
783	<	/* This closer duplicates behaviour of hybrid-6 */
782	>	/*
783	>	* Nicks can't start with a digit or - or be 0 length.
784	>	*/
785		if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
786		return 0;
787
#	Line 732 | Line 792 | valid_nickname(const char *nickname, con
792		return p - nickname <= NICKLEN;
793		}
794
735	–	/* report_and_set_user_flags()
736	–	*
737	–	* inputs       - pointer to source_p
738	–	*              - pointer to conf for this user
739	–	* output       - NONE
740	–	* side effects - Report to user any special flags
741	–	*                they are getting, and set them.
742	–	*/
743	–	static void
744	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
745	–	{
746	–	/* If this user is being spoofed, tell them so */
747	–	if (IsConfDoSpoofIp(conf))
748	–	{
749	–	sendto_one(source_p,
750	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
751	–	me.name, source_p->name);
752	–	}
753	–
754	–	/* If this user is in the exception class, Set it "E lined" */
755	–	if (IsConfExemptKline(conf))
756	–	{
757	–	SetExemptKline(source_p);
758	–	sendto_one(source_p,
759	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
760	–	me.name, source_p->name);
761	–	}
762	–
763	–	/* The else here is to make sure that G line exempt users
764	–	* do not get noticed twice.
765	–	*/
766	–	else if (IsConfExemptGline(conf))
767	–	{
768	–	SetExemptGline(source_p);
769	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
770	–	me.name, source_p->name);
771	–	}
772	–
773	–	if (IsConfExemptResv(conf))
774	–	{
775	–	SetExemptResv(source_p);
776	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
777	–	me.name, source_p->name);
778	–	}
779	–
780	–	/* If this user is exempt from user limits set it "F lined" */
781	–	if (IsConfExemptLimits(conf))
782	–	{
783	–	SetExemptLimits(source_p);
784	–	sendto_one(source_p,
785	–	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
786	–	me.name,source_p->name);
787	–	}
788	–
789	–	if (IsConfCanFlood(conf))
790	–	{
791	–	SetCanFlood(source_p);
792	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
793	–	"protection, aren't you fearsome.",
794	–	me.name, source_p->name);
795	–	}
796	–	}
797	–
798	–	/* set_user_mode()
799	–	*
800	–	* added 15/10/91 By Darren Reed.
801	–	* parv[0] - sender
802	–	* parv[1] - username to change mode for
803	–	* parv[2] - modes to change
804	–	*/
805	–	void
806	–	set_user_mode(struct Client *client_p, struct Client *source_p,
807	–	const int parc, char *parv[])
808	–	{
809	–	unsigned int flag, setflags;
810	–	char **p, *m, buf[IRCD_BUFSIZE];
811	–	struct Client *target_p;
812	–	int what = MODE_ADD, badflag = 0, i;
813	–
814	–	assert(!(parc < 2));
815	–
816	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
817	–	{
818	–	if (MyConnect(source_p))
819	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
820	–	me.name, source_p->name, parv[1]);
821	–	return;
822	–	}
823	–
824	–	if (source_p != target_p)
825	–	{
826	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
827	–	me.name, source_p->name);
828	–	return;
829	–	}
830	–
831	–	if (parc < 3)
832	–	{
833	–	m = buf;
834	–	*m++ = '+';
835	–
836	–	for (i = 0; i < 128; i++)
837	–	if (HasUMode(source_p, user_modes[i]))
838	–	*m++ = (char)i;
839	–	*m = '\0';
840	–
841	–	sendto_one(source_p, form_str(RPL_UMODEIS),
842	–	me.name, source_p->name, buf);
843	–	return;
844	–	}
845	–
846	–	/* find flags already set for user */
847	–	setflags = source_p->umodes;
848	–
849	–	/* parse mode change string(s) */
850	–	for (p = &parv[2]; p && *p; p++)
851	–	{
852	–	for (m = *p; *m; m++)
853	–	{
854	–	switch (*m)
855	–	{
856	–	case '+':
857	–	what = MODE_ADD;
858	–	break;
859	–	case '-':
860	–	what = MODE_DEL;
861	–	break;
862	–	case 'o':
863	–	if (what == MODE_ADD)
864	–	{
865	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
866	–	{
867	–	++Count.oper;
868	–	SetOper(source_p);
869	–	}
870	–	}
871	–	else
872	–	{
873	–	/* Only decrement the oper counts if an oper to begin with
874	–	* found by Pat Szuta, Perly , perly@xnet.com
875	–	*/
876	–	if (!HasUMode(source_p, UMODE_OPER))
877	–	break;
878	–
879	–	ClearOper(source_p);
880	–	Count.oper--;
881	–
882	–	if (MyConnect(source_p))
883	–	{
884	–	dlink_node *dm;
885	–
886	–	detach_conf(source_p, CONF_OPER);
887	–	ClrOFlag(source_p);
888	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
889	–
890	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
891	–	free_dlink_node(dm);
892	–	}
893	–	}
894	–
895	–	break;
896	–
897	–	/*
898	–	* We may not get these, but they shouldnt be in default
899	–	*/
900	–	case 'r':
901	–	case ' ' :
902	–	case '\n':
903	–	case '\r':
904	–	case '\t':
905	–	break;
906	–
907	–	default:
908	–	if ((flag = user_modes[(unsigned char)*m]))
909	–	{
910	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
911	–	(ConfigFileEntry.oper_only_umodes & flag))
912	–	badflag = 1;
913	–	else
914	–	{
915	–	if (what == MODE_ADD)
916	–	AddUMode(source_p, flag);
917	–	else
918	–	DelUMode(source_p, flag);
919	–	}
920	–	}
921	–	else
922	–	{
923	–	if (MyConnect(source_p))
924	–	badflag = 1;
925	–	}
926	–
927	–	break;
928	–	}
929	–	}
930	–	}
931	–
932	–	if (badflag)
933	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
934	–	me.name, source_p->name);
935	–
936	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
937	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
938	–	{
939	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
940	–	me.name, source_p->name);
941	–	DelUMode(source_p, UMODE_ADMIN);
942	–	}
943	–
944	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
945	–	++Count.invisi;
946	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
947	–	--Count.invisi;
948	–
949	–	/*
950	–	* compare new flags with old flags and send string which
951	–	* will cause servers to update correctly.
952	–	*/
953	–	send_umode_out(client_p, source_p, setflags);
954	–	}
955	–
795		/* send_umode()
796		* send the MODE string for user (user) to connection client_p
797		* -avalon
#	Line 970 | Line 809 | send_umode(struct Client *client_p, stru
809		{
810		char *m = umode_buf;
811		int what = 0;
973	–	unsigned int i;
974	–	unsigned int flag;
812
813		/*
814	<	* build a string in umode_buf to represent the change in the user's
814	>	* Build a string in umode_buf to represent the change in the user's
815		* mode between the new (source_p->umodes) and 'old'.
816		*/
817	<	for (i = 0; i < 128; i++)
817	>	for (unsigned int i = 0; i < 128; ++i)
818		{
819	<	flag = user_modes[i];
819	>	unsigned int flag = user_modes[i];
820	>
821		if (!flag)
822		continue;
823
#	Line 1028 | Line 866 | void
866		send_umode_out(struct Client *client_p, struct Client *source_p,
867		unsigned int old)
868		{
869	<	char buf[IRCD_BUFSIZE] = { '\0' };
1032	<	dlink_node *ptr = NULL;
869	>	char buf[IRCD_BUFSIZE] = "";
870
871		send_umode(NULL, source_p, old, SEND_UMODES, buf);
872
873		if (buf[0])
874	<	{
875	<	DLINK_FOREACH(ptr, serv_list.head)
1039	<	{
1040	<	struct Client *target_p = ptr->data;
1041	<
1042	<	if ((target_p != client_p) && (target_p != source_p))
1043	<	sendto_one(target_p, ":%s MODE %s :%s",
1044	<	ID_or_name(source_p, target_p),
1045	<	ID_or_name(source_p, target_p), buf);
1046	<	}
1047	<	}
874	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
875	>	source_p->id, source_p->id, buf);
876
877		if (client_p && MyClient(client_p))
878		send_umode(client_p, source_p, old, 0xffffffff, buf);
879		}
880
881		void
882	<	user_set_hostmask(struct Client *target_p, const char *hostname)
882	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
883		{
884	<	if (!valid_hostname(hostname))
884	>	dlink_node *ptr = NULL;
885	>
886	>	if (!strcmp(target_p->host, hostname))
887		return;
888
889	+	switch (what)
890	+	{
891	+	case MODE_ADD:
892	+	AddUMode(target_p, UMODE_HIDDENHOST);
893	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
894	+	break;
895	+	case MODE_DEL:
896	+	DelUMode(target_p, UMODE_HIDDENHOST);
897	+
898	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
899	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
900	+	break;
901	+	default: return;
902	+	}
903	+
904	+	if (ConfigFileEntry.cycle_on_host_change)
905	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
906	+	target_p->name, target_p->username, target_p->host);
907	+
908		if (IsUserHostIp(target_p))
909		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
910
911		strlcpy(target_p->host, hostname, sizeof(target_p->host));
1063	–	SetIPSpoof(target_p);
912
913		add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
914		SetUserHost(target_p);
915
916		if (MyClient(target_p))
917	+	{
918	+	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
919		clear_ban_cache_client(target_p);
920	<	}
1071	<
1072	<	/* user_welcome()
1073	<	*
1074	<	* inputs       - client pointer to client to welcome
1075	<	* output       - NONE
1076	<	* side effects -
1077	<	*/
1078	<	static void
1079	<	user_welcome(struct Client *source_p)
1080	<	{
1081	<	#if defined(__TIME__) && defined(__DATE__)
1082	<	static const char built_date[] = __DATE__ " at " __TIME__;
1083	<	#else
1084	<	static const char built_date[] = "unknown";
1085	<	#endif
1086	<
1087	<	#ifdef HAVE_LIBCRYPTO
1088	<	if (source_p->localClient->fd.ssl != NULL)
1089	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1090	<	me.name, source_p->name,
1091	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1092	<	#endif
1093	<
1094	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1095	<	ServerInfo.network_name, source_p->name,
1096	<	source_p->username, source_p->host);
1097	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1098	<	get_listener_name(source_p->localClient->listener), ircd_version);
1099	<	sendto_one(source_p, form_str(RPL_CREATED),
1100	<	me.name, source_p->name, built_date);
1101	<	sendto_one(source_p, form_str(RPL_MYINFO),
1102	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1103	<	show_isupport(source_p);
1104	<
1105	<	if (source_p->id[0] != '\0')
1106	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1107	<	source_p->name, source_p->id);
920	>	}
921
922	<	show_lusers(source_p);
922	>	if (!ConfigFileEntry.cycle_on_host_change)
923	>	return;
924
925	<	if (ConfigFileEntry.short_motd)
925	>	DLINK_FOREACH(ptr, target_p->channel.head)
926		{
927	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
928	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
929	<	sendto_one(source_p,
930	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1117	<	"read it", me.name, source_p->name);
1118	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1119	<	me.name, source_p->name, me.name);
1120	<	sendto_one(source_p, form_str(RPL_MOTD),
1121	<	me.name, source_p->name,
1122	<	"*** This is the short motd ***");
1123	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1124	<	me.name, source_p->name);
1125	<	}
1126	<	else
1127	<	send_message_file(source_p, &ConfigFileEntry.motd);
1128	<	}
927	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
928	>	char *p = modebuf;
929	>	int len = 0;
930	>	const struct Membership *ms = ptr->data;
931
932	<	/* check_xline()
933	<	*
934	<	* inputs       - pointer to client to test
935	<	* outupt       - 1 if exiting 0 if ok
936	<	* side effects -
1135	<	*/
1136	<	static int
1137	<	check_xline(struct Client *source_p)
1138	<	{
1139	<	struct MaskItem *conf = NULL;
1140	<	const char *reason = NULL;
932	>	if (has_member_flags(ms, CHFL_CHANOP))
933	>	{
934	>	*p++ = 'o';
935	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
936	>	}
937
938	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
939	<	{
940	<	++conf->count;
938	>	if (has_member_flags(ms, CHFL_HALFOP))
939	>	{
940	>	*p++ = 'h';
941	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
942	>	}
943
944	<	if (conf->reason != NULL)
945	<	reason = conf->reason;
946	<	else
947	<	reason = "No Reason";
944	>	if (has_member_flags(ms, CHFL_VOICE))
945	>	{
946	>	*p++ = 'v';
947	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
948	>	}
949
950	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1152	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1153	<	source_p->info, reason,
1154	<	get_client_name(source_p, HIDE_IP),
1155	<	source_p->sockhost);
950	>	*p = '\0';
951
952	<	++ServerStats.is_ref;
953	<	exit_client(source_p, &me, "Bad user info");
954	<	return 1;
955	<	}
952	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
953	>	target_p->name, target_p->username, target_p->host,
954	>	ms->chptr->chname);
955	>	if (nickbuf[0])
956	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
957	>	target_p->servptr->name, ms->chptr->chname,
958	>	modebuf, nickbuf);
959
960	<	return 0;
1163	<	}
960	>	}
961
962	<	/* oper_up()
963	<	*
964	<	* inputs       - pointer to given client to oper
965	<	* output       - NONE
966	<	* side effects - Blindly opers up given source_p, using conf info
967	<	*                all checks on passwords have already been done.
968	<	*                This could also be used by rsa oper routines.
962	>	if (target_p->away[0])
963	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
964	>	":%s!%s@%s AWAY :%s",
965	>	target_p->name, target_p->username,
966	>	target_p->host, target_p->away);
967	>	}
968	>
969	>	/*! \brief Blindly opers up given source_p, using conf info.
970	>	*         All checks on passwords have already been done.
971	>	* \param source_p Pointer to given client to oper
972		*/
973		void
974		oper_up(struct Client *source_p)
#	Line 1202 | Line 1002 | oper_up(struct Client *source_p)
1002		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1003		get_oper_name(source_p));
1004		send_umode_out(source_p, source_p, old);
1005	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1005	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1006		}
1007
1008	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1008	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
1009
1010		int
1011		valid_sid(const char *sid)
#	Line 1220 | Line 1020 | valid_sid(const char *sid)
1020
1021		/*
1022		* init_uid()
1023	<	*
1023	>	*
1024		* inputs       - NONE
1025		* output       - NONE
1026		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1230 | Line 1030 | valid_sid(const char *sid)
1030		void
1031		init_uid(void)
1032		{
1233	–	unsigned int i;
1234	–
1033		memset(new_uid, 0, sizeof(new_uid));
1034
1035		if (!EmptyString(ServerInfo.sid))
1036		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1037
1038	<	for (i = 0; i < IRC_MAXSID; ++i)
1039	<	if (new_uid[i] == '\0')
1038	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1039	>	if (new_uid[i] == '\0')
1040		new_uid[i] = 'A';
1041
1042		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1245	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1246	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1247	–	* -Dianora
1248	–	*/
1043		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1044		}
1045
#	Line 1260 | Line 1054 | init_uid(void)
1054		static void
1055		add_one_to_uid(int i)
1056		{
1057	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1057	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1058		{
1059		if (new_uid[i] == 'Z')
1060		new_uid[i] = '0';
#	Line 1292 | Line 1086 | add_one_to_uid(int i)
1086		static const char *
1087		uid_get(void)
1088		{
1089	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1089	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1090		return new_uid;
1091		}
1092
#	Line 1306 | Line 1100 | uid_get(void)
1100		void
1101		init_isupport(void)
1102		{
1309	–	isupportFile = init_MessageLine();
1310	–
1103		add_isupport("CALLERID", NULL, -1);
1104		add_isupport("CASEMAPPING", CASEMAP, -1);
1105		add_isupport("DEAF", "D", -1);
#	Line 1320 | Line 1112 | init_isupport(void)
1112		add_isupport("PREFIX", "(ov)@+", -1);
1113		add_isupport("STATUSMSG", "@+", -1);
1114		#endif
1115	+	add_isupport("EXCEPTS", "e", -1);
1116	+	add_isupport("INVEX", "I", -1);
1117		}
1118
1119		/*
#	Line 1350 | Line 1144 | add_isupport(const char *name, const cha
1144
1145		if (ptr == NULL)
1146		{
1147	<	support = MyMalloc(sizeof(*support));
1147	>	support = MyCalloc(sizeof(*support));
1148		dlinkAddTail(support, &support->node, &support_list);
1149		}
1150
1151		support->name = xstrdup(name);
1152	<	if (options != NULL)
1152	>	if (options)
1153		support->options = xstrdup(options);
1154		support->number = n;
1155
#	Line 1403 | Line 1197 | rebuild_isupport_message_line(void)
1197		{
1198		char isupportbuffer[IRCD_BUFSIZE];
1199		char *p = isupportbuffer;
1200	<	dlink_node *ptr = NULL;
1200	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1201		int n = 0;
1202		int tokens = 0;
1203		size_t len = 0;
1204	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1204	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1205
1206	<	destroy_MessageLine(isupportFile);
1206	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1207	>	{
1208	>	dlinkDelete(ptr, &support_list_lines);
1209	>	MyFree(ptr->data);
1210	>	free_dlink_node(ptr);
1211	>	}
1212
1213		DLINK_FOREACH(ptr, support_list.head)
1214		{
#	Line 1418 | Line 1217 | rebuild_isupport_message_line(void)
1217		p += (n = sprintf(p, "%s", support->name));
1218		len += n;
1219
1220	<	if (support->options != NULL)
1220	>	if (support->options)
1221		{
1222		p += (n = sprintf(p, "=%s", support->options));
1223		len += n;
#	Line 1439 | Line 1238 | rebuild_isupport_message_line(void)
1238		if (*--p == ' ')
1239		*p = '\0';
1240
1241	<	addto_MessageLine(isupportFile, isupportbuffer);
1241	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1242		p = isupportbuffer;
1243		len = 0;
1244		n = tokens = 0;
1245		}
1246		}
1247
1248	<	if (len != 0)
1248	>	if (len)
1249		{
1250		if (*--p == ' ')
1251		*p = '\0';
1252	<	addto_MessageLine(isupportFile, isupportbuffer);
1252	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1253		}
1254		}

Diff Legend

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