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 1857 by michael, Wed Apr 24 20:47:21 2013 UTC vs.
Revision 3316 by michael, Tue Apr 15 14:09:39 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 "fdlist.h"
34		#include "hash.h"
35		#include "irc_string.h"
35	–	#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
38		#include "motd.h"
#	Line 42 | Line 42
42		#include "s_serv.h"
43		#include "send.h"
44		#include "supported.h"
45	–	#include "whowas.h"
45		#include "memory.h"
46		#include "packet.h"
47		#include "rng_mt.h"
48		#include "userhost.h"
50	–	#include "hook.h"
49		#include "s_misc.h"
50		#include "parse.h"
51		#include "watch.h"
52
55	–
56	–	struct Callback *entering_umode_cb = NULL;
57	–	struct Callback *umode_cb = NULL;
58	–
53		static char umode_buffer[IRCD_BUFSIZE];
60	–
61	–	static void user_welcome(struct Client *);
62	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
63	–	static int check_xline(struct Client *);
64	–	static void introduce_client(struct Client *);
54		static const char *uid_get(void);
55
56		/* Used for building up the isupport string,
57		* used with init_isupport, add_isupport, delete_isupport
58		*/
59	<
71	<	struct Isupport
59	>	struct Isupport
60		{
61		dlink_node node;
62		char *name;
#	Line 76 | Line 64 | struct Isupport
64		int number;
65		};
66
67	<	static dlink_list support_list = { NULL, NULL, 0 };
68	<	MessageFile *isupportFile;
67	>	static dlink_list support_list;
68	>	static dlink_list support_list_lines;
69
70		/* memory is cheap. map 0-255 to equivalent mode */
71	<	unsigned int user_modes[256] =
71	>	const unsigned int user_modes[256] =
72		{
73		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
74		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 89 | Line 77 | unsigned int user_modes[256] =
77		0,                  /* @ */
78		0,                  /* A */
79		0,                  /* B */
80	<	UMODE_CCONN_FULL,   /* C */
80	>	0,                  /* C */
81		UMODE_DEAF,         /* D */
82		0,                  /* E */
83	<	0,                  /* F */
83	>	UMODE_FARCONNECT,   /* F */
84		UMODE_SOFTCALLERID, /* G */
85		UMODE_HIDDEN,       /* H */
86		0,                  /* I */
#	Line 105 | Line 93 | unsigned int user_modes[256] =
93		0,                  /* P */
94		0,                  /* Q */
95		UMODE_REGONLY,      /* R */
96	<	0,                  /* S */
96	>	UMODE_SSL,          /* S */
97		0,                  /* T */
98		0,                  /* U */
99		0,                  /* V */
100	<	0,                  /* W */
100	>	UMODE_WEBIRC,       /* W */
101		0,                  /* X */
102		0,                  /* Y */
103		0,                  /* Z 0x5A */
104	<	0, 0, 0, 0, 0,      /* 0x5F   */
104	>	0, 0, 0, 0, 0,      /* 0x5F   */
105		0,                  /* 0x60   */
106		UMODE_ADMIN,        /* a */
107		UMODE_BOTS,         /* b */
#	Line 138 | Line 126 | unsigned int user_modes[256] =
126		UMODE_UNAUTH,       /* u */
127		0,                  /* v */
128		UMODE_WALLOP,       /* w */
129	<	0,                  /* x */
129	>	UMODE_HIDDENHOST,   /* x */
130		UMODE_SPY,          /* y */
131		UMODE_OPERWALL,     /* z      0x7A */
132		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 173 | Line 161 | assemble_umode_buffer(void)
161		* side effects - display to client user counts etc.
162		*/
163		void
164	<	show_lusers(struct Client *source_p)
164	>	show_lusers(struct Client *source_p)
165		{
178	–	const char *from, *to;
179	–
180	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
181	–	{
182	–	from = me.id;
183	–	to = source_p->id;
184	–	}
185	–	else
186	–	{
187	–	from = me.name;
188	–	to = source_p->name;
189	–	}
190	–
166		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
167	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
168	<	from, to, (Count.total-Count.invisi),
194	<	Count.invisi, dlink_list_length(&global_serv_list));
167	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
168	>	Count.invisi, dlink_list_length(&global_serv_list));
169		else
170	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
171	<	(Count.total-Count.invisi), Count.invisi, 1);
170	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
171	>	(Count.total-Count.invisi), Count.invisi, 1);
172
173		if (Count.oper > 0)
174	<	sendto_one(source_p, form_str(RPL_LUSEROP),
201	<	from, to, Count.oper);
174	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
175
176		if (dlink_list_length(&unknown_list) > 0)
177	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
205	<	from, to, dlink_list_length(&unknown_list));
177	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
178
179		if (dlink_list_length(&global_channel_list) > 0)
180	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
209	<	from, to, dlink_list_length(&global_channel_list));
180	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
181
182		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
183		{
184	<	sendto_one(source_p, form_str(RPL_LUSERME),
185	<	from, to, Count.local, Count.myserver);
215	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
216	<	from, to, Count.local, Count.max_loc);
184	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
185	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
186		}
187		else
188		{
189	<	sendto_one(source_p, form_str(RPL_LUSERME),
190	<	from, to, Count.total, 0);
222	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
223	<	from, to, Count.total, Count.max_tot);
189	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
190	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
191		}
192
193	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
227	<	from, to, Count.total, Count.max_tot);
193	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
194
195		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
196	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
197	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
196	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
197	>	Count.max_loc_cli, Count.totalrestartcount);
198
199		if (Count.local > Count.max_loc_cli)
200		Count.max_loc_cli = Count.local;
201
202		if ((Count.local + Count.myserver) > Count.max_loc_con)
203	<	Count.max_loc_con = Count.local + Count.myserver;
203	>	Count.max_loc_con = Count.local + Count.myserver;
204		}
205
206		/* show_isupport()
#	Line 244 | Line 210 | show_lusers(struct Client *source_p)
210		* side effects - display to client what we support (for them)
211		*/
212		void
213	<	show_isupport(struct Client *source_p)
213	>	show_isupport(struct Client *source_p)
214	>	{
215	>	const dlink_node *ptr = NULL;
216	>
217	>	DLINK_FOREACH(ptr, support_list_lines.head)
218	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
219	>	}
220	>
221	>
222	>	/* report_and_set_user_flags()
223	>	*
224	>	* inputs       - pointer to source_p
225	>	*              - pointer to conf for this user
226	>	* output       - NONE
227	>	* side effects - Report to user any special flags
228	>	*                they are getting, and set them.
229	>	*/
230	>	static void
231	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
232	>	{
233	>	/* If this user is being spoofed, tell them so */
234	>	if (IsConfDoSpoofIp(conf))
235	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
236	>
237	>	/* If this user is in the exception class, Set it "E lined" */
238	>	if (IsConfExemptKline(conf))
239	>	{
240	>	SetExemptKline(source_p);
241	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
242	>	}
243	>
244	>	/*
245	>	* The else here is to make sure that G line exempt users
246	>	* do not get noticed twice.
247	>	*/
248	>	else if (IsConfExemptGline(conf))
249	>	{
250	>	SetExemptGline(source_p);
251	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
252	>	}
253	>
254	>	if (IsConfExemptResv(conf))
255	>	{
256	>	SetExemptResv(source_p);
257	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
258	>	}
259	>
260	>	/* If this user is exempt from user limits set it "F lined" */
261	>	if (IsConfExemptLimits(conf))
262	>	{
263	>	SetExemptLimits(source_p);
264	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
265	>	}
266	>
267	>	if (IsConfCanFlood(conf))
268	>	{
269	>	SetCanFlood(source_p);
270	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
271	>	"protection, aren't you fearsome.");
272	>	}
273	>	}
274	>
275	>	/* introduce_client()
276	>	*
277	>	* inputs       - source_p
278	>	* output       - NONE
279	>	* side effects - This common function introduces a client to the rest
280	>	*                of the net, either from a local client connect or
281	>	*                from a remote connect.
282	>	*/
283	>	static void
284	>	introduce_client(struct Client *source_p)
285	>	{
286	>	dlink_node *ptr = NULL;
287	>	char ubuf[IRCD_BUFSIZE] = "";
288	>
289	>	if (MyClient(source_p))
290	>	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
291	>	else
292	>	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
293	>
294	>	watch_check_hash(source_p, RPL_LOGON);
295	>
296	>	if (ubuf[0] == '\0')
297	>	{
298	>	ubuf[0] = '+';
299	>	ubuf[1] = '\0';
300	>	}
301	>
302	>	DLINK_FOREACH(ptr, serv_list.head)
303	>	{
304	>	struct Client *server = ptr->data;
305	>
306	>	if (server == source_p->from)
307	>	continue;
308	>
309	>	if (IsCapable(server, CAP_SVS))
310	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
311	>	source_p->servptr->id,
312	>	source_p->name, source_p->hopcount+1,
313	>	(unsigned long)source_p->tsinfo,
314	>	ubuf, source_p->username, source_p->host,
315	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
316	>	"0" : source_p->sockhost, source_p->id,
317	>	source_p->svid,
318	>	source_p->info);
319	>	else
320	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
321	>	source_p->servptr->id,
322	>	source_p->name, source_p->hopcount+1,
323	>	(unsigned long)source_p->tsinfo,
324	>	ubuf, source_p->username, source_p->host,
325	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
326	>	"0" : source_p->sockhost, source_p->id, source_p->info);
327	>
328	>	if (!EmptyString(source_p->certfp))
329	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
330	>	}
331	>	}
332	>
333	>	/* user_welcome()
334	>	*
335	>	* inputs       - client pointer to client to welcome
336	>	* output       - NONE
337	>	* side effects -
338	>	*/
339	>	static void
340	>	user_welcome(struct Client *source_p)
341		{
342	<	send_message_file(source_p, isupportFile);
342	>	#if defined(__TIME__) && defined(__DATE__)
343	>	static const char built_date[] = __DATE__ " at " __TIME__;
344	>	#else
345	>	static const char built_date[] = "unknown";
346	>	#endif
347	>
348	>	#ifdef HAVE_LIBCRYPTO
349	>	if (HasFlag(source_p, FLAGS_SSL))
350	>	{
351	>	AddUMode(source_p, UMODE_SSL);
352	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
353	>	ssl_get_cipher(source_p->localClient->fd.ssl));
354	>	}
355	>	#endif
356	>
357	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
358	>	source_p->name);
359	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
360	>	get_listener_name(source_p->localClient->listener), ircd_version);
361	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
362	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
363	>	show_isupport(source_p);
364	>
365	>	if (source_p->id[0])
366	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
367	>
368	>	show_lusers(source_p);
369	>	motd_signon(source_p);
370	>	}
371	>
372	>	/* check_xline()
373	>	*
374	>	* inputs       - pointer to client to test
375	>	* outupt       - 1 if exiting 0 if ok
376	>	* side effects -
377	>	*/
378	>	static int
379	>	check_xline(struct Client *source_p)
380	>	{
381	>	struct MaskItem *conf = NULL;
382	>	const char *reason = NULL;
383	>
384	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
385	>	{
386	>	++conf->count;
387	>
388	>	if (conf->reason)
389	>	reason = conf->reason;
390	>	else
391	>	reason = CONF_NOREASON;
392	>
393	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
394	>	"X-line Rejecting [%s] [%s], user %s [%s]",
395	>	source_p->info, reason,
396	>	get_client_name(source_p, HIDE_IP),
397	>	source_p->sockhost);
398	>
399	>	++ServerStats.is_ref;
400	>	exit_client(source_p, "Bad user info");
401	>	return 1;
402	>	}
403	>
404	>	return 0;
405		}
406
407		/*
408	<	** register_local_user
409	<	**      This function is called when both NICK and USER messages
410	<	**      have been accepted for the client, in whatever order. Only
411	<	**      after this, is the USER message propagated.
412	<	**
413	<	**      NICK's must be propagated at once when received, although
414	<	**      it would be better to delay them too until full info is
415	<	**      available. Doing it is not so simple though, would have
416	<	**      to implement the following:
417	<	**
418	<	**      (actually it has been implemented already for a while) -orabidoo
419	<	**
420	<	**      1) user telnets in and gives only "NICK foobar" and waits
421	<	**      2) another user far away logs in normally with the nick
422	<	**         "foobar" (quite legal, as this server didn't propagate
268	<	**         it).
269	<	**      3) now this server gets nick "foobar" from outside, but
270	<	**         has alread the same defined locally. Current server
271	<	**         would just issue "KILL foobar" to clean out dups. But,
272	<	**         this is not fair. It should actually request another
273	<	**         nick from local user or kill him/her...
274	<	*/
408	>	* register_local_user
409	>	*      This function is called when both NICK and USER messages
410	>	*      have been accepted for the client, in whatever order. Only
411	>	*      after this, is the UID message propagated.
412	>	*
413	>	*      1) user telnets in and gives only "NICK foobar" and waits
414	>	*      2) another user far away logs in normally with the nick
415	>	*         "foobar" (quite legal, as this server didn't propagate
416	>	*         it).
417	>	*      3) now this server gets nick "foobar" from outside, but
418	>	*         has alread the same defined locally. Current server
419	>	*         would just issue "KILL foobar" to clean out dups. But,
420	>	*         this is not fair. It should actually request another
421	>	*         nick from local user or kill him/her...
422	>	*/
423		void
424		register_local_user(struct Client *source_p)
425		{
426		const char *id = NULL;
427		const struct MaskItem *conf = NULL;
428
281	–	assert(source_p != NULL);
429		assert(source_p == source_p->from);
430		assert(MyConnect(source_p));
431		assert(!source_p->localClient->registration);
#	Line 287 | Line 434 | register_local_user(struct Client *sourc
434
435		if (ConfigFileEntry.ping_cookie)
436		{
437	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
437	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
438		{
439		do
440		source_p->localClient->random_ping = genrand_int32();
#	Line 310 | Line 457 | register_local_user(struct Client *sourc
457		if (!check_client(source_p))
458		return;
459
460	<	if (valid_hostname(source_p->host) == 0)
460	>	if (!valid_hostname(source_p->host))
461		{
462	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
463	<	"character in your hostname", me.name, source_p->name);
462	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
463	>	"character in your hostname");
464		strlcpy(source_p->host, source_p->sockhost,
465		sizeof(source_p->host));
466		}
#	Line 322 | Line 469 | register_local_user(struct Client *sourc
469
470		if (!IsGotId(source_p))
471		{
472	<	char username[USERLEN + 1];
472	>	char username[USERLEN + 1] = "";
473		const char *p = username;
474		unsigned int i = 0;
475
476		if (IsNeedIdentd(conf))
477		{
478		++ServerStats.is_ref;
479	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
480	<	"identd to use this server", me.name, source_p->name);
481	<	exit_client(source_p, &me, "Install identd");
479	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
480	>	"identd to use this server");
481	>	exit_client(source_p, "Install identd");
482		return;
483		}
484
#	Line 355 | Line 502 | register_local_user(struct Client *sourc
502		if (!match_conf_password(pass, conf))
503		{
504		++ServerStats.is_ref;
505	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
506	<	me.name, source_p->name);
507	<	exit_client(source_p, &me, "Bad Password");
505	>
506	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
507	>	exit_client(source_p, "Bad Password");
508		return;
509		}
510		}
#	Line 388 | Line 535 | register_local_user(struct Client *sourc
535		"Too many clients, rejecting %s[%s].",
536		source_p->name, source_p->host);
537		++ServerStats.is_ref;
538	<	exit_client(source_p, &me, "Sorry, server is full - try later");
538	>	exit_client(source_p, "Sorry, server is full - try later");
539		return;
540		}
541
542		/* valid user name check */
543	<	if (valid_username(source_p->username) == 0)
543	>	if (!valid_username(source_p->username, 1))
544		{
545	<	char tmpstr2[IRCD_BUFSIZE];
545	>	char tmpstr2[IRCD_BUFSIZE] = "";
546
547		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
548		"Invalid username: %s (%s@%s)",
#	Line 403 | Line 550 | register_local_user(struct Client *sourc
550		++ServerStats.is_ref;
551		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
552		source_p->username);
553	<	exit_client(source_p, &me, tmpstr2);
553	>	exit_client(source_p, tmpstr2);
554		return;
555		}
556
557		if (check_xline(source_p))
558		return;
559
560	<	while (hash_find_id((id = uid_get())) != NULL)
560	>	while (hash_find_id((id = uid_get())))
561		;
562
563		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 424 | Line 571 | register_local_user(struct Client *sourc
571		get_client_class(&source_p->localClient->confs),
572		source_p->info, source_p->id);
573
427	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
428	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
429	–	source_p->name, source_p->username, source_p->host,
430	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	–	"255.255.255.255" : source_p->sockhost,
432	–	get_client_class(&source_p->localClient->confs),
433	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434	–	"<hidden>" : source_p->localClient->client_host,
435	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436	–	"<hidden>" : source_p->localClient->client_server,
437	–	source_p->info);
438	–
439	–
574		if (ConfigFileEntry.invisible_on_connect)
575		{
576		AddUMode(source_p, UMODE_INVISIBLE);
577		++Count.invisi;
578		}
579
580	<	if ((++Count.local) > Count.max_loc)
580	>	if (++Count.local > Count.max_loc)
581		{
582		Count.max_loc = Count.local;
583
#	Line 482 | Line 616 | register_local_user(struct Client *sourc
616		*              - username to register as
617		*              - host name to register as
618		*              - server name
485	–	*              - realname (gecos)
619		* output       - NONE
620		* side effects - This function is called when a remote client
621		*                is introduced by a server.
622		*/
623		void
624	<	register_remote_user(struct Client *source_p,
625	<	const char *username, const char *host, const char *server,
493	<	const char *realname)
624	>	register_remote_user(struct Client *source_p, const char *username,
625	>	const char *host, const char *server)
626		{
627		struct Client *target_p = NULL;
628
497	–	assert(source_p != NULL);
629		assert(source_p->username != username);
630
631	<	strlcpy(source_p->host, host, sizeof(source_p->host));
631	>	strlcpy(source_p->host, host, sizeof(source_p->host));
632		strlcpy(source_p->username, username, sizeof(source_p->username));
633
634		/*
#	Line 516 | Line 647 | register_remote_user(struct Client *sour
647		"No server %s for user %s[%s@%s] from %s",
648		server, source_p->name, source_p->username,
649		source_p->host, source_p->from->name);
650	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
650	>	sendto_one(source_p->from,
651	>	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
652	>	me.id, source_p->id, me.name, server);
653
654		AddFlag(source_p, FLAGS_KILLED);
655	<	exit_client(source_p, &me, "Ghosted Client");
655	>	exit_client(source_p, "Ghosted Client");
656		return;
657		}
658
#	Line 530 | Line 663 | register_remote_user(struct Client *sour
663		source_p->from->name, source_p->name, source_p->username,
664		source_p->host, source_p->servptr->name,
665		target_p->name, target_p->from->name);
666	<	kill_client(source_p->from, source_p,
667	<	"%s (NICK from wrong direction (%s != %s))",
668	<	me.name, source_p->servptr->name, target_p->from->name);
666	>	sendto_one(source_p->from,
667	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
668	>	me.id, source_p->id, me.name, source_p->servptr->name,
669	>	target_p->from->name);
670	>
671		AddFlag(source_p, FLAGS_KILLED);
672	<	exit_client(source_p, &me, "USER server wrong direction");
672	>	exit_client(source_p, "USER server wrong direction");
673		return;
674		}
675
#	Line 554 | Line 689 | register_remote_user(struct Client *sour
689		add_user_host(source_p->username, source_p->host, 1);
690		SetUserHost(source_p);
691
692	<	introduce_client(source_p);
693	<	}
694	<
695	<	/* introduce_client()
696	<	*
697	<	* inputs       - source_p
563	<	* output       - NONE
564	<	* side effects - This common function introduces a client to the rest
565	<	*                of the net, either from a local client connect or
566	<	*                from a remote connect.
567	<	*/
568	<	static void
569	<	introduce_client(struct Client *source_p)
570	<	{
571	<	dlink_node *server_node = NULL;
572	<	static char ubuf[12];
573	<
574	<	if (MyClient(source_p))
575	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
576	<	else
577	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
578	<
579	<	watch_check_hash(source_p, RPL_LOGON);
580	<
581	<	if (*ubuf == '\0')
582	<	{
583	<	ubuf[0] = '+';
584	<	ubuf[1] = '\0';
585	<	}
586	<
587	<	DLINK_FOREACH(server_node, serv_list.head)
588	<	{
589	<	struct Client *server = server_node->data;
590	<
591	<	if (server == source_p->from)
592	<	continue;
593	<
594	<	if (IsCapable(server, CAP_SVS))
595	<	{
596	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
597	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
598	<	source_p->servptr->id,
599	<	source_p->name, source_p->hopcount+1,
600	<	(unsigned long)source_p->tsinfo,
601	<	ubuf, source_p->username, source_p->host,
602	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
603	<	"0" : source_p->sockhost, source_p->id,
604	<	source_p->svid,
605	<	source_p->info);
606	<	else
607	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
608	<	source_p->name, source_p->hopcount+1,
609	<	(unsigned long)source_p->tsinfo,
610	<	ubuf, source_p->username, source_p->host,
611	<	source_p->servptr->name, source_p->svid,
612	<	source_p->info);
692	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
693	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
694	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
695	>	source_p->servptr->name,
696	>	source_p->name, source_p->username, source_p->host,
697	>	source_p->info, source_p->id);
698
699	<	}
615	<	else
616	<	{
617	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
618	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
619	<	source_p->servptr->id,
620	<	source_p->name, source_p->hopcount+1,
621	<	(unsigned long)source_p->tsinfo,
622	<	ubuf, source_p->username, source_p->host,
623	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
624	<	"0" : source_p->sockhost, source_p->id, source_p->info);
625	<	else
626	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
627	<	source_p->name, source_p->hopcount+1,
628	<	(unsigned long)source_p->tsinfo,
629	<	ubuf, source_p->username, source_p->host,
630	<	source_p->servptr->name, source_p->info);
631	<	}
632	<	}
699	>	introduce_client(source_p);
700		}
701
702		/* valid_hostname()
#	Line 646 | Line 713 | valid_hostname(const char *hostname)
713		{
714		const char *p = hostname;
715
716	<	assert(p != NULL);
716	>	assert(p);
717
718	<	if (*p == '.' || *p == ':')
718	>	if (EmptyString(p) || *p == '.' || *p == ':')
719		return 0;
720
721		for (; *p; ++p)
#	Line 670 | Line 737 | valid_hostname(const char *hostname)
737		* style of username
738		*/
739		int
740	<	valid_username(const char *username)
740	>	valid_username(const char *username, const int local)
741		{
742		int dots      = 0;
743		const char *p = username;
744
745	<	assert(p != NULL);
745	>	assert(p);
746
747		if (*p == '~')
748		++p;
749
750	<	/* reject usernames that don't start with an alphanum
750	>	/*
751	>	* Reject usernames that don't start with an alphanum
752		* i.e. reject jokers who have '-@somehost' or '.@somehost'
753		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
754		*/
755		if (!IsAlNum(*p))
756		return 0;
757
758	<	while (*++p)
758	>	if (local)
759		{
760	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
760	>	while (*++p)
761		{
762	<	if (++dots > ConfigFileEntry.dots_in_ident)
763	<	return 0;
764	<	if (!IsUserChar(*(p + 1)))
762	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
763	>	{
764	>	if (++dots > ConfigFileEntry.dots_in_ident)
765	>	return 0;
766	>	if (!IsUserChar(*(p + 1)))
767	>	return 0;
768	>	}
769	>	else if (!IsUserChar(*p))
770		return 0;
771		}
772	<	else if (!IsUserChar(*p))
773	<	return 0;
772	>	}
773	>	else
774	>	{
775	>	while (*++p)
776	>	if (!IsUserChar(*p))
777	>	return 0;
778		}
779
780	<	return 1;
780	>	return  p - username <= USERLEN;;
781		}
782
783		/* clean_nick_name()
#	Line 716 | Line 793 | valid_nickname(const char *nickname, con
793		const char *p = nickname;
794		assert(nickname && *nickname);
795
796	+	assert(p);
797	+
798		/* nicks can't start with a digit or - or be 0 length */
799		/* This closer duplicates behaviour of hybrid-6 */
800		if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
#	Line 728 | Line 807 | valid_nickname(const char *nickname, con
807		return p - nickname <= NICKLEN;
808		}
809
731	–	/* report_and_set_user_flags()
732	–	*
733	–	* inputs       - pointer to source_p
734	–	*              - pointer to conf for this user
735	–	* output       - NONE
736	–	* side effects - Report to user any special flags
737	–	*                they are getting, and set them.
738	–	*/
739	–	static void
740	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
741	–	{
742	–	/* If this user is being spoofed, tell them so */
743	–	if (IsConfDoSpoofIp(conf))
744	–	{
745	–	sendto_one(source_p,
746	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
747	–	me.name, source_p->name);
748	–	}
749	–
750	–	/* If this user is in the exception class, Set it "E lined" */
751	–	if (IsConfExemptKline(conf))
752	–	{
753	–	SetExemptKline(source_p);
754	–	sendto_one(source_p,
755	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
756	–	me.name, source_p->name);
757	–	}
758	–
759	–	/* The else here is to make sure that G line exempt users
760	–	* do not get noticed twice.
761	–	*/
762	–	else if (IsConfExemptGline(conf))
763	–	{
764	–	SetExemptGline(source_p);
765	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
766	–	me.name, source_p->name);
767	–	}
768	–
769	–	if (IsConfExemptResv(conf))
770	–	{
771	–	SetExemptResv(source_p);
772	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
773	–	me.name, source_p->name);
774	–	}
775	–
776	–	/* If this user is exempt from user limits set it "F lined" */
777	–	if (IsConfExemptLimits(conf))
778	–	{
779	–	SetExemptLimits(source_p);
780	–	sendto_one(source_p,
781	–	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
782	–	me.name,source_p->name);
783	–	}
784	–
785	–	if (IsConfCanFlood(conf))
786	–	{
787	–	SetCanFlood(source_p);
788	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
789	–	"protection, aren't you fearsome.",
790	–	me.name, source_p->name);
791	–	}
792	–	}
793	–
794	–	/* change_simple_umode()
795	–	*
796	–	* this callback can be hooked to allow special handling of
797	–	* certain usermodes
798	–	*/
799	–	static void *
800	–	change_simple_umode(va_list args)
801	–	{
802	–	struct Client *client_p;
803	–	struct Client *source_p;
804	–	int what;
805	–	unsigned int flag;
806	–
807	–	client_p = va_arg(args, struct Client *);
808	–	source_p = va_arg(args, struct Client *);
809	–	what = va_arg(args, int);
810	–	flag = va_arg(args, unsigned int);
811	–
812	–	if (what == MODE_ADD)
813	–	AddUMode(source_p, flag);
814	–	else
815	–	DelUMode(source_p, flag);
816	–
817	–	return NULL;
818	–	}
819	–
820	–	/* set_user_mode()
821	–	*
822	–	* added 15/10/91 By Darren Reed.
823	–	* parv[0] - sender
824	–	* parv[1] - username to change mode for
825	–	* parv[2] - modes to change
826	–	*/
827	–	void
828	–	set_user_mode(struct Client *client_p, struct Client *source_p,
829	–	const int parc, char *parv[])
830	–	{
831	–	unsigned int flag, setflags;
832	–	char **p, *m, buf[IRCD_BUFSIZE];
833	–	struct Client *target_p;
834	–	int what = MODE_ADD, badflag = 0, i;
835	–
836	–	assert(!(parc < 2));
837	–
838	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
839	–	{
840	–	if (MyConnect(source_p))
841	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
842	–	me.name, source_p->name, parv[1]);
843	–	return;
844	–	}
845	–
846	–	if (source_p != target_p)
847	–	{
848	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
849	–	me.name, source_p->name);
850	–	return;
851	–	}
852	–
853	–	if (parc < 3)
854	–	{
855	–	m = buf;
856	–	*m++ = '+';
857	–
858	–	for (i = 0; i < 128; i++)
859	–	if (HasUMode(source_p, user_modes[i]))
860	–	*m++ = (char)i;
861	–	*m = '\0';
862	–
863	–	sendto_one(source_p, form_str(RPL_UMODEIS),
864	–	me.name, source_p->name, buf);
865	–	return;
866	–	}
867	–
868	–	execute_callback(entering_umode_cb, client_p, source_p);
869	–
870	–	/* find flags already set for user */
871	–	setflags = source_p->umodes;
872	–
873	–	/* parse mode change string(s) */
874	–	for (p = &parv[2]; p && *p; p++)
875	–	{
876	–	for (m = *p; *m; m++)
877	–	{
878	–	switch (*m)
879	–	{
880	–	case '+':
881	–	what = MODE_ADD;
882	–	break;
883	–	case '-':
884	–	what = MODE_DEL;
885	–	break;
886	–	case 'o':
887	–	if (what == MODE_ADD)
888	–	{
889	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
890	–	{
891	–	++Count.oper;
892	–	SetOper(source_p);
893	–	}
894	–	}
895	–	else
896	–	{
897	–	/* Only decrement the oper counts if an oper to begin with
898	–	* found by Pat Szuta, Perly , perly@xnet.com
899	–	*/
900	–	if (!HasUMode(source_p, UMODE_OPER))
901	–	break;
902	–
903	–	ClearOper(source_p);
904	–	Count.oper--;
905	–
906	–	if (MyConnect(source_p))
907	–	{
908	–	dlink_node *dm;
909	–
910	–	detach_conf(source_p, CONF_OPER);
911	–	ClrOFlag(source_p);
912	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
913	–
914	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
915	–	free_dlink_node(dm);
916	–	}
917	–	}
918	–
919	–	break;
920	–
921	–	/* we may not get these,
922	–	* but they shouldnt be in default
923	–	*/
924	–	case 'r':
925	–	case ' ' :
926	–	case '\n':
927	–	case '\r':
928	–	case '\t':
929	–	break;
930	–
931	–	default:
932	–	if ((flag = user_modes[(unsigned char)*m]))
933	–	{
934	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
935	–	(ConfigFileEntry.oper_only_umodes & flag))
936	–	{
937	–	badflag = 1;
938	–	}
939	–	else
940	–	execute_callback(umode_cb, client_p, source_p, what, flag);
941	–	}
942	–	else
943	–	{
944	–	if (MyConnect(source_p))
945	–	badflag = 1;
946	–	}
947	–
948	–	break;
949	–	}
950	–	}
951	–	}
952	–
953	–	if (badflag)
954	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
955	–	me.name, source_p->name);
956	–
957	–	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
958	–	{
959	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
960	–	me.name, source_p->name);
961	–	DelUMode(source_p, UMODE_NCHANGE);
962	–	}
963	–
964	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
965	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
966	–	{
967	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
968	–	me.name, source_p->name);
969	–	DelUMode(source_p, UMODE_ADMIN);
970	–	}
971	–
972	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
973	–	++Count.invisi;
974	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
975	–	--Count.invisi;
976	–
977	–	/*
978	–	* compare new flags with old flags and send string which
979	–	* will cause servers to update correctly.
980	–	*/
981	–	send_umode_out(client_p, source_p, setflags);
982	–	}
983	–
810		/* send_umode()
811		* send the MODE string for user (user) to connection client_p
812		* -avalon
#	Line 1005 | Line 831 | send_umode(struct Client *client_p, stru
831		* build a string in umode_buf to represent the change in the user's
832		* mode between the new (source_p->umodes) and 'old'.
833		*/
834	<	for (i = 0; i < 128; i++)
834	>	for (i = 0; i < 128; ++i)
835		{
836		flag = user_modes[i];
837		if (!flag)
#	Line 1056 | Line 882 | void
882		send_umode_out(struct Client *client_p, struct Client *source_p,
883		unsigned int old)
884		{
885	<	char buf[IRCD_BUFSIZE] = { '\0' };
1060	<	dlink_node *ptr = NULL;
885	>	char buf[IRCD_BUFSIZE] = "";
886
887		send_umode(NULL, source_p, old, SEND_UMODES, buf);
888
889		if (buf[0])
890	<	{
891	<	DLINK_FOREACH(ptr, serv_list.head)
1067	<	{
1068	<	struct Client *target_p = ptr->data;
1069	<
1070	<	if ((target_p != client_p) && (target_p != source_p))
1071	<	sendto_one(target_p, ":%s MODE %s :%s",
1072	<	ID_or_name(source_p, target_p),
1073	<	ID_or_name(source_p, target_p), buf);
1074	<	}
1075	<	}
890	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
891	>	source_p->id, source_p->id, buf);
892
893		if (client_p && MyClient(client_p))
894		send_umode(client_p, source_p, old, 0xffffffff, buf);
895		}
896
897		void
898	<	user_set_hostmask(struct Client *target_p, const char *hostname)
898	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
899		{
900	<	if (!valid_hostname(hostname))
900	>	dlink_node *ptr = NULL;
901	>
902	>	if (!strcmp(target_p->host, hostname))
903		return;
904
905	+	switch (what)
906	+	{
907	+	case MODE_ADD:
908	+	AddUMode(target_p, UMODE_HIDDENHOST);
909	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
910	+	break;
911	+	case MODE_DEL:
912	+	DelUMode(target_p, UMODE_HIDDENHOST);
913	+
914	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
915	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
916	+	break;
917	+	default: return;
918	+	}
919	+
920	+	if (ConfigFileEntry.cycle_on_host_change)
921	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
922	+	target_p->name, target_p->username, target_p->host);
923	+
924		if (IsUserHostIp(target_p))
925		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
926
927		strlcpy(target_p->host, hostname, sizeof(target_p->host));
1091	–	SetIPSpoof(target_p);
928
929		add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
930		SetUserHost(target_p);
931
932		if (MyClient(target_p))
933	+	{
934	+	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
935		clear_ban_cache_client(target_p);
936	<	}
1099	<
1100	<	/* user_welcome()
1101	<	*
1102	<	* inputs       - client pointer to client to welcome
1103	<	* output       - NONE
1104	<	* side effects -
1105	<	*/
1106	<	static void
1107	<	user_welcome(struct Client *source_p)
1108	<	{
1109	<	#if defined(__TIME__) && defined(__DATE__)
1110	<	static const char built_date[] = __DATE__ " at " __TIME__;
1111	<	#else
1112	<	static const char built_date[] = "unknown";
1113	<	#endif
1114	<
1115	<	#ifdef HAVE_LIBCRYPTO
1116	<	if (source_p->localClient->fd.ssl != NULL)
1117	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1118	<	me.name, source_p->name,
1119	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1120	<	#endif
1121	<
1122	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1123	<	ServerInfo.network_name, source_p->name);
1124	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1125	<	get_listener_name(source_p->localClient->listener), ircd_version);
1126	<	sendto_one(source_p, form_str(RPL_CREATED),
1127	<	me.name, source_p->name, built_date);
1128	<	sendto_one(source_p, form_str(RPL_MYINFO),
1129	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1130	<	show_isupport(source_p);
1131	<
1132	<	if (source_p->id[0] != '\0')
1133	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1134	<	source_p->name, source_p->id);
936	>	}
937
938	<	show_lusers(source_p);
938	>	if (!ConfigFileEntry.cycle_on_host_change)
939	>	return;
940
941	<	if (ConfigFileEntry.short_motd)
941	>	DLINK_FOREACH(ptr, target_p->channel.head)
942		{
943	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
944	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
945	<	sendto_one(source_p,
946	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1144	<	"read it", me.name, source_p->name);
1145	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1146	<	me.name, source_p->name, me.name);
1147	<	sendto_one(source_p, form_str(RPL_MOTD),
1148	<	me.name, source_p->name,
1149	<	"*** This is the short motd ***");
1150	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1151	<	me.name, source_p->name);
1152	<	}
1153	<	else
1154	<	send_message_file(source_p, &ConfigFileEntry.motd);
1155	<	}
943	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
944	>	char *p = modebuf;
945	>	int len = 0;
946	>	const struct Membership *ms = ptr->data;
947
948	<	/* check_xline()
949	<	*
950	<	* inputs       - pointer to client to test
951	<	* outupt       - 1 if exiting 0 if ok
952	<	* side effects -
1162	<	*/
1163	<	static int
1164	<	check_xline(struct Client *source_p)
1165	<	{
1166	<	struct MaskItem *conf = NULL;
1167	<	const char *reason = NULL;
948	>	if (has_member_flags(ms, CHFL_CHANOP))
949	>	{
950	>	*p++ = 'o';
951	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
952	>	}
953
954	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
955	<	(conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
956	<	{
957	<	++conf->count;
954	>	if (has_member_flags(ms, CHFL_HALFOP))
955	>	{
956	>	*p++ = 'h';
957	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
958	>	}
959
960	<	if (conf->reason != NULL)
961	<	reason = conf->reason;
962	<	else
963	<	reason = "No Reason";
960	>	if (has_member_flags(ms, CHFL_VOICE))
961	>	{
962	>	*p++ = 'v';
963	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
964	>	}
965
966	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
967	<	"X-line Rejecting [%s] [%s], user %s [%s]",
968	<	source_p->info, reason,
969	<	get_client_name(source_p, HIDE_IP),
970	<	source_p->sockhost);
966	>	*p = '\0';
967	>
968	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
969	>	target_p->name, target_p->username, target_p->host,
970	>	ms->chptr->chname);
971	>	if (nickbuf[0])
972	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
973	>	target_p->servptr->name, ms->chptr->chname,
974	>	modebuf, nickbuf);
975
1185	–	++ServerStats.is_ref;
1186	–	exit_client(source_p, &me, "Bad user info");
1187	–	return 1;
976		}
977
978	<	return 0;
978	>	if (target_p->away[0])
979	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
980	>	":%s!%s@%s AWAY :%s",
981	>	target_p->name, target_p->username,
982	>	target_p->host, target_p->away);
983		}
984
985		/* oper_up()
#	Line 1196 | Line 988 | check_xline(struct Client *source_p)
988		* output       - NONE
989		* side effects - Blindly opers up given source_p, using conf info
990		*                all checks on passwords have already been done.
991	<	*                This could also be used by rsa oper routines.
991	>	*                This could also be used by rsa oper routines.
992		*/
993		void
994		oper_up(struct Client *source_p)
#	Line 1226 | Line 1018 | oper_up(struct Client *source_p)
1018
1019		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1020		AddUMode(source_p, UMODE_ADMIN);
1229	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1230	–	DelUMode(source_p, UMODE_NCHANGE);
1021
1022		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1023		get_oper_name(source_p));
1024		send_umode_out(source_p, source_p, old);
1025	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1025	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1026		}
1027
1028		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1250 | Line 1040 | valid_sid(const char *sid)
1040
1041		/*
1042		* init_uid()
1043	<	*
1043	>	*
1044		* inputs       - NONE
1045		* output       - NONE
1046		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1260 | Line 1050 | valid_sid(const char *sid)
1050		void
1051		init_uid(void)
1052		{
1263	–	unsigned int i;
1264	–
1053		memset(new_uid, 0, sizeof(new_uid));
1054
1055		if (!EmptyString(ServerInfo.sid))
1056		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1057
1058	<	for (i = 0; i < IRC_MAXSID; ++i)
1059	<	if (new_uid[i] == '\0')
1058	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1059	>	if (new_uid[i] == '\0')
1060		new_uid[i] = 'A';
1061
1062		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1275	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1276	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1277	–	* -Dianora
1278	–	*/
1063		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1280	–
1281	–	entering_umode_cb = register_callback("entering_umode", NULL);
1282	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1064		}
1065
1066		/*
#	Line 1339 | Line 1120 | uid_get(void)
1120		void
1121		init_isupport(void)
1122		{
1342	–	isupportFile = init_MessageLine();
1343	–
1123		add_isupport("CALLERID", NULL, -1);
1124		add_isupport("CASEMAPPING", CASEMAP, -1);
1125		add_isupport("DEAF", "D", -1);
#	Line 1353 | Line 1132 | init_isupport(void)
1132		add_isupport("PREFIX", "(ov)@+", -1);
1133		add_isupport("STATUSMSG", "@+", -1);
1134		#endif
1135	+	add_isupport("EXCEPTS", "e", -1);
1136	+	add_isupport("INVEX", "I", -1);
1137		}
1138
1139		/*
#	Line 1436 | Line 1217 | rebuild_isupport_message_line(void)
1217		{
1218		char isupportbuffer[IRCD_BUFSIZE];
1219		char *p = isupportbuffer;
1220	<	dlink_node *ptr = NULL;
1220	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1221		int n = 0;
1222		int tokens = 0;
1223		size_t len = 0;
1224	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1224	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1225
1226	<	destroy_MessageLine(isupportFile);
1226	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1227	>	{
1228	>	dlinkDelete(ptr, &support_list_lines);
1229	>	MyFree(ptr->data);
1230	>	free_dlink_node(ptr);
1231	>	}
1232
1233		DLINK_FOREACH(ptr, support_list.head)
1234		{
#	Line 1472 | Line 1258 | rebuild_isupport_message_line(void)
1258		if (*--p == ' ')
1259		*p = '\0';
1260
1261	<	addto_MessageLine(isupportFile, isupportbuffer);
1261	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1262		p = isupportbuffer;
1263		len = 0;
1264		n = tokens = 0;
#	Line 1483 | Line 1269 | rebuild_isupport_message_line(void)
1269		{
1270		if (*--p == ' ')
1271		*p = '\0';
1272	<	addto_MessageLine(isupportFile, isupportbuffer);
1272	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1273		}
1274		}

Diff Legend

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