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 2691 by michael, Tue Dec 17 18:55:59 2013 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4565 by michael, Sun Aug 24 10:27:40 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 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_user.c
23	>	* \brief User related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29	<	#include "s_user.h"
28	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
35	–	#include "s_bsd.h"
35		#include "ircd.h"
36		#include "listener.h"
37		#include "motd.h"
38		#include "numeric.h"
39		#include "conf.h"
40		#include "log.h"
41	<	#include "s_serv.h"
41	>	#include "server.h"
42		#include "send.h"
44	–	#include "supported.h"
45	–	#include "whowas.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "hook.h"
51	<	#include "s_misc.h"
47	>	#include "misc.h"
48		#include "parse.h"
49		#include "watch.h"
50
51		static char umode_buffer[IRCD_BUFSIZE];
56	–
57	–	static void user_welcome(struct Client *);
58	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
59	–	static int check_xline(struct Client *);
60	–	static void introduce_client(struct Client *);
52		static const char *uid_get(void);
53
54		/* Used for building up the isupport string,
55		* used with init_isupport, add_isupport, delete_isupport
56		*/
66	–
57		struct Isupport
58		{
59		dlink_node node;
#	Line 126 | Line 116 | const unsigned int user_modes[256] =
116		0,                  /* m */
117		UMODE_NCHANGE,      /* n */
118		UMODE_OPER,         /* o */
119	<	0,                  /* p */
120	<	0,                  /* q */
119	>	UMODE_HIDECHANS,    /* p */
120	>	UMODE_HIDEIDLE,     /* q */
121		UMODE_REGISTERED,   /* r */
122		UMODE_SERVNOTICE,   /* s */
123		0,                  /* t */
#	Line 136 | Line 126 | const unsigned int user_modes[256] =
126		UMODE_WALLOP,       /* w */
127		UMODE_HIDDENHOST,   /* x */
128		UMODE_SPY,          /* y */
129	<	UMODE_OPERWALL,     /* z      0x7A */
129	>	0,                  /* z      0x7A */
130		0,0,0,0,0,          /* 0x7B - 0x7F */
131
132		/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
#	Line 171 | Line 161 | assemble_umode_buffer(void)
161		void
162		show_lusers(struct Client *source_p)
163		{
174	–	const char *from, *to;
175	–
176	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
177	–	{
178	–	from = me.id;
179	–	to = source_p->id;
180	–	}
181	–	else
182	–	{
183	–	from = me.name;
184	–	to = source_p->name;
185	–	}
186	–
164		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
165	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
166	<	from, to, (Count.total-Count.invisi),
190	<	Count.invisi, dlink_list_length(&global_serv_list));
165	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
166	>	Count.invisi, dlink_list_length(&global_server_list));
167		else
168	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
169	<	(Count.total-Count.invisi), Count.invisi, 1);
168	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
169	>	(Count.total - Count.invisi), Count.invisi, 1);
170
171	<	if (Count.oper > 0)
172	<	sendto_one(source_p, form_str(RPL_LUSEROP),
173	<	from, to, Count.oper);
174	<
175	<	if (dlink_list_length(&unknown_list) > 0)
176	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
177	<	from, to, dlink_list_length(&unknown_list));
178	<
203	<	if (dlink_list_length(&global_channel_list) > 0)
204	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
205	<	from, to, dlink_list_length(&global_channel_list));
171	>	if (Count.oper)
172	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
173	>
174	>	if (dlink_list_length(&unknown_list))
175	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
176	>
177	>	if (dlink_list_length(&channel_list))
178	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
179
180		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
181		{
182	<	sendto_one(source_p, form_str(RPL_LUSERME),
183	<	from, to, Count.local, Count.myserver);
211	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
212	<	from, to, Count.local, Count.max_loc);
182	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
183	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
184		}
185		else
186		{
187	<	sendto_one(source_p, form_str(RPL_LUSERME),
188	<	from, to, Count.total, 0);
218	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.total, Count.max_tot);
187	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
188	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
189		}
190
191	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
223	<	from, to, Count.total, Count.max_tot);
191	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
192
193		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
194	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
195	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
194	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
195	>	Count.max_loc_cli, Count.totalrestartcount);
196
197		if (Count.local > Count.max_loc_cli)
198		Count.max_loc_cli = Count.local;
#	Line 245 | Line 213 | show_isupport(struct Client *source_p)
213		const dlink_node *ptr = NULL;
214
215		DLINK_FOREACH(ptr, support_list_lines.head)
216	<	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
249	<	source_p->name, ptr->data);
216	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
217		}
218
219	<	/*
220	<	** register_local_user
221	<	**      This function is called when both NICK and USER messages
222	<	**      have been accepted for the client, in whatever order. Only
223	<	**      after this, is the USER message propagated.
224	<	**
225	<	**      NICK's must be propagated at once when received, although
226	<	**      it would be better to delay them too until full info is
227	<	**      available. Doing it is not so simple though, would have
228	<	**      to implement the following:
229	<	**
230	<	**      (actually it has been implemented already for a while) -orabidoo
231	<	**
232	<	**      1) user telnets in and gives only "NICK foobar" and waits
233	<	**      2) another user far away logs in normally with the nick
234	<	**         "foobar" (quite legal, as this server didn't propagate
235	<	**         it).
236	<	**      3) now this server gets nick "foobar" from outside, but
237	<	**         has alread the same defined locally. Current server
238	<	**         would just issue "KILL foobar" to clean out dups. But,
239	<	**         this is not fair. It should actually request another
240	<	**         nick from local user or kill him/her...
241	<	*/
219	>
220	>	/* report_and_set_user_flags()
221	>	*
222	>	* inputs       - pointer to source_p
223	>	*              - pointer to conf for this user
224	>	* output       - NONE
225	>	* side effects - Report to user any special flags
226	>	*                they are getting, and set them.
227	>	*/
228	>	static void
229	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
230	>	{
231	>	/* If this user is being spoofed, tell them so */
232	>	if (IsConfDoSpoofIp(conf))
233	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
234	>
235	>	/* If this user is in the exception class, Set it "E lined" */
236	>	if (IsConfExemptKline(conf))
237	>	{
238	>	SetExemptKline(source_p);
239	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
240	>	}
241	>
242	>	/*
243	>	* The else here is to make sure that G line exempt users
244	>	* do not get noticed twice.
245	>	*/
246	>	else if (IsConfExemptGline(conf))
247	>	{
248	>	SetExemptGline(source_p);
249	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
250	>	}
251	>
252	>	if (IsConfExemptResv(conf))
253	>	{
254	>	SetExemptResv(source_p);
255	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
256	>	}
257	>
258	>	/* If this user is exempt from user limits set it "F lined" */
259	>	if (IsConfExemptLimits(conf))
260	>	{
261	>	SetExemptLimits(source_p);
262	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
263	>	}
264	>
265	>	if (IsConfCanFlood(conf))
266	>	{
267	>	SetCanFlood(source_p);
268	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
269	>	"protection, aren't you fearsome.");
270	>	}
271	>	}
272	>
273	>	/* introduce_client()
274	>	*
275	>	* inputs       - source_p
276	>	* output       - NONE
277	>	* side effects - This common function introduces a client to the rest
278	>	*                of the net, either from a local client connect or
279	>	*                from a remote connect.
280	>	*/
281	>	static void
282	>	introduce_client(struct Client *source_p)
283	>	{
284	>	dlink_node *ptr = NULL;
285	>	char ubuf[IRCD_BUFSIZE] = "";
286	>
287	>	if (MyClient(source_p))
288	>	send_umode(source_p, source_p, 0, ubuf);
289	>	else
290	>	send_umode(NULL, source_p, 0, ubuf);
291	>
292	>	watch_check_hash(source_p, RPL_LOGON);
293	>
294	>	if (ubuf[0] == '\0')
295	>	{
296	>	ubuf[0] = '+';
297	>	ubuf[1] = '\0';
298	>	}
299	>
300	>	DLINK_FOREACH(ptr, local_server_list.head)
301	>	{
302	>	struct Client *server = ptr->data;
303	>
304	>	if (server == source_p->from)
305	>	continue;
306	>
307	>	if (IsCapable(server, CAP_SVS))
308	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
309	>	source_p->servptr->id,
310	>	source_p->name, source_p->hopcount+1,
311	>	(unsigned long)source_p->tsinfo,
312	>	ubuf, source_p->username, source_p->host,
313	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
314	>	"0" : source_p->sockhost, source_p->id,
315	>	source_p->svid,
316	>	source_p->info);
317	>	else
318	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
319	>	source_p->servptr->id,
320	>	source_p->name, source_p->hopcount+1,
321	>	(unsigned long)source_p->tsinfo,
322	>	ubuf, source_p->username, source_p->host,
323	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
324	>	"0" : source_p->sockhost, source_p->id, source_p->info);
325	>
326	>	if (!EmptyString(source_p->certfp))
327	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
328	>	}
329	>	}
330	>
331	>	/* user_welcome()
332	>	*
333	>	* inputs       - client pointer to client to welcome
334	>	* output       - NONE
335	>	* side effects -
336	>	*/
337	>	static void
338	>	user_welcome(struct Client *source_p)
339	>	{
340	>	#if defined(__TIME__) && defined(__DATE__)
341	>	static const char built_date[] = __DATE__ " at " __TIME__;
342	>	#else
343	>	static const char built_date[] = "unknown";
344	>	#endif
345	>
346	>	#ifdef HAVE_LIBCRYPTO
347	>	if (HasFlag(source_p, FLAGS_SSL))
348	>	{
349	>	AddUMode(source_p, UMODE_SSL);
350	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
351	>	ssl_get_cipher(source_p->localClient->fd.ssl));
352	>	}
353	>	#endif
354	>
355	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
356	>	source_p->name);
357	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
358	>	get_listener_name(source_p->localClient->listener), ircd_version);
359	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
360	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
361	>	show_isupport(source_p);
362	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
363	>
364	>	show_lusers(source_p);
365	>	motd_signon(source_p);
366	>	}
367	>
368	>	/* check_xline()
369	>	*
370	>	* inputs       - pointer to client to test
371	>	* outupt       - 1 if exiting 0 if ok
372	>	* side effects -
373	>	*/
374	>	static int
375	>	check_xline(struct Client *source_p)
376	>	{
377	>	struct MaskItem *conf = NULL;
378	>	const char *reason = NULL;
379	>
380	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
381	>	{
382	>	++conf->count;
383	>
384	>	if (conf->reason)
385	>	reason = conf->reason;
386	>	else
387	>	reason = CONF_NOREASON;
388	>
389	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
390	>	"X-line Rejecting [%s] [%s], user %s [%s]",
391	>	source_p->info, reason,
392	>	get_client_name(source_p, HIDE_IP),
393	>	source_p->sockhost);
394	>
395	>	++ServerStats.is_ref;
396	>	exit_client(source_p, "Bad user info");
397	>	return 1;
398	>	}
399	>
400	>	return 0;
401	>	}
402	>
403	>	/*! \brief This function is called when both NICK and USER messages
404	>	*      have been accepted for the client, in whatever order. Only
405	>	*      after this, is the UID message propagated.
406	>	* \param source_p Pointer to given client to introduce
407	>	*/
408		void
409		register_local_user(struct Client *source_p)
410		{
411		const char *id = NULL;
412		const struct MaskItem *conf = NULL;
413
281	–	assert(source_p != NULL);
414		assert(source_p == source_p->from);
415		assert(MyConnect(source_p));
416		assert(!source_p->localClient->registration);
417
418		ClearCap(source_p, CAP_TS6);
419
420	<	if (ConfigFileEntry.ping_cookie)
420	>	if (ConfigGeneral.ping_cookie)
421		{
422		if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
423		{
#	Line 312 | Line 444 | register_local_user(struct Client *sourc
444
445		if (!valid_hostname(source_p->host))
446		{
447	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
448	<	"character in your hostname", me.name, source_p->name);
447	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
448	>	"character in your hostname");
449		strlcpy(source_p->host, source_p->sockhost,
450		sizeof(source_p->host));
451		}
#	Line 322 | Line 454 | register_local_user(struct Client *sourc
454
455		if (!IsGotId(source_p))
456		{
457	<	char username[USERLEN + 1];
457	>	char username[USERLEN + 1] = "";
458		const char *p = username;
459		unsigned int i = 0;
460
461		if (IsNeedIdentd(conf))
462		{
463		++ServerStats.is_ref;
464	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
465	<	"identd to use this server", me.name, source_p->name);
466	<	exit_client(source_p, &me, "Install identd");
464	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
465	>	"identd to use this server");
466	>	exit_client(source_p, "Install identd");
467		return;
468		}
469
#	Line 341 | Line 473 | register_local_user(struct Client *sourc
473		source_p->username[i++] = '~';
474
475		for (; *p && i < USERLEN; ++p)
476	<	if (*p != '[')
345	<	source_p->username[i++] = *p;
476	>	source_p->username[i++] = *p;
477
478		source_p->username[i] = '\0';
479		}
480
481	<	/* password check */
481	>	/* Password check */
482		if (!EmptyString(conf->passwd))
483		{
484	<	const char *pass = source_p->localClient->passwd;
354	<
355	<	if (!match_conf_password(pass, conf))
484	>	if (!match_conf_password(source_p->localClient->password, conf))
485		{
486		++ServerStats.is_ref;
487	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
488	<	me.name, source_p->name);
489	<	exit_client(source_p, &me, "Bad Password");
487	>
488	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
489	>	exit_client(source_p, "Bad Password");
490		return;
491		}
492		}
493
494	<	/* don't free source_p->localClient->passwd here - it can be required
494	>	/*
495	>	* Don't free source_p->localClient->password here - it can be required
496		* by masked /stats I if there are auth{} blocks with need_password = no;
497		* --adx
498		*/
499
500	<	/* report if user has &^>= etc. and set flags as needed in source_p */
500	>	/*
501	>	* Report if user has &^>= etc. and set flags as needed in source_p
502	>	*/
503		report_and_set_user_flags(source_p, conf);
504
505		if (IsDead(source_p))
506		return;
507
508	<	/* Limit clients -
508	>	/*
509	>	* Limit clients -
510		* We want to be able to have servers and F-line clients
511		* connect, so save room for "buffer" connections.
512		* Smaller servers may want to decrease this, and it should
513		* probably be just a percentage of the MAXCLIENTS...
514		*   -Taner
515		*/
516	<	/* Except "F:" clients */
517	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
516	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
517	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
518		{
519		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
520		"Too many clients, rejecting %s[%s].",
521		source_p->name, source_p->host);
522		++ServerStats.is_ref;
523	<	exit_client(source_p, &me, "Sorry, server is full - try later");
523	>	exit_client(source_p, "Sorry, server is full - try later");
524		return;
525		}
526
395	–	/* valid user name check */
527		if (!valid_username(source_p->username, 1))
528		{
529	<	char tmpstr2[IRCD_BUFSIZE];
529	>	char buf[IRCD_BUFSIZE] = "";
530
531		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
532		"Invalid username: %s (%s@%s)",
533		source_p->name, source_p->username, source_p->host);
534		++ServerStats.is_ref;
535	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
536	<	source_p->username);
406	<	exit_client(source_p, &me, tmpstr2);
535	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
536	>	exit_client(source_p, buf);
537		return;
538		}
539
540		if (check_xline(source_p))
541		return;
542
543	<	while (hash_find_id((id = uid_get())) != NULL)
543	>	while (hash_find_id((id = uid_get())))
544		;
545
546		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 419 | Line 549 | register_local_user(struct Client *sourc
549		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
550		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
551		source_p->name, source_p->username, source_p->host,
552	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
552	>	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
553		"255.255.255.255" : source_p->sockhost,
554		get_client_class(&source_p->localClient->confs),
555		source_p->info, source_p->id);
556
557	<	if (ConfigFileEntry.invisible_on_connect)
557	>	if (ConfigGeneral.invisible_on_connect)
558		{
559		AddUMode(source_p, UMODE_INVISIBLE);
560		++Count.invisi;
#	Line 440 | Line 570 | register_local_user(struct Client *sourc
570		Count.max_loc);
571		}
572
443	–	/* Increment our total user count here */
573		if (++Count.total > Count.max_tot)
574		Count.max_tot = Count.total;
575		++Count.totalrestartcount;
#	Line 448 | Line 577 | register_local_user(struct Client *sourc
577		assert(source_p->servptr == &me);
578		SetClient(source_p);
579		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
580	<
452	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
580	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
581
582		assert(dlinkFind(&unknown_list, source_p));
583
#	Line 469 | Line 597 | register_local_user(struct Client *sourc
597		*              - username to register as
598		*              - host name to register as
599		*              - server name
472	–	*              - realname (gecos)
600		* output       - NONE
601		* side effects - This function is called when a remote client
602		*                is introduced by a server.
603		*/
604		void
605	<	register_remote_user(struct Client *source_p,
479	<	const char *username, const char *host, const char *server,
480	<	const char *realname)
605	>	register_remote_user(struct Client *source_p)
606		{
607	<	struct Client *target_p = NULL;
483	<
484	<	assert(source_p != NULL);
485	<	assert(source_p->username != username);
486	<
487	<	strlcpy(source_p->host, host, sizeof(source_p->host));
488	<	strlcpy(source_p->username, username, sizeof(source_p->username));
489	<
490	<	/*
491	<	* coming from another server, take the servers word for it
492	<	*/
493	<	source_p->servptr = hash_find_server(server);
494	<
495	<	/*
496	<	* Super GhostDetect:
497	<	* If we can't find the server the user is supposed to be on,
498	<	* then simply blow the user away.        -Taner
499	<	*/
500	<	if (source_p->servptr == NULL)
501	<	{
502	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
503	<	"No server %s for user %s[%s@%s] from %s",
504	<	server, source_p->name, source_p->username,
505	<	source_p->host, source_p->from->name);
506	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
507	<
508	<	AddFlag(source_p, FLAGS_KILLED);
509	<	exit_client(source_p, &me, "Ghosted Client");
510	<	return;
511	<	}
607	>	const struct Client *target_p = NULL;
608
609		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
610		{
#	Line 517 | Line 613 | register_remote_user(struct Client *sour
613		source_p->from->name, source_p->name, source_p->username,
614		source_p->host, source_p->servptr->name,
615		target_p->name, target_p->from->name);
616	<	kill_client(source_p->from, source_p,
617	<	"%s (NICK from wrong direction (%s != %s))",
618	<	me.name, source_p->servptr->name, target_p->from->name);
616	>	sendto_one(source_p->from,
617	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
618	>	me.id, source_p->id, me.name, source_p->servptr->name,
619	>	target_p->from->name);
620	>
621		AddFlag(source_p, FLAGS_KILLED);
622	<	exit_client(source_p, &me, "USER server wrong direction");
622	>	exit_client(source_p, "USER server wrong direction");
623		return;
624		}
625
#	Line 532 | Line 630 | register_remote_user(struct Client *sour
630		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
631		AddFlag(source_p, FLAGS_SERVICE);
632
535	–	/* Increment our total user count here */
633		if (++Count.total > Count.max_tot)
634		Count.max_tot = Count.total;
635
636		SetClient(source_p);
637		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
638	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
639		add_user_host(source_p->username, source_p->host, 1);
640		SetUserHost(source_p);
641
#	Line 551 | Line 649 | register_remote_user(struct Client *sour
649		introduce_client(source_p);
650		}
651
554	–	/* introduce_client()
555	–	*
556	–	* inputs       - source_p
557	–	* output       - NONE
558	–	* side effects - This common function introduces a client to the rest
559	–	*                of the net, either from a local client connect or
560	–	*                from a remote connect.
561	–	*/
562	–	static void
563	–	introduce_client(struct Client *source_p)
564	–	{
565	–	dlink_node *server_node = NULL;
566	–	char ubuf[IRCD_BUFSIZE];
567	–
568	–	if (MyClient(source_p))
569	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
570	–	else
571	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
572	–
573	–	watch_check_hash(source_p, RPL_LOGON);
574	–
575	–	if (ubuf[0] == '\0')
576	–	{
577	–	ubuf[0] = '+';
578	–	ubuf[1] = '\0';
579	–	}
580	–
581	–	DLINK_FOREACH(server_node, serv_list.head)
582	–	{
583	–	struct Client *server = server_node->data;
584	–
585	–	if (server == source_p->from)
586	–	continue;
587	–
588	–	if (IsCapable(server, CAP_SVS))
589	–	{
590	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
591	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
592	–	source_p->servptr->id,
593	–	source_p->name, source_p->hopcount+1,
594	–	(unsigned long)source_p->tsinfo,
595	–	ubuf, source_p->username, source_p->host,
596	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
597	–	"0" : source_p->sockhost, source_p->id,
598	–	source_p->svid,
599	–	source_p->info);
600	–	else
601	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
602	–	source_p->name, source_p->hopcount+1,
603	–	(unsigned long)source_p->tsinfo,
604	–	ubuf, source_p->username, source_p->host,
605	–	source_p->servptr->name, source_p->svid,
606	–	source_p->info);
607	–
608	–	}
609	–	else
610	–	{
611	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
612	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
613	–	source_p->servptr->id,
614	–	source_p->name, source_p->hopcount+1,
615	–	(unsigned long)source_p->tsinfo,
616	–	ubuf, source_p->username, source_p->host,
617	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
618	–	"0" : source_p->sockhost, source_p->id, source_p->info);
619	–	else
620	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
621	–	source_p->name, source_p->hopcount+1,
622	–	(unsigned long)source_p->tsinfo,
623	–	ubuf, source_p->username, source_p->host,
624	–	source_p->servptr->name, source_p->info);
625	–	}
626	–
627	–	if (!EmptyString(source_p->certfp))
628	–	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
629	–	}
630	–	}
631	–
652		/* valid_hostname()
653		*
654		* Inputs       - pointer to hostname
#	Line 643 | Line 663 | valid_hostname(const char *hostname)
663		{
664		const char *p = hostname;
665
666	<	assert(p != NULL);
666	>	assert(p);
667
668		if (EmptyString(p) || *p == '.' || *p == ':')
669		return 0;
#	Line 669 | Line 689 | valid_hostname(const char *hostname)
689		int
690		valid_username(const char *username, const int local)
691		{
692	<	int dots      = 0;
692	>	unsigned int dots = 0;
693		const char *p = username;
694
695	<	assert(p != NULL);
695	>	assert(p);
696
697		if (*p == '~')
698		++p;
#	Line 689 | Line 709 | valid_username(const char *username, con
709		{
710		while (*++p)
711		{
712	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
712	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
713		{
714	<	if (++dots > ConfigFileEntry.dots_in_ident)
714	>	if (++dots > ConfigGeneral.dots_in_ident)
715		return 0;
716		if (!IsUserChar(*(p + 1)))
717		return 0;
#	Line 707 | Line 727 | valid_username(const char *username, con
727		return 0;
728		}
729
730	<	return  p - username <= USERLEN;;
730	>	return p - username <= USERLEN;
731		}
732
733		/* clean_nick_name()
#	Line 721 | Line 741 | int
741		valid_nickname(const char *nickname, const int local)
742		{
743		const char *p = nickname;
744	+
745		assert(nickname && *nickname);
746
747	<	/* nicks can't start with a digit or - or be 0 length */
748	<	/* This closer duplicates behaviour of hybrid-6 */
747	>	/*
748	>	* Nicks can't start with a digit or - or be 0 length.
749	>	*/
750		if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
751		return 0;
752
#	Line 735 | Line 757 | valid_nickname(const char *nickname, con
757		return p - nickname <= NICKLEN;
758		}
759
738	–	/* report_and_set_user_flags()
739	–	*
740	–	* inputs       - pointer to source_p
741	–	*              - pointer to conf for this user
742	–	* output       - NONE
743	–	* side effects - Report to user any special flags
744	–	*                they are getting, and set them.
745	–	*/
746	–	static void
747	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
748	–	{
749	–	/* If this user is being spoofed, tell them so */
750	–	if (IsConfDoSpoofIp(conf))
751	–	sendto_one(source_p,
752	–	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
753	–	me.name, source_p->name);
754	–
755	–	/* If this user is in the exception class, Set it "E lined" */
756	–	if (IsConfExemptKline(conf))
757	–	{
758	–	SetExemptKline(source_p);
759	–	sendto_one(source_p,
760	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
761	–	me.name, source_p->name);
762	–	}
763	–
764	–	/*
765	–	* The else here is to make sure that G line exempt users
766	–	* do not get noticed twice.
767	–	*/
768	–	else if (IsConfExemptGline(conf))
769	–	{
770	–	SetExemptGline(source_p);
771	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
772	–	me.name, source_p->name);
773	–	}
774	–
775	–	if (IsConfExemptResv(conf))
776	–	{
777	–	SetExemptResv(source_p);
778	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
779	–	me.name, source_p->name);
780	–	}
781	–
782	–	/* If this user is exempt from user limits set it "F lined" */
783	–	if (IsConfExemptLimits(conf))
784	–	{
785	–	SetExemptLimits(source_p);
786	–	sendto_one(source_p,
787	–	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
788	–	me.name,source_p->name);
789	–	}
790	–
791	–	if (IsConfCanFlood(conf))
792	–	{
793	–	SetCanFlood(source_p);
794	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
795	–	"protection, aren't you fearsome.",
796	–	me.name, source_p->name);
797	–	}
798	–	}
799	–
800	–	/* set_user_mode()
801	–	*
802	–	* added 15/10/91 By Darren Reed.
803	–	* parv[0] - sender
804	–	* parv[1] - username to change mode for
805	–	* parv[2] - modes to change
806	–	*/
807	–	void
808	–	set_user_mode(struct Client *client_p, struct Client *source_p,
809	–	const int parc, char *parv[])
810	–	{
811	–	unsigned int flag, setflags;
812	–	char **p, *m, buf[IRCD_BUFSIZE];
813	–	struct Client *target_p;
814	–	int what = MODE_ADD, badflag = 0, i;
815	–
816	–	assert(!(parc < 2));
817	–
818	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
819	–	{
820	–	if (MyConnect(source_p))
821	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
822	–	me.name, source_p->name, parv[1]);
823	–	return;
824	–	}
825	–
826	–	if (source_p != target_p)
827	–	{
828	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
829	–	me.name, source_p->name);
830	–	return;
831	–	}
832	–
833	–	if (parc < 3)
834	–	{
835	–	m = buf;
836	–	*m++ = '+';
837	–
838	–	for (i = 0; i < 128; ++i)
839	–	if (HasUMode(source_p, user_modes[i]))
840	–	*m++ = (char)i;
841	–	*m = '\0';
842	–
843	–	sendto_one(source_p, form_str(RPL_UMODEIS),
844	–	me.name, source_p->name, buf);
845	–	return;
846	–	}
847	–
848	–	/* find flags already set for user */
849	–	setflags = source_p->umodes;
850	–
851	–	/* parse mode change string(s) */
852	–	for (p = &parv[2]; p && *p; ++p)
853	–	{
854	–	for (m = *p; *m; ++m)
855	–	{
856	–	switch (*m)
857	–	{
858	–	case '+':
859	–	what = MODE_ADD;
860	–	break;
861	–	case '-':
862	–	what = MODE_DEL;
863	–	break;
864	–	case 'o':
865	–	if (what == MODE_ADD)
866	–	{
867	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
868	–	{
869	–	++Count.oper;
870	–	SetOper(source_p);
871	–	}
872	–	}
873	–	else
874	–	{
875	–	if (!HasUMode(source_p, UMODE_OPER))
876	–	break;
877	–
878	–	ClearOper(source_p);
879	–	Count.oper--;
880	–
881	–	if (MyConnect(source_p))
882	–	{
883	–	dlink_node *dm = NULL;
884	–
885	–	detach_conf(source_p, CONF_OPER);
886	–	ClrOFlag(source_p);
887	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
888	–
889	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
890	–	free_dlink_node(dm);
891	–	}
892	–	}
893	–
894	–	break;
895	–
896	–	case 'S':  /* Only servers may set +S in a burst */
897	–	case 'W':  /* Only servers may set +W in a burst */
898	–	case 'r':  /* Only services may set +r */
899	–	case 'x':  /* Only services may set +x */
900	–	break;
901	–
902	–	default:
903	–	if ((flag = user_modes[(unsigned char)*m]))
904	–	{
905	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
906	–	(ConfigFileEntry.oper_only_umodes & flag))
907	–	badflag = 1;
908	–	else
909	–	{
910	–	if (what == MODE_ADD)
911	–	AddUMode(source_p, flag);
912	–	else
913	–	DelUMode(source_p, flag);
914	–	}
915	–	}
916	–	else if (MyConnect(source_p))
917	–	badflag = 1;
918	–
919	–	break;
920	–	}
921	–	}
922	–	}
923	–
924	–	if (badflag)
925	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
926	–	me.name, source_p->name);
927	–
928	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
929	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
930	–	{
931	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
932	–	me.name, source_p->name);
933	–	DelUMode(source_p, UMODE_ADMIN);
934	–	}
935	–
936	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
937	–	++Count.invisi;
938	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
939	–	--Count.invisi;
940	–
941	–	/*
942	–	* compare new flags with old flags and send string which
943	–	* will cause servers to update correctly.
944	–	*/
945	–	send_umode_out(client_p, source_p, setflags);
946	–	}
947	–
760		/* send_umode()
761		* send the MODE string for user (user) to connection client_p
762		* -avalon
#	Line 958 | Line 770 | set_user_mode(struct Client *client_p, s
770		*/
771		void
772		send_umode(struct Client *client_p, struct Client *source_p,
773	<	unsigned int old, unsigned int sendmask, char *umode_buf)
773	>	unsigned int old, char *umode_buf)
774		{
775		char *m = umode_buf;
776		int what = 0;
965	–	unsigned int i;
966	–	unsigned int flag;
777
778		/*
779	<	* build a string in umode_buf to represent the change in the user's
779	>	* Build a string in umode_buf to represent the change in the user's
780		* mode between the new (source_p->umodes) and 'old'.
781		*/
782	<	for (i = 0; i < 128; ++i)
782	>	for (unsigned int i = 0; i < 128; ++i)
783		{
784	<	flag = user_modes[i];
975	<	if (!flag)
976	<	continue;
784	>	unsigned int flag = user_modes[i];
785
786	<	if (MyClient(source_p) && !(flag & sendmask))
786	>	if (!flag)
787		continue;
788
789		if ((flag & old) && !HasUMode(source_p, flag))
#	Line 1020 | Line 828 | void
828		send_umode_out(struct Client *client_p, struct Client *source_p,
829		unsigned int old)
830		{
831	<	char buf[IRCD_BUFSIZE] = { '\0' };
1024	<	dlink_node *ptr = NULL;
831	>	char buf[IRCD_BUFSIZE] = "";
832
833	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
833	>	send_umode(NULL, source_p, old, buf);
834
835		if (buf[0])
836	<	{
837	<	DLINK_FOREACH(ptr, serv_list.head)
1031	<	{
1032	<	struct Client *target_p = ptr->data;
1033	<
1034	<	if ((target_p != client_p) && (target_p != source_p))
1035	<	sendto_one(target_p, ":%s MODE %s :%s",
1036	<	ID_or_name(source_p, target_p),
1037	<	ID_or_name(source_p, target_p), buf);
1038	<	}
1039	<	}
836	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
837	>	source_p->id, source_p->id, buf);
838
839		if (client_p && MyClient(client_p))
840	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
840	>	send_umode(client_p, source_p, old, buf);
841		}
842
843		void
#	Line 1065 | Line 863 | user_set_hostmask(struct Client *target_
863		default: return;
864		}
865
866	<	if (ConfigFileEntry.cycle_on_host_change)
866	>	if (ConfigGeneral.cycle_on_host_change)
867		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
868		target_p->name, target_p->username, target_p->host);
869
#	Line 1079 | Line 877 | user_set_hostmask(struct Client *target_
877
878		if (MyClient(target_p))
879		{
880	<	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1083	<	target_p->name, target_p->host);
880	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
881		clear_ban_cache_client(target_p);
882		}
883
884	<	if (!ConfigFileEntry.cycle_on_host_change)
884	>	if (!ConfigGeneral.cycle_on_host_change)
885		return;
886
887		DLINK_FOREACH(ptr, target_p->channel.head)
888		{
889	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
889	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
890		char *p = modebuf;
891		int len = 0;
892		const struct Membership *ms = ptr->data;
#	Line 1131 | Line 928 | user_set_hostmask(struct Client *target_
928		target_p->host, target_p->away);
929		}
930
931	<	/* user_welcome()
932	<	*
933	<	* inputs       - client pointer to client to welcome
1137	<	* output       - NONE
1138	<	* side effects -
1139	<	*/
1140	<	static void
1141	<	user_welcome(struct Client *source_p)
1142	<	{
1143	<	#if defined(__TIME__) && defined(__DATE__)
1144	<	static const char built_date[] = __DATE__ " at " __TIME__;
1145	<	#else
1146	<	static const char built_date[] = "unknown";
1147	<	#endif
1148	<
1149	<	#ifdef HAVE_LIBCRYPTO
1150	<	if (HasFlag(source_p, FLAGS_SSL))
1151	<	{
1152	<	AddUMode(source_p, UMODE_SSL);
1153	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1154	<	me.name, source_p->name,
1155	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1156	<	}
1157	<	#endif
1158	<
1159	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1160	<	ServerInfo.network_name, source_p->name);
1161	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1162	<	get_listener_name(source_p->localClient->listener), ircd_version);
1163	<	sendto_one(source_p, form_str(RPL_CREATED),
1164	<	me.name, source_p->name, built_date);
1165	<	sendto_one(source_p, form_str(RPL_MYINFO),
1166	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1167	<	show_isupport(source_p);
1168	<
1169	<	if (source_p->id[0] != '\0')
1170	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1171	<	source_p->name, source_p->id);
1172	<
1173	<	show_lusers(source_p);
1174	<	motd_signon(source_p);
1175	<	}
1176	<
1177	<	/* check_xline()
1178	<	*
1179	<	* inputs       - pointer to client to test
1180	<	* outupt       - 1 if exiting 0 if ok
1181	<	* side effects -
1182	<	*/
1183	<	static int
1184	<	check_xline(struct Client *source_p)
1185	<	{
1186	<	struct MaskItem *conf = NULL;
1187	<	const char *reason = NULL;
1188	<
1189	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1190	<	{
1191	<	++conf->count;
1192	<
1193	<	if (conf->reason != NULL)
1194	<	reason = conf->reason;
1195	<	else
1196	<	reason = "No Reason";
1197	<
1198	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1199	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1200	<	source_p->info, reason,
1201	<	get_client_name(source_p, HIDE_IP),
1202	<	source_p->sockhost);
1203	<
1204	<	++ServerStats.is_ref;
1205	<	exit_client(source_p, &me, "Bad user info");
1206	<	return 1;
1207	<	}
1208	<
1209	<	return 0;
1210	<	}
1211	<
1212	<	/* oper_up()
1213	<	*
1214	<	* inputs       - pointer to given client to oper
1215	<	* output       - NONE
1216	<	* side effects - Blindly opers up given source_p, using conf info
1217	<	*                all checks on passwords have already been done.
1218	<	*                This could also be used by rsa oper routines.
931	>	/*! \brief Blindly opers up given source_p, using conf info.
932	>	*         All checks on passwords have already been done.
933	>	* \param source_p Pointer to given client to oper
934		*/
935		void
936		oper_up(struct Client *source_p)
#	Line 1230 | Line 945 | oper_up(struct Client *source_p)
945
946		if (conf->modes)
947		AddUMode(source_p, conf->modes);
948	<	else if (ConfigFileEntry.oper_umodes)
949	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
948	>	else if (ConfigGeneral.oper_umodes)
949	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
950
951		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
952		++Count.invisi;
#	Line 1248 | Line 963 | oper_up(struct Client *source_p)
963
964		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
965		get_oper_name(source_p));
966	+	sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
967	+	me.id, get_oper_name(source_p));
968		send_umode_out(source_p, source_p, old);
969	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
969	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
970		}
971
972	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
972	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
973
974		int
975		valid_sid(const char *sid)
#	Line 1277 | Line 994 | valid_sid(const char *sid)
994		void
995		init_uid(void)
996		{
1280	–	unsigned int i;
1281	–
997		memset(new_uid, 0, sizeof(new_uid));
998
999	<	if (!EmptyString(ServerInfo.sid))
1000	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
999	>	if (!EmptyString(ConfigServerInfo.sid))
1000	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
1001
1002	<	for (i = 0; i < IRC_MAXSID; ++i)
1002	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1003		if (new_uid[i] == '\0')
1004		new_uid[i] = 'A';
1005
#	Line 1301 | Line 1016 | init_uid(void)
1016		*                note this is a recursive function
1017		*/
1018		static void
1019	<	add_one_to_uid(int i)
1019	>	add_one_to_uid(unsigned int i)
1020		{
1021	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1021	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1022		{
1023		if (new_uid[i] == 'Z')
1024		new_uid[i] = '0';
1025		else if (new_uid[i] == '9')
1026		{
1027		new_uid[i] = 'A';
1028	<	add_one_to_uid(i-1);
1028	>	add_one_to_uid(i - 1);
1029		}
1030		else
1031		++new_uid[i];
#	Line 1335 | Line 1050 | add_one_to_uid(int i)
1050		static const char *
1051		uid_get(void)
1052		{
1053	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1053	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1054		return new_uid;
1055		}
1056
#	Line 1350 | Line 1065 | void
1065		init_isupport(void)
1066		{
1067		add_isupport("CALLERID", NULL, -1);
1068	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1068	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1069		add_isupport("DEAF", "D", -1);
1070		add_isupport("KICKLEN", NULL, KICKLEN);
1071		add_isupport("MODES", NULL, MAXMODEPARAMS);
1357	–	#ifdef HALFOPS
1072		add_isupport("PREFIX", "(ohv)@%+", -1);
1073		add_isupport("STATUSMSG", "@%+", -1);
1360	–	#else
1361	–	add_isupport("PREFIX", "(ov)@+", -1);
1362	–	add_isupport("STATUSMSG", "@+", -1);
1363	–	#endif
1074		add_isupport("EXCEPTS", "e", -1);
1075		add_isupport("INVEX", "I", -1);
1076		}
#	Line 1378 | Line 1088 | void
1088		add_isupport(const char *name, const char *options, int n)
1089		{
1090		dlink_node *ptr;
1091	<	struct Isupport *support;
1091	>	struct Isupport *support = NULL;
1092
1093		DLINK_FOREACH(ptr, support_list.head)
1094		{
#	Line 1393 | Line 1103 | add_isupport(const char *name, const cha
1103
1104		if (ptr == NULL)
1105		{
1106	<	support = MyMalloc(sizeof(*support));
1106	>	support = MyCalloc(sizeof(*support));
1107		dlinkAddTail(support, &support->node, &support_list);
1108		}
1109
1110		support->name = xstrdup(name);
1111	<	if (options != NULL)
1111	>	if (options)
1112		support->options = xstrdup(options);
1113		support->number = n;
1114
#	Line 1450 | Line 1160 | rebuild_isupport_message_line(void)
1160		int n = 0;
1161		int tokens = 0;
1162		size_t len = 0;
1163	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1163	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1164
1165		DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1166		{
#	Line 1466 | Line 1176 | rebuild_isupport_message_line(void)
1176		p += (n = sprintf(p, "%s", support->name));
1177		len += n;
1178
1179	<	if (support->options != NULL)
1179	>	if (support->options)
1180		{
1181		p += (n = sprintf(p, "=%s", support->options));
1182		len += n;
#	Line 1494 | Line 1204 | rebuild_isupport_message_line(void)
1204		}
1205		}
1206
1207	<	if (len != 0)
1207	>	if (len)
1208		{
1209		if (*--p == ' ')
1210		*p = '\0';

Diff Legend

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