ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/s_user.c (file contents), Revision 1309 by michael, Sun Mar 25 11:24:18 2012 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 3319 by michael, Tue Apr 15 15:41:50 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"
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 "sprintf_irc.h"
36	–	#include "s_bsd.h"
35		#include "ircd.h"
36		#include "listener.h"
37		#include "motd.h"
#	Line 43 | Line 41
41		#include "s_serv.h"
42		#include "send.h"
43		#include "supported.h"
46	–	#include "whowas.h"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
47		#include "userhost.h"
51	–	#include "hook.h"
48		#include "s_misc.h"
49		#include "parse.h"
50		#include "watch.h"
51
56	–
57	–	struct Callback *entering_umode_cb = NULL;
58	–	struct Callback *umode_cb = NULL;
59	–
52		static char umode_buffer[IRCD_BUFSIZE];
61	–
62	–	static void user_welcome(struct Client *);
63	–	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
64	–	static int check_xline(struct Client *);
65	–	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	<
72	<	struct Isupport
58	>	struct Isupport
59		{
60		dlink_node node;
61		char *name;
#	Line 77 | 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	<	unsigned int user_modes[256] =
70	>	const unsigned int user_modes[256] =
71		{
72		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
73		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 90 | Line 76 | 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	<	0,                  /* F */
82	>	UMODE_FARCONNECT,   /* F */
83		UMODE_SOFTCALLERID, /* G */
84		UMODE_HIDDEN,       /* H */
85		0,                  /* I */
#	Line 106 | Line 92 | 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 */
107		UMODE_CCONN,        /* c */
108		UMODE_DEBUG,        /* d */
109	<	0,                  /* e */
109	>	UMODE_EXTERNAL,     /* e */
110		UMODE_FULL,         /* f */
111		UMODE_CALLERID,     /* g */
112		0,                  /* h */
#	Line 139 | Line 125 | unsigned int user_modes[256] =
125		UMODE_UNAUTH,       /* u */
126		0,                  /* v */
127		UMODE_WALLOP,       /* w */
128	<	UMODE_EXTERNAL,     /* x */
128	>	UMODE_HIDDENHOST,   /* x */
129		UMODE_SPY,          /* y */
130		UMODE_OPERWALL,     /* z      0x7A */
131		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 174 | 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		{
179	–	const char *from, *to;
180	–
181	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
182	–	{
183	–	from = me.id;
184	–	to = source_p->id;
185	–	}
186	–	else
187	–	{
188	–	from = me.name;
189	–	to = source_p->name;
190	–	}
191	–
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),
195	<	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),
202	<	from, to, Count.oper);
173	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
174
175		if (dlink_list_length(&unknown_list) > 0)
176	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
206	<	from, to, 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) > 0)
179	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
210	<	from, to, 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);
216	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
217	<	from, to, Count.local, Count.max_loc,
218	<	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);
224	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
225	<	from, to, Count.total, Count.max_tot,
226	<	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),
230	<	from, to, Count.total, Count.max_tot,
231	<	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 248 | 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 AccessItem *aconf = NULL;
284	<	dlink_node *ptr = NULL;
415	>	const struct MaskItem *conf = NULL;
416
286	–	assert(source_p != NULL);
417		assert(source_p == source_p->from);
418		assert(MyConnect(source_p));
419		assert(!source_p->localClient->registration);
#	Line 292 | 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 312 | Line 442 | register_local_user(struct Client *sourc
442		/* Straight up the maximum rate of flooding... */
443		source_p->localClient->allow_read = MAX_FLOOD_BURST;
444
445	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
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		}
455
456	<	ptr   = source_p->localClient->confs.head;
327	<	aconf = map_to_conf(ptr->data);
456	>	conf = source_p->localClient->confs.head->data;
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(aconf))
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
473		strlcpy(username, source_p->username, sizeof(username));
474
475	<	if (!IsNoTilde(aconf))
475	>	if (!IsNoTilde(conf))
476		source_p->username[i++] = '~';
477
478		for (; *p && i < USERLEN; ++p)
#	Line 353 | Line 482 | register_local_user(struct Client *sourc
482		source_p->username[i] = '\0';
483		}
484
485	<	/* password check */
486	<	if (!EmptyString(aconf->passwd))
485	>	/* Password check */
486	>	if (!EmptyString(conf->passwd))
487		{
488		const char *pass = source_p->localClient->passwd;
489
490	<	if (!match_conf_password(pass, aconf))
490	>	if (!match_conf_password(pass, conf))
491		{
492		++ServerStats.is_ref;
493	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
494	<	me.name, source_p->name);
495	<	exit_client(source_p, &me, "Bad Password");
493	>
494	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
495	>	exit_client(source_p, "Bad Password");
496		return;
497		}
498		}
499
500	<	/* don't free source_p->localClient->passwd here - it can be required
500	>	/*
501	>	* Don't free source_p->localClient->passwd here - it can be required
502		* by masked /stats I if there are auth{} blocks with need_password = no;
503		* --adx
504		*/
505
506	<	/* report if user has &^>= etc. and set flags as needed in source_p */
507	<	report_and_set_user_flags(source_p, aconf);
506	>	/*
507	>	* Report if user has &^>= etc. and set flags as needed in source_p
508	>	*/
509	>	report_and_set_user_flags(source_p, conf);
510
511		if (IsDead(source_p))
512		return;
513
514	<	/* Limit clients -
514	>	/*
515	>	* Limit clients -
516		* We want to be able to have servers and F-line clients
517		* connect, so save room for "buffer" connections.
518		* Smaller servers may want to decrease this, and it should
519		* probably be just a percentage of the MAXCLIENTS...
520		*   -Taner
521		*/
389	–	/* Except "F:" clients */
522		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
523		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
524		{
525	<	sendto_realops_flags(UMODE_FULL, L_ALL,
525	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
526		"Too many clients, rejecting %s[%s].",
527		source_p->name, source_p->host);
528		++ServerStats.is_ref;
529	<	exit_client(source_p, &me, "Sorry, server is full - try later");
529	>	exit_client(source_p, "Sorry, server is full - try later");
530		return;
531		}
532
533	<	/* valid user name check */
402	<	if (valid_username(source_p->username) == 0)
533	>	if (!valid_username(source_p->username, 1))
534		{
535	<	char tmpstr2[IRCD_BUFSIZE];
535	>	char tmpstr2[IRCD_BUFSIZE] = "";
536
537	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
537	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
538	>	"Invalid username: %s (%s@%s)",
539		source_p->name, source_p->username, source_p->host);
540		++ServerStats.is_ref;
541		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
542		source_p->username);
543	<	exit_client(source_p, &me, tmpstr2);
543	>	exit_client(source_p, tmpstr2);
544		return;
545		}
546
547		if (check_xline(source_p))
548		return;
549
550	<	while (hash_find_id((id = uid_get())) != NULL)
550	>	while (hash_find_id((id = uid_get())))
551		;
552
553		strlcpy(source_p->id, id, sizeof(source_p->id));
554		hash_add_id(source_p);
555
556	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
556	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
557		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
558		source_p->name, source_p->username, source_p->host,
559		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
560		"255.255.255.255" : source_p->sockhost,
561	<	get_client_class(source_p),
561	>	get_client_class(&source_p->localClient->confs),
562		source_p->info, source_p->id);
563
432	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
433	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
434	–	source_p->name, source_p->username, source_p->host,
435	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436	–	"255.255.255.255" : source_p->sockhost,
437	–	get_client_class(source_p),
438	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
439	–	"<hidden>" : source_p->localClient->client_host,
440	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
441	–	"<hidden>" : source_p->localClient->client_server,
442	–	source_p->info);
443	–
444	–
564		if (ConfigFileEntry.invisible_on_connect)
565		{
566		AddUMode(source_p, UMODE_INVISIBLE);
567		++Count.invisi;
568		}
569
570	<	if ((++Count.local) > Count.max_loc)
570	>	if (++Count.local > Count.max_loc)
571		{
572		Count.max_loc = Count.local;
573
574		if (!(Count.max_loc % 10))
575	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
575	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
576	>	"New Max Local Clients: %d",
577		Count.max_loc);
578		}
579
460	–	/* Increment our total user count here */
580		if (++Count.total > Count.max_tot)
581		Count.max_tot = Count.total;
582		++Count.totalrestartcount;
#	Line 486 | Line 605 | register_local_user(struct Client *sourc
605		*              - username to register as
606		*              - host name to register as
607		*              - server name
489	–	*              - realname (gecos)
608		* output       - NONE
609		* side effects - This function is called when a remote client
610		*                is introduced by a server.
611		*/
612		void
613	<	register_remote_user(struct Client *source_p,
614	<	const char *username, const char *host, const char *server,
497	<	const char *realname)
613	>	register_remote_user(struct Client *source_p, const char *username,
614	>	const char *host, const char *server)
615		{
616		struct Client *target_p = NULL;
617
501	–	assert(source_p != NULL);
618		assert(source_p->username != username);
619
620	<	strlcpy(source_p->host, host, sizeof(source_p->host));
620	>	strlcpy(source_p->host, host, sizeof(source_p->host));
621		strlcpy(source_p->username, username, sizeof(source_p->username));
622
623		/*
624	<	* coming from another server, take the servers word for it
624	>	* Coming from another server, take the servers word for it
625		*/
626		source_p->servptr = hash_find_server(server);
627
628	<	/* Super GhostDetect:
628	>	/*
629	>	* Super GhostDetect:
630		* If we can't find the server the user is supposed to be on,
631		* then simply blow the user away.        -Taner
632		*/
633		if (source_p->servptr == NULL)
634		{
635	<	sendto_realops_flags(UMODE_ALL, L_ALL,
635	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
636		"No server %s for user %s[%s@%s] from %s",
637		server, source_p->name, source_p->username,
638		source_p->host, source_p->from->name);
639	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
639	>	sendto_one(source_p->from,
640	>	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
641	>	me.id, source_p->id, me.name, server);
642
643		AddFlag(source_p, FLAGS_KILLED);
644	<	exit_client(source_p, &me, "Ghosted Client");
644	>	exit_client(source_p, "Ghosted Client");
645		return;
646		}
647
648		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
649		{
650	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
650	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
651		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
652		source_p->from->name, source_p->name, source_p->username,
653		source_p->host, source_p->servptr->name,
654		target_p->name, target_p->from->name);
655	<	kill_client(source_p->from, source_p,
656	<	"%s (NICK from wrong direction (%s != %s))",
657	<	me.name, source_p->servptr->name, target_p->from->name);
655	>	sendto_one(source_p->from,
656	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
657	>	me.id, source_p->id, me.name, source_p->servptr->name,
658	>	target_p->from->name);
659	>
660		AddFlag(source_p, FLAGS_KILLED);
661	<	exit_client(source_p, &me, "USER server wrong direction");
661	>	exit_client(source_p, "USER server wrong direction");
662		return;
663		}
664
#	Line 548 | Line 669 | register_remote_user(struct Client *sour
669		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
670		AddFlag(source_p, FLAGS_SERVICE);
671
551	–	/* Increment our total user count here */
672		if (++Count.total > Count.max_tot)
673		Count.max_tot = Count.total;
674
#	Line 557 | Line 677 | register_remote_user(struct Client *sour
677		add_user_host(source_p->username, source_p->host, 1);
678		SetUserHost(source_p);
679
680	<	introduce_client(source_p);
681	<	}
682	<
683	<	/* introduce_client()
684	<	*
685	<	* inputs       - source_p
566	<	* output       - NONE
567	<	* side effects - This common function introduces a client to the rest
568	<	*                of the net, either from a local client connect or
569	<	*                from a remote connect.
570	<	*/
571	<	static void
572	<	introduce_client(struct Client *source_p)
573	<	{
574	<	dlink_node *server_node = NULL;
575	<	static char ubuf[12];
576	<
577	<	if (MyClient(source_p))
578	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
579	<	else
580	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
581	<
582	<	watch_check_hash(source_p, RPL_LOGON);
680	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
681	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
682	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
683	>	source_p->servptr->name,
684	>	source_p->name, source_p->username, source_p->host,
685	>	source_p->info, source_p->id);
686
687	<	if (*ubuf == '\0')
585	<	{
586	<	ubuf[0] = '+';
587	<	ubuf[1] = '\0';
588	<	}
589	<
590	<	DLINK_FOREACH(server_node, serv_list.head)
591	<	{
592	<	struct Client *server = server_node->data;
593	<
594	<	if (server == source_p->from)
595	<	continue;
596	<
597	<	if (IsCapable(server, CAP_SVS))
598	<	{
599	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
600	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
601	<	source_p->servptr->id,
602	<	source_p->name, source_p->hopcount+1,
603	<	(unsigned long)source_p->tsinfo,
604	<	ubuf, source_p->username, source_p->host,
605	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
606	<	"0" : source_p->sockhost, source_p->id,
607	<	(unsigned long)source_p->servicestamp,
608	<	source_p->info);
609	<	else
610	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s %lu :%s",
611	<	source_p->name, source_p->hopcount+1,
612	<	(unsigned long)source_p->tsinfo,
613	<	ubuf, source_p->username, source_p->host,
614	<	source_p->servptr->name, (unsigned long)source_p->servicestamp,
615	<	source_p->info);
616	<
617	<	}
618	<	else
619	<	{
620	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
621	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
622	<	source_p->servptr->id,
623	<	source_p->name, source_p->hopcount+1,
624	<	(unsigned long)source_p->tsinfo,
625	<	ubuf, source_p->username, source_p->host,
626	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
627	<	"0" : source_p->sockhost, source_p->id, source_p->info);
628	<	else
629	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
630	<	source_p->name, source_p->hopcount+1,
631	<	(unsigned long)source_p->tsinfo,
632	<	ubuf, source_p->username, source_p->host,
633	<	source_p->servptr->name, source_p->info);
634	<	}
635	<	}
687	>	introduce_client(source_p);
688		}
689
690		/* valid_hostname()
#	Line 649 | Line 701 | valid_hostname(const char *hostname)
701		{
702		const char *p = hostname;
703
704	<	assert(p != NULL);
704	>	assert(p);
705
706	<	if (*p == '.' || *p == ':')
706	>	if (EmptyString(p) || *p == '.' || *p == ':')
707		return 0;
708
709		for (; *p; ++p)
710		if (!IsHostChar(*p))
711		return 0;
712
713	<	return 1;
713	>	return p - hostname <= HOSTLEN;
714		}
715
716		/* valid_username()
#	Line 673 | Line 725 | valid_hostname(const char *hostname)
725		* style of username
726		*/
727		int
728	<	valid_username(const char *username)
728	>	valid_username(const char *username, const int local)
729		{
730		int dots      = 0;
731		const char *p = username;
732
733	<	assert(p != NULL);
733	>	assert(p);
734
735		if (*p == '~')
736		++p;
737
738	<	/* reject usernames that don't start with an alphanum
738	>	/*
739	>	* Reject usernames that don't start with an alphanum
740		* i.e. reject jokers who have '-@somehost' or '.@somehost'
741		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
742		*/
743		if (!IsAlNum(*p))
744		return 0;
745
746	<	while (*++p)
746	>	if (local)
747		{
748	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
748	>	while (*++p)
749		{
750	<	if (++dots > ConfigFileEntry.dots_in_ident)
751	<	return 0;
752	<	if (!IsUserChar(*(p + 1)))
750	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
751	>	{
752	>	if (++dots > ConfigFileEntry.dots_in_ident)
753	>	return 0;
754	>	if (!IsUserChar(*(p + 1)))
755	>	return 0;
756	>	}
757	>	else if (!IsUserChar(*p))
758		return 0;
759		}
760	<	else if (!IsUserChar(*p))
761	<	return 0;
760	>	}
761	>	else
762	>	{
763	>	while (*++p)
764	>	if (!IsUserChar(*p))
765	>	return 0;
766		}
767
768	<	return 1;
768	>	return  p - username <= USERLEN;;
769		}
770
771		/* clean_nick_name()
#	Line 717 | Line 779 | int
779		valid_nickname(const char *nickname, const int local)
780		{
781		const char *p = nickname;
782	+
783		assert(nickname && *nickname);
784
785	<	/* nicks can't start with a digit or - or be 0 length */
786	<	/* This closer duplicates behaviour of hybrid-6 */
785	>	/*
786	>	* Nicks can't start with a digit or - or be 0 length.
787	>	*/
788		if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
789		return 0;
790
#	Line 728 | Line 792 | valid_nickname(const char *nickname, con
792		if (!IsNickChar(*p))
793		return 0;
794
795	<	return p - nickname <= (NICKLEN - 1);
732	<	}
733	<
734	<	/* report_and_set_user_flags()
735	<	*
736	<	* inputs       - pointer to source_p
737	<	*              - pointer to aconf for this user
738	<	* output       - NONE
739	<	* side effects - Report to user any special flags
740	<	*                they are getting, and set them.
741	<	*/
742	<	static void
743	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
744	<	{
745	<	/* If this user is being spoofed, tell them so */
746	<	if (IsConfDoSpoofIp(aconf))
747	<	{
748	<	sendto_one(source_p,
749	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
750	<	me.name, source_p->name);
751	<	}
752	<
753	<	/* If this user is in the exception class, Set it "E lined" */
754	<	if (IsConfExemptKline(aconf))
755	<	{
756	<	SetExemptKline(source_p);
757	<	sendto_one(source_p,
758	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
759	<	me.name, source_p->name);
760	<	}
761	<
762	<	/* The else here is to make sure that G line exempt users
763	<	* do not get noticed twice.
764	<	*/
765	<	else if (IsConfExemptGline(aconf))
766	<	{
767	<	SetExemptGline(source_p);
768	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
769	<	me.name, source_p->name);
770	<	}
771	<
772	<	if (IsConfExemptResv(aconf))
773	<	{
774	<	SetExemptResv(source_p);
775	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
776	<	me.name, source_p->name);
777	<	}
778	<
779	<	/* If this user is exempt from user limits set it "F lined" */
780	<	if (IsConfExemptLimits(aconf))
781	<	{
782	<	SetExemptLimits(source_p);
783	<	sendto_one(source_p,
784	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
785	<	me.name,source_p->name);
786	<	}
787	<
788	<	if (IsConfCanFlood(aconf))
789	<	{
790	<	SetCanFlood(source_p);
791	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
792	<	"protection, aren't you fearsome.",
793	<	me.name, source_p->name);
794	<	}
795	<	}
796	<
797	<	/* change_simple_umode()
798	<	*
799	<	* this callback can be hooked to allow special handling of
800	<	* certain usermodes
801	<	*/
802	<	static void *
803	<	change_simple_umode(va_list args)
804	<	{
805	<	struct Client *client_p;
806	<	struct Client *source_p;
807	<	int what;
808	<	unsigned int flag;
809	<
810	<	client_p = va_arg(args, struct Client *);
811	<	source_p = va_arg(args, struct Client *);
812	<	what = va_arg(args, int);
813	<	flag = va_arg(args, unsigned int);
814	<
815	<	if (what == MODE_ADD)
816	<	AddUMode(source_p, flag);
817	<	else
818	<	DelUMode(source_p, flag);
819	<
820	<	return NULL;
821	<	}
822	<
823	<	/* set_user_mode()
824	<	*
825	<	* added 15/10/91 By Darren Reed.
826	<	* parv[0] - sender
827	<	* parv[1] - username to change mode for
828	<	* parv[2] - modes to change
829	<	*/
830	<	void
831	<	set_user_mode(struct Client *client_p, struct Client *source_p,
832	<	int parc, char *parv[])
833	<	{
834	<	unsigned int flag, setflags;
835	<	char **p, *m, buf[IRCD_BUFSIZE];
836	<	struct Client *target_p;
837	<	int what = MODE_ADD, badflag = 0, i;
838	<
839	<	assert(!(parc < 2));
840	<
841	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
842	<	{
843	<	if (MyConnect(source_p))
844	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
845	<	me.name, source_p->name, parv[1]);
846	<	return;
847	<	}
848	<
849	<	if (IsServer(source_p))
850	<	{
851	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
852	<	parv[1], source_p->name);
853	<	return;
854	<	}
855	<
856	<	if (source_p != target_p)
857	<	{
858	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
859	<	me.name, source_p->name);
860	<	return;
861	<	}
862	<
863	<	if (parc < 3)
864	<	{
865	<	m = buf;
866	<	*m++ = '+';
867	<
868	<	for (i = 0; i < 128; i++)
869	<	if (HasUMode(source_p, user_modes[i]))
870	<	*m++ = (char)i;
871	<	*m = '\0';
872	<
873	<	sendto_one(source_p, form_str(RPL_UMODEIS),
874	<	me.name, source_p->name, buf);
875	<	return;
876	<	}
877	<
878	<	execute_callback(entering_umode_cb, client_p, source_p);
879	<
880	<	/* find flags already set for user */
881	<	setflags = source_p->umodes;
882	<
883	<	/* parse mode change string(s) */
884	<	for (p = &parv[2]; p && *p; p++)
885	<	{
886	<	for (m = *p; *m; m++)
887	<	{
888	<	switch (*m)
889	<	{
890	<	case '+':
891	<	what = MODE_ADD;
892	<	break;
893	<	case '-':
894	<	what = MODE_DEL;
895	<	break;
896	<	case 'o':
897	<	if (what == MODE_ADD)
898	<	{
899	<	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
900	<	{
901	<	++Count.oper;
902	<	SetOper(source_p);
903	<	}
904	<	}
905	<	else
906	<	{
907	<	/* Only decrement the oper counts if an oper to begin with
908	<	* found by Pat Szuta, Perly , perly@xnet.com
909	<	*/
910	<	if (!HasUMode(source_p, UMODE_OPER))
911	<	break;
912	<
913	<	ClearOper(source_p);
914	<	Count.oper--;
915	<
916	<	if (MyConnect(source_p))
917	<	{
918	<	dlink_node *dm;
919	<
920	<	detach_conf(source_p, OPER_TYPE);
921	<	ClrOFlag(source_p);
922	<	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
923	<
924	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
925	<	free_dlink_node(dm);
926	<	}
927	<	}
928	<
929	<	break;
930	<
931	<	/* we may not get these,
932	<	* but they shouldnt be in default
933	<	*/
934	<	case 'r':
935	<	case ' ' :
936	<	case '\n':
937	<	case '\r':
938	<	case '\t':
939	<	break;
940	<
941	<	default:
942	<	if ((flag = user_modes[(unsigned char)*m]))
943	<	{
944	<	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
945	<	(ConfigFileEntry.oper_only_umodes & flag))
946	<	{
947	<	badflag = 1;
948	<	}
949	<	else
950	<	execute_callback(umode_cb, client_p, source_p, what, flag);
951	<	}
952	<	else
953	<	{
954	<	if (MyConnect(source_p))
955	<	badflag = 1;
956	<	}
957	<
958	<	break;
959	<	}
960	<	}
961	<	}
962	<
963	<	if (badflag)
964	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
965	<	me.name, source_p->name);
966	<
967	<	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
968	<	{
969	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
970	<	me.name, source_p->name);
971	<	DelUMode(source_p, UMODE_NCHANGE);
972	<	}
973	<
974	<	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
975	<	!HasOFlag(source_p, OPER_FLAG_ADMIN))
976	<	{
977	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
978	<	me.name, source_p->name);
979	<	DelUMode(source_p, UMODE_ADMIN);
980	<	}
981	<
982	<	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
983	<	++Count.invisi;
984	<	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
985	<	--Count.invisi;
986	<
987	<	/*
988	<	* compare new flags with old flags and send string which
989	<	* will cause servers to update correctly.
990	<	*/
991	<	send_umode_out(client_p, source_p, setflags);
795	>	return p - nickname <= NICKLEN;
796		}
797
798		/* send_umode()
#	Line 1012 | Line 816 | send_umode(struct Client *client_p, stru
816		unsigned int flag;
817
818		/*
819	<	* build a string in umode_buf to represent the change in the user's
819	>	* Build a string in umode_buf to represent the change in the user's
820		* mode between the new (source_p->umodes) and 'old'.
821		*/
822	<	for (i = 0; i < 128; i++)
822	>	for (i = 0; i < 128; ++i)
823		{
824		flag = user_modes[i];
825		if (!flag)
#	Line 1066 | Line 870 | void
870		send_umode_out(struct Client *client_p, struct Client *source_p,
871		unsigned int old)
872		{
873	<	char buf[IRCD_BUFSIZE] = { '\0' };
1070	<	dlink_node *ptr = NULL;
873	>	char buf[IRCD_BUFSIZE] = "";
874
875		send_umode(NULL, source_p, old, SEND_UMODES, buf);
876
877		if (buf[0])
878	<	{
879	<	DLINK_FOREACH(ptr, serv_list.head)
1077	<	{
1078	<	struct Client *target_p = ptr->data;
1079	<
1080	<	if ((target_p != client_p) && (target_p != source_p))
1081	<	sendto_one(target_p, ":%s MODE %s :%s",
1082	<	ID_or_name(source_p, target_p),
1083	<	ID_or_name(source_p, target_p), buf);
1084	<	}
1085	<	}
878	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
879	>	source_p->id, source_p->id, buf);
880
881		if (client_p && MyClient(client_p))
882		send_umode(client_p, source_p, old, 0xffffffff, buf);
883		}
884
885	<	/* user_welcome()
886	<	*
1093	<	* inputs       - client pointer to client to welcome
1094	<	* output       - NONE
1095	<	* side effects -
1096	<	*/
1097	<	static void
1098	<	user_welcome(struct Client *source_p)
885	>	void
886	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
887		{
888	<	#if defined(__TIME__) && defined(__DATE__)
1101	<	static const char built_date[] = __DATE__ " at " __TIME__;
1102	<	#else
1103	<	static const char built_date[] = "unknown";
1104	<	#endif
888	>	dlink_node *ptr = NULL;
889
890	<	#ifdef HAVE_LIBCRYPTO
891	<	if (source_p->localClient->fd.ssl != NULL)
1108	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1109	<	me.name, source_p->name,
1110	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1111	<	#endif
890	>	if (!strcmp(target_p->host, hostname))
891	>	return;
892
893	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
894	<	ServerInfo.network_name, source_p->name);
895	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
896	<	get_listener_name(source_p->localClient->listener), ircd_version);
897	<	sendto_one(source_p, form_str(RPL_CREATED),
898	<	me.name, source_p->name, built_date);
899	<	sendto_one(source_p, form_str(RPL_MYINFO),
900	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1121	<	show_isupport(source_p);
893	>	switch (what)
894	>	{
895	>	case MODE_ADD:
896	>	AddUMode(target_p, UMODE_HIDDENHOST);
897	>	AddFlag(target_p, FLAGS_IP_SPOOFING);
898	>	break;
899	>	case MODE_DEL:
900	>	DelUMode(target_p, UMODE_HIDDENHOST);
901
902	<	if (source_p->id[0] != '\0')
903	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
904	<	source_p->name, source_p->id);
902	>	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
903	>	DelFlag(target_p, FLAGS_IP_SPOOFING);
904	>	break;
905	>	default: return;
906	>	}
907
908	<	show_lusers(source_p);
908	>	if (ConfigFileEntry.cycle_on_host_change)
909	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
910	>	target_p->name, target_p->username, target_p->host);
911
912	<	if (ConfigFileEntry.short_motd)
912	>	if (IsUserHostIp(target_p))
913	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
914	>
915	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
916	>
917	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
918	>	SetUserHost(target_p);
919	>
920	>	if (MyClient(target_p))
921		{
922	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
923	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1133	<	sendto_one(source_p,
1134	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1135	<	"read it", me.name, source_p->name);
1136	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1137	<	me.name, source_p->name, me.name);
1138	<	sendto_one(source_p, form_str(RPL_MOTD),
1139	<	me.name, source_p->name,
1140	<	"*** This is the short motd ***");
1141	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1142	<	me.name, source_p->name);
922	>	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
923	>	clear_ban_cache_client(target_p);
924		}
1144	–	else
1145	–	send_message_file(source_p, &ConfigFileEntry.motd);
1146	–	}
925
926	<	/* check_xline()
927	<	*
1150	<	* inputs       - pointer to client to test
1151	<	* outupt       - 1 if exiting 0 if ok
1152	<	* side effects -
1153	<	*/
1154	<	static int
1155	<	check_xline(struct Client *source_p)
1156	<	{
1157	<	struct ConfItem *conf = NULL;
1158	<	const char *reason = NULL;
926	>	if (!ConfigFileEntry.cycle_on_host_change)
927	>	return;
928
929	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1161	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
929	>	DLINK_FOREACH(ptr, target_p->channel.head)
930		{
931	<	struct MatchItem *reg = map_to_conf(conf);
931	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
932	>	char *p = modebuf;
933	>	int len = 0;
934	>	const struct Membership *ms = ptr->data;
935
936	<	++reg->count;
937	<
938	<	if (reg->reason != NULL)
939	<	reason = reg->reason;
940	<	else
1170	<	reason = "No Reason";
936	>	if (has_member_flags(ms, CHFL_CHANOP))
937	>	{
938	>	*p++ = 'o';
939	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
940	>	}
941
942	<	sendto_realops_flags(UMODE_REJ, L_ALL,
943	<	"X-line Rejecting [%s] [%s], user %s [%s]",
944	<	source_p->info, reason,
945	<	get_client_name(source_p, HIDE_IP),
946	<	source_p->sockhost);
942	>	if (has_member_flags(ms, CHFL_HALFOP))
943	>	{
944	>	*p++ = 'h';
945	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
946	>	}
947
948	<	++ServerStats.is_ref;
1179	<	if (REJECT_HOLD_TIME > 0)
948	>	if (has_member_flags(ms, CHFL_VOICE))
949		{
950	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
951	<	me.name, source_p->name);
1183	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1184	<	SetCaptured(source_p);
950	>	*p++ = 'v';
951	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
952		}
1186	–	else
1187	–	exit_client(source_p, &me, "Bad user info");
1188	–	return 1;
1189	–	}
953
954	<	return 0;
1192	<	}
954	>	*p = '\0';
955
956	<	/* oper_up()
957	<	*
958	<	* inputs       - pointer to given client to oper
959	<	* output       - NONE
960	<	* side effects - Blindly opers up given source_p, using aconf info
961	<	*                all checks on passwords have already been done.
962	<	*                This could also be used by rsa oper routines.
956	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
957	>	target_p->name, target_p->username, target_p->host,
958	>	ms->chptr->chname);
959	>	if (nickbuf[0])
960	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
961	>	target_p->servptr->name, ms->chptr->chname,
962	>	modebuf, nickbuf);
963	>
964	>	}
965	>
966	>	if (target_p->away[0])
967	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
968	>	":%s!%s@%s AWAY :%s",
969	>	target_p->name, target_p->username,
970	>	target_p->host, target_p->away);
971	>	}
972	>
973	>	/*! \brief Blindly opers up given source_p, using conf info.
974	>	*         All checks on passwords have already been done.
975	>	* \param source_p Pointer to given client to oper
976		*/
977		void
978		oper_up(struct Client *source_p)
979		{
980	<	unsigned int old = source_p->umodes;
981	<	const char *operprivs = "";
1207	<	const struct AccessItem *oconf = NULL;
980	>	const unsigned int old = source_p->umodes;
981	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
982
983		assert(source_p->localClient->confs.head);
1210	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
984
985		++Count.oper;
986		SetOper(source_p);
987
988	<	if (oconf->modes)
989	<	AddUMode(source_p, oconf->modes);
988	>	if (conf->modes)
989	>	AddUMode(source_p, conf->modes);
990		else if (ConfigFileEntry.oper_umodes)
991		AddUMode(source_p, ConfigFileEntry.oper_umodes);
992
#	Line 1225 | Line 998 | oper_up(struct Client *source_p)
998		assert(dlinkFind(&oper_list, source_p) == NULL);
999		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1000
1001	<	operprivs = oper_privs_as_string(oconf->port);
1229	<
1230	<	AddOFlag(source_p, oconf->port);
1001	>	AddOFlag(source_p, conf->port);
1002
1003		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1004		AddUMode(source_p, UMODE_ADMIN);
1234	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1235	–	DelUMode(source_p, UMODE_NCHANGE);
1005
1006	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1007	<	source_p->name, source_p->username, source_p->host);
1006	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1007	>	get_oper_name(source_p));
1008		send_umode_out(source_p, source_p, old);
1009	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1241	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1242	<	me.name, source_p->name, operprivs);
1243	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1009	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1010		}
1011
1012		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1258 | Line 1024 | valid_sid(const char *sid)
1024
1025		/*
1026		* init_uid()
1027	<	*
1027	>	*
1028		* inputs       - NONE
1029		* output       - NONE
1030		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1268 | Line 1034 | valid_sid(const char *sid)
1034		void
1035		init_uid(void)
1036		{
1271	–	int i;
1272	–
1037		memset(new_uid, 0, sizeof(new_uid));
1038
1039		if (!EmptyString(ServerInfo.sid))
1040		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1041
1042	<	for (i = 0; i < IRC_MAXSID; ++i)
1043	<	if (new_uid[i] == '\0')
1042	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1043	>	if (new_uid[i] == '\0')
1044		new_uid[i] = 'A';
1045
1046		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1283	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1284	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1285	–	* -Dianora
1286	–	*/
1047		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1288	–
1289	–	entering_umode_cb = register_callback("entering_umode", NULL);
1290	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1048		}
1049
1050		/*
#	Line 1347 | Line 1104 | uid_get(void)
1104		void
1105		init_isupport(void)
1106		{
1350	–	isupportFile = init_MessageLine();
1351	–
1107		add_isupport("CALLERID", NULL, -1);
1108		add_isupport("CASEMAPPING", CASEMAP, -1);
1109		add_isupport("DEAF", "D", -1);
1110		add_isupport("KICKLEN", NULL, KICKLEN);
1111		add_isupport("MODES", NULL, MAXMODEPARAMS);
1357	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1112		#ifdef HALFOPS
1113		add_isupport("PREFIX", "(ohv)@%+", -1);
1114		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1362 | Line 1116 | init_isupport(void)
1116		add_isupport("PREFIX", "(ov)@+", -1);
1117		add_isupport("STATUSMSG", "@+", -1);
1118		#endif
1119	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1119	>	add_isupport("EXCEPTS", "e", -1);
1120	>	add_isupport("INVEX", "I", -1);
1121		}
1122
1123		/*
#	Line 1397 | Line 1152 | add_isupport(const char *name, const cha
1152		dlinkAddTail(support, &support->node, &support_list);
1153		}
1154
1155	<	DupString(support->name, name);
1155	>	support->name = xstrdup(name);
1156		if (options != NULL)
1157	<	DupString(support->options, options);
1157	>	support->options = xstrdup(options);
1158		support->number = n;
1159
1160		rebuild_isupport_message_line();
#	Line 1446 | Line 1201 | rebuild_isupport_message_line(void)
1201		{
1202		char isupportbuffer[IRCD_BUFSIZE];
1203		char *p = isupportbuffer;
1204	<	dlink_node *ptr = NULL;
1204	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1205		int n = 0;
1206		int tokens = 0;
1207		size_t len = 0;
1208	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1208	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1209
1210	<	destroy_MessageLine(isupportFile);
1210	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1211	>	{
1212	>	dlinkDelete(ptr, &support_list_lines);
1213	>	MyFree(ptr->data);
1214	>	free_dlink_node(ptr);
1215	>	}
1216
1217		DLINK_FOREACH(ptr, support_list.head)
1218		{
1219		struct Isupport *support = ptr->data;
1220
1221	<	p += (n = ircsprintf(p, "%s", support->name));
1221	>	p += (n = sprintf(p, "%s", support->name));
1222		len += n;
1223
1224		if (support->options != NULL)
1225		{
1226	<	p += (n = ircsprintf(p, "=%s", support->options));
1226	>	p += (n = sprintf(p, "=%s", support->options));
1227		len += n;
1228		}
1229
1230		if (support->number > 0)
1231		{
1232	<	p += (n = ircsprintf(p, "=%d", support->number));
1232	>	p += (n = sprintf(p, "=%d", support->number));
1233		len += n;
1234		}
1235
#	Line 1482 | Line 1242 | rebuild_isupport_message_line(void)
1242		if (*--p == ' ')
1243		*p = '\0';
1244
1245	<	addto_MessageLine(isupportFile, isupportbuffer);
1245	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1246		p = isupportbuffer;
1247		len = 0;
1248		n = tokens = 0;
#	Line 1493 | Line 1253 | rebuild_isupport_message_line(void)
1253		{
1254		if (*--p == ' ')
1255		*p = '\0';
1256	<	addto_MessageLine(isupportFile, isupportbuffer);
1256	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1257		}
1258		}

Diff Legend

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