ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_user.c (file contents), Revision 627 by michael, Fri May 26 11:33:57 2006 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 3655 by michael, Wed May 28 20:51:21 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 "tools.h"
29	<	#include "s_user.h"
28	<	#include "s_misc.h"
28	>	#include "list.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "common.h"
33	–	#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
37	–	#include "s_bsd.h"
38	–	#include "irc_getnameinfo.h"
35		#include "ircd.h"
40	–	#include "list.h"
36		#include "listener.h"
37		#include "motd.h"
38		#include "numeric.h"
39	<	#include "s_conf.h"
40	<	#include "s_log.h"
41	<	#include "s_serv.h"
47	<	#include "s_stats.h"
39	>	#include "conf.h"
40	>	#include "log.h"
41	>	#include "server.h"
42		#include "send.h"
43		#include "supported.h"
50	–	#include "whowas.h"
44		#include "memory.h"
45		#include "packet.h"
46	+	#include "rng_mt.h"
47		#include "userhost.h"
48	<	#include "hook.h"
49	<	#include "s_misc.h"
50	<	#include "msg.h"
57	<	#include "pcre.h"
58	<
59	<	int MaxClientCount     = 1;
60	<	int MaxConnectionCount = 1;
61	<	struct Callback *entering_umode_cb = NULL;
62	<	struct Callback *umode_cb = NULL;
63	<	struct Callback *uid_get_cb = NULL;
48	>	#include "misc.h"
49	>	#include "parse.h"
50	>	#include "watch.h"
51
52		static char umode_buffer[IRCD_BUFSIZE];
53	<
67	<	static void user_welcome(struct Client *);
68	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
69	<	static int check_xline(struct Client *);
70	<	static void introduce_client(struct Client *, struct Client *);
71	<	static void *uid_get(va_list);
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	<
77	<	struct Isupport
58	>	struct Isupport
59		{
60		dlink_node node;
61		char *name;
#	Line 82 | 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 98 | Line 79 | unsigned int user_modes[256] =
79		0,                  /* C */
80		UMODE_DEAF,         /* D */
81		0,                  /* E */
82	<	0,                  /* F */
82	>	UMODE_FARCONNECT,   /* F */
83		UMODE_SOFTCALLERID, /* G */
84	<	0,                  /* H */
84	>	UMODE_HIDDEN,       /* H */
85		0,                  /* I */
86		0,                  /* J */
87		0,                  /* K */
#	Line 110 | Line 91 | unsigned int user_modes[256] =
91		0,                  /* O */
92		0,                  /* P */
93		0,                  /* Q */
94	<	0,                  /* R */
95	<	0,                  /* S */
94	>	UMODE_REGONLY,      /* R */
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 */
113		UMODE_INVISIBLE,    /* i */
114	<	0,                  /* j */
114	>	UMODE_REJ,          /* j */
115		UMODE_SKILL,        /* k */
116		UMODE_LOCOPS,       /* l */
117		0,                  /* m */
118		UMODE_NCHANGE,      /* n */
119		UMODE_OPER,         /* o */
120	<	0,                  /* p */
121	<	0,                  /* q */
122	<	UMODE_REJ,          /* r */
120	>	UMODE_HIDECHANS,    /* p */
121	>	UMODE_HIDEIDLE,     /* q */
122	>	UMODE_REGISTERED,   /* r */
123		UMODE_SERVNOTICE,   /* s */
124		0,                  /* t */
125		UMODE_UNAUTH,       /* u */
126		0,                  /* v */
127		UMODE_WALLOP,       /* w */
128	<	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 165 | Line 146 | assemble_umode_buffer(void)
146		unsigned int idx = 0;
147		char *umode_buffer_ptr = umode_buffer;
148
149	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
149	>	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
150		if (user_modes[idx])
151		*umode_buffer_ptr++ = idx;
152
#	Line 179 | 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		{
165	<	const char *from, *to;
165	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
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_numeric(source_p, &me, RPL_LUSERCLIENT,
170	>	(Count.total - Count.invisi), Count.invisi, 1);
171	>
172	>	if (Count.oper)
173	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
174	>
175	>	if (dlink_list_length(&unknown_list))
176	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
177	>
178	>	if (dlink_list_length(&global_channel_list))
179	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
180
181	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
181	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
182		{
183	<	from = me.id;
184	<	to = source_p->id;
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	<	from = me.name;
189	<	to = source_p->name;
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	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
198	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
199	<	from, to, (Count.total-Count.invisi),
200	<	Count.invisi, dlink_list_length(&global_serv_list));
201	<	else
202	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
203	<	(Count.total-Count.invisi), Count.invisi, 1);
192	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
193
194	<	if (Count.oper > 0)
195	<	sendto_one(source_p, form_str(RPL_LUSEROP),
196	<	from, to, Count.oper);
208	<
209	<	if (dlink_list_length(&unknown_list) > 0)
210	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
211	<	from, to, dlink_list_length(&unknown_list));
212	<
213	<	if (dlink_list_length(&global_channel_list) > 0)
214	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
215	<	from, to, dlink_list_length(&global_channel_list));
216	<
217	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
218	<	{
219	<	sendto_one(source_p, form_str(RPL_LUSERME),
220	<	from, to, Count.local, Count.myserver);
221	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
222	<	from, to, Count.local, Count.max_loc,
223	<	Count.local, Count.max_loc);
224	<	}
225	<	else
226	<	{
227	<	sendto_one(source_p, form_str(RPL_LUSERME),
228	<	from, to, Count.total, 0);
229	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
230	<	from, to, Count.total, Count.max_tot,
231	<	Count.total, Count.max_tot);
232	<	}
233	<
234	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
235	<	from, to, Count.total, Count.max_tot,
236	<	Count.total, Count.max_tot);
237	<
238	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
239	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
240	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
194	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
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 > MaxClientCount)
199	<	MaxClientCount = Count.local;
198	>	if (Count.local > Count.max_loc_cli)
199	>	Count.max_loc_cli = Count.local;
200
201	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
202	<	MaxConnectionCount = Count.local + Count.myserver;
201	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
202	>	Count.max_loc_con = Count.local + Count.myserver;
203		}
204
205		/* show_isupport()
#	Line 253 | 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	<	*/
243	<	void
244	<	register_local_user(struct Client *client_p, struct Client *source_p,
245	<	const char *nick, const char *username)
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		{
288	–	const struct AccessItem *aconf = NULL;
289	–	char ipaddr[HOSTIPLEN];
285		dlink_node *ptr = NULL;
286	<	dlink_node *m = NULL;
286	>	char ubuf[IRCD_BUFSIZE] = "";
287	>
288	>	if (MyClient(source_p))
289	>	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
290	>	else
291	>	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
292	>
293	>	watch_check_hash(source_p, RPL_LOGON);
294	>
295	>	if (ubuf[0] == '\0')
296	>	{
297	>	ubuf[0] = '+';
298	>	ubuf[1] = '\0';
299	>	}
300	>
301	>	DLINK_FOREACH(ptr, serv_list.head)
302	>	{
303	>	struct Client *server = ptr->data;
304	>
305	>	if (server == source_p->from)
306	>	continue;
307	>
308	>	if (IsCapable(server, CAP_SVS))
309	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
310	>	source_p->servptr->id,
311	>	source_p->name, source_p->hopcount+1,
312	>	(unsigned long)source_p->tsinfo,
313	>	ubuf, source_p->username, source_p->host,
314	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
315	>	"0" : source_p->sockhost, source_p->id,
316	>	source_p->svid,
317	>	source_p->info);
318	>	else
319	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
320	>	source_p->servptr->id,
321	>	source_p->name, source_p->hopcount+1,
322	>	(unsigned long)source_p->tsinfo,
323	>	ubuf, source_p->username, source_p->host,
324	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
325	>	"0" : source_p->sockhost, source_p->id, source_p->info);
326	>
327	>	if (!EmptyString(source_p->certfp))
328	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
329	>	}
330	>	}
331	>
332	>	/* user_welcome()
333	>	*
334	>	* inputs       - client pointer to client to welcome
335	>	* output       - NONE
336	>	* side effects -
337	>	*/
338	>	static void
339	>	user_welcome(struct Client *source_p)
340	>	{
341	>	#if defined(__TIME__) && defined(__DATE__)
342	>	static const char built_date[] = __DATE__ " at " __TIME__;
343	>	#else
344	>	static const char built_date[] = "unknown";
345	>	#endif
346	>
347	>	#ifdef HAVE_LIBCRYPTO
348	>	if (HasFlag(source_p, FLAGS_SSL))
349	>	{
350	>	AddUMode(source_p, UMODE_SSL);
351	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
352	>	ssl_get_cipher(source_p->localClient->fd.ssl));
353	>	}
354	>	#endif
355	>
356	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
357	>	source_p->name);
358	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
359	>	get_listener_name(source_p->localClient->listener), ircd_version);
360	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
361	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
362	>	show_isupport(source_p);
363	>
364	>	if (source_p->id[0])
365	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
366	>
367	>	show_lusers(source_p);
368	>	motd_signon(source_p);
369	>	}
370	>
371	>	/* check_xline()
372	>	*
373	>	* inputs       - pointer to client to test
374	>	* outupt       - 1 if exiting 0 if ok
375	>	* side effects -
376	>	*/
377	>	static int
378	>	check_xline(struct Client *source_p)
379	>	{
380	>	struct MaskItem *conf = NULL;
381	>	const char *reason = NULL;
382	>
383	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
384	>	{
385	>	++conf->count;
386	>
387	>	if (conf->reason)
388	>	reason = conf->reason;
389	>	else
390	>	reason = CONF_NOREASON;
391	>
392	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
393	>	"X-line Rejecting [%s] [%s], user %s [%s]",
394	>	source_p->info, reason,
395	>	get_client_name(source_p, HIDE_IP),
396	>	source_p->sockhost);
397	>
398	>	++ServerStats.is_ref;
399	>	exit_client(source_p, "Bad user info");
400	>	return 1;
401	>	}
402	>
403	>	return 0;
404	>	}
405	>
406	>	/*! \brief This function is called when both NICK and USER messages
407	>	*      have been accepted for the client, in whatever order. Only
408	>	*      after this, is the UID message propagated.
409	>	* \param source_p Pointer to given client to introduce
410	>	*/
411	>	void
412	>	register_local_user(struct Client *source_p)
413	>	{
414	>	const char *id = NULL;
415	>	const struct MaskItem *conf = NULL;
416
417	<	assert(source_p != NULL);
417	>	assert(source_p == source_p->from);
418		assert(MyConnect(source_p));
295	–	assert(source_p->username != username);
419		assert(!source_p->localClient->registration);
420
421	<	ClearCap(client_p, CAP_TS6);
421	>	ClearCap(source_p, CAP_TS6);
422
423		if (ConfigFileEntry.ping_cookie)
424		{
425	<	if (!IsPingSent(source_p) &&
303	<	source_p->localClient->random_ping == 0)
425	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
426		{
427	<	source_p->localClient->random_ping = (unsigned long)rand();
428	<	sendto_one(source_p, "PING :%lu",
427	>	do
428	>	source_p->localClient->random_ping = genrand_int32();
429	>	while (!source_p->localClient->random_ping);
430	>
431	>	sendto_one(source_p, "PING :%u",
432		source_p->localClient->random_ping);
433		SetPingSent(source_p);
434		return;
#	Line 313 | Line 438 | register_local_user(struct Client *clien
438		return;
439		}
440
441	<	source_p->localClient->last = CurrentTime;
441	>	source_p->localClient->last_privmsg = CurrentTime;
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, 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;
332	<	aconf = map_to_conf(ptr->data);
456	>	conf = source_p->localClient->confs.head->data;
457
458		if (!IsGotId(source_p))
459		{
460	<	const char *p = NULL;
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");
466	>	++ServerStats.is_ref;
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	<	p = username;
473	>	strlcpy(username, source_p->username, sizeof(username));
474
475	<	if (!IsNoTilde(aconf))
475	>	if (!IsNoTilde(conf))
476		source_p->username[i++] = '~';
477
478	<	while (*p && i < USERLEN)
354	<	{
478	>	for (; *p && i < USERLEN; ++p)
479		if (*p != '[')
480		source_p->username[i++] = *p;
357	–	p++;
358	–	}
481
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;
367	<
368	<	if (!match_conf_password(pass, aconf))
488	>	if (!match_conf_password(source_p->localClient->passwd, conf))
489		{
490	<	ServerStats->is_ref++;
491	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
492	<	me.name, source_p->name);
493	<	exit_client(source_p, &me, "Bad Password");
490	>	++ServerStats.is_ref;
491	>
492	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
493	>	exit_client(source_p, "Bad Password");
494		return;
495		}
496		}
497
498	<	/* don't free source_p->localClient->passwd here - it can be required
498	>	/*
499	>	* Don't free source_p->localClient->passwd here - it can be required
500		* by masked /stats I if there are auth{} blocks with need_password = no;
501		* --adx
502		*/
503
504	<	/* report if user has &^>= etc. and set flags as needed in source_p */
505	<	report_and_set_user_flags(source_p, aconf);
504	>	/*
505	>	* Report if user has &^>= etc. and set flags as needed in source_p
506	>	*/
507	>	report_and_set_user_flags(source_p, conf);
508	>
509	>	if (IsDead(source_p))
510	>	return;
511
512	<	/* Limit clients -
512	>	/*
513	>	* Limit clients -
514		* We want to be able to have servers and F-line clients
515		* connect, so save room for "buffer" connections.
516		* Smaller servers may want to decrease this, and it should
517		* probably be just a percentage of the MAXCLIENTS...
518		*   -Taner
519		*/
393	–	/* Except "F:" clients */
520		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
521		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
522		{
523	<	sendto_realops_flags(UMODE_FULL, L_ALL,
523	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
524		"Too many clients, rejecting %s[%s].",
525	<	nick, source_p->host);
526	<	ServerStats->is_ref++;
527	<	exit_client(source_p, &me, "Sorry, server is full - try later");
525	>	source_p->name, source_p->host);
526	>	++ServerStats.is_ref;
527	>	exit_client(source_p, "Sorry, server is full - try later");
528		return;
529		}
530
531	<	/* valid user name check */
406	<	if (valid_username(source_p->username) == 0)
531	>	if (!valid_username(source_p->username, 1))
532		{
533	<	char tmpstr2[IRCD_BUFSIZE];
533	>	char buf[IRCD_BUFSIZE] = "";
534
535	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
536	<	nick, source_p->username, source_p->host);
537	<	ServerStats->is_ref++;
538	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
539	<	exit_client(source_p, &me, tmpstr2);
535	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
536	>	"Invalid username: %s (%s@%s)",
537	>	source_p->name, source_p->username, source_p->host);
538	>	++ServerStats.is_ref;
539	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
540	>	exit_client(source_p, buf);
541		return;
542		}
543
418	–	assert(source_p == client_p);
419	–
544		if (check_xline(source_p))
545		return;
546
547	<	if (IsDead(client_p))
548	<	return;
547	>	while (hash_find_id((id = uid_get())))
548	>	;
549
550	<	if (me.id[0])
551	<	{
428	<	const char *id = execute_callback(uid_get_cb, source_p);
429	<
430	<	while (hash_find_id(id) != NULL)
431	<	id = uid_get(NULL);
432	<
433	<	strlcpy(source_p->id, id, sizeof(source_p->id));
434	<	hash_add_id(source_p);
435	<	}
550	>	strlcpy(source_p->id, id, sizeof(source_p->id));
551	>	hash_add_id(source_p);
552
553	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
554	<	source_p->localClient->ip.ss_len, ipaddr,
555	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
440	<
441	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
442	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
443	<	nick, source_p->username, source_p->host,
553	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
554	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
555	>	source_p->name, source_p->username, source_p->host,
556		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
557	<	"255.255.255.255" : ipaddr, get_client_class(source_p),
558	<	source_p->info);
559	<
448	<	/* If they have died in send_* don't do anything. */
449	<	if (IsDead(source_p))
450	<	return;
557	>	"255.255.255.255" : source_p->sockhost,
558	>	get_client_class(&source_p->localClient->confs),
559	>	source_p->info, source_p->id);
560
561		if (ConfigFileEntry.invisible_on_connect)
562		{
563	<	source_p->umodes |= UMODE_INVISIBLE;
564	<	Count.invisi++;
563	>	AddUMode(source_p, UMODE_INVISIBLE);
564	>	++Count.invisi;
565		}
566
567	<	if ((++Count.local) > Count.max_loc)
567	>	if (++Count.local > Count.max_loc)
568		{
569		Count.max_loc = Count.local;
570
571		if (!(Count.max_loc % 10))
572	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
572	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
573	>	"New Max Local Clients: %d",
574		Count.max_loc);
575		}
576
467	–	SetClient(source_p);
468	–
469	–	source_p->servptr = &me;
470	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
471	–
472	–	/* Increment our total user count here */
577		if (++Count.total > Count.max_tot)
578		Count.max_tot = Count.total;
579	<	Count.totalrestartcount++;
579	>	++Count.totalrestartcount;
580
581	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
581	>	assert(source_p->servptr == &me);
582	>	SetClient(source_p);
583	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
584
585	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
586	<	{
587	<	free_dlink_node(m);
588	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
483	<	}
484	<	else assert(0);
585	>	assert(dlinkFind(&unknown_list, source_p));
586	>
587	>	dlink_move_node(&source_p->localClient->lclient_node,
588	>	&unknown_list, &local_client_list);
589
590		user_welcome(source_p);
591		add_user_host(source_p->username, source_p->host, 0);
592		SetUserHost(source_p);
593
594	<	introduce_client(client_p, source_p);
594	>	introduce_client(source_p);
595		}
596
597		/* register_remote_user()
598		*
599	<	* inputs       - client_p directly connected client
496	<	*              - source_p remote or directly connected client
599	>	* inputs       - source_p remote or directly connected client
600		*              - username to register as
601		*              - host name to register as
602		*              - server name
500	–	*              - realname (gecos)
603		* output       - NONE
604		* side effects - This function is called when a remote client
605		*                is introduced by a server.
606		*/
607		void
608	<	register_remote_user(struct Client *client_p, struct Client *source_p,
609	<	const char *username, const char *host, const char *server,
508	<	const char *realname)
608	>	register_remote_user(struct Client *source_p, const char *username,
609	>	const char *host, const char *server)
610		{
611		struct Client *target_p = NULL;
612
512	–	assert(source_p != NULL);
613		assert(source_p->username != username);
614
615	<	strlcpy(source_p->host, host, sizeof(source_p->host));
516	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
615	>	strlcpy(source_p->host, host, sizeof(source_p->host));
616		strlcpy(source_p->username, username, sizeof(source_p->username));
617
618		/*
619	<	* coming from another server, take the servers word for it
619	>	* Coming from another server, take the servers word for it
620		*/
621	<	source_p->servptr = find_server(server);
621	>	source_p->servptr = hash_find_server(server);
622
623	<	/* Super GhostDetect:
623	>	/*
624	>	* Super GhostDetect:
625		* If we can't find the server the user is supposed to be on,
626		* then simply blow the user away.        -Taner
627		*/
628		if (source_p->servptr == NULL)
629		{
630	<	sendto_realops_flags(UMODE_ALL, L_ALL,
630	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
631		"No server %s for user %s[%s@%s] from %s",
632		server, source_p->name, source_p->username,
633		source_p->host, source_p->from->name);
634	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
634	>	sendto_one(source_p->from,
635	>	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
636	>	me.id, source_p->id, me.name, server);
637
638	<	SetKilled(source_p);
639	<	exit_client(source_p, &me, "Ghosted Client");
638	>	AddFlag(source_p, FLAGS_KILLED);
639	>	exit_client(source_p, "Ghosted Client");
640		return;
641		}
642
643		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
644		{
645	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
645	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
646		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
647	<	client_p->name, source_p->name, source_p->username,
647	>	source_p->from->name, source_p->name, source_p->username,
648		source_p->host, source_p->servptr->name,
649		target_p->name, target_p->from->name);
650	<	kill_client(client_p, source_p,
651	<	"%s (NICK from wrong direction (%s != %s))",
652	<	me.name, source_p->servptr->name, target_p->from->name);
653	<	SetKilled(source_p);
654	<	exit_client(source_p, &me, "USER server wrong direction");
650	>	sendto_one(source_p->from,
651	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
652	>	me.id, source_p->id, me.name, source_p->servptr->name,
653	>	target_p->from->name);
654	>
655	>	AddFlag(source_p, FLAGS_KILLED);
656	>	exit_client(source_p, "USER server wrong direction");
657		return;
658		}
659
660	<	/* Increment our total user count here */
660	>	/*
661	>	* If the nick has been introduced by a services server,
662	>	* make it a service as well.
663	>	*/
664	>	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
665	>	AddFlag(source_p, FLAGS_SERVICE);
666	>
667		if (++Count.total > Count.max_tot)
668		Count.max_tot = Count.total;
669
560	–	++source_p->from->serv->dep_users;
561	–
670		SetClient(source_p);
671	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
671	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
672		add_user_host(source_p->username, source_p->host, 1);
673		SetUserHost(source_p);
674
675	<	introduce_client(client_p, source_p);
676	<	}
677	<
678	<	/* introduce_client()
679	<	*
680	<	* inputs       - client_p
573	<	*              - source_p
574	<	* output       - NONE
575	<	* side effects - This common function introduces a client to the rest
576	<	*                of the net, either from a local client connect or
577	<	*                from a remote connect.
578	<	*/
579	<	static void
580	<	introduce_client(struct Client *client_p, struct Client *source_p)
581	<	{
582	<	dlink_node *server_node = NULL;
583	<	static char ubuf[12];
584	<
585	<	if (MyClient(source_p))
586	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
587	<	else
588	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
589	<
590	<	if (*ubuf == '\0')
591	<	{
592	<	ubuf[0] = '+';
593	<	ubuf[1] = '\0';
594	<	}
595	<
596	<	/* arghhh one could try not introducing new nicks to ll leafs
597	<	* but then you have to introduce them "on the fly" in SJOIN
598	<	* not fun.
599	<	* Its not going to cost much more bandwidth to simply let new
600	<	* nicks just ride on through.
601	<	*/
602	<
603	<	/* We now introduce nicks "on the fly" in SJOIN anyway --
604	<	* you _need_ to if you aren't going to burst everyone initially.
605	<	*
606	<	* Only send to non CAP_LL servers, unless we're a lazylink leaf,
607	<	* in that case just send it to the uplink.
608	<	* -davidt
609	<	* rewritten to cope with SIDs .. eww eww eww --is
610	<	*/
611	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL) &&
612	<	client_p != uplink)
613	<	{
614	<	if (IsCapable(uplink, CAP_TS6) && HasID(source_p))
615	<	{
616	<	sendto_one(uplink, ":%s UID %s %d %lu %s %s %s %s %s :%s",
617	<	source_p->servptr->id,
618	<	source_p->name, source_p->hopcount+1,
619	<	(unsigned long)source_p->tsinfo,
620	<	ubuf, source_p->username, source_p->host,
621	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
622	<	"0" : source_p->sockhost, source_p->id, source_p->info);
623	<	}
624	<	else
625	<	{
626	<	sendto_one(uplink, "NICK %s %d %lu %s %s %s %s :%s",
627	<	source_p->name, source_p->hopcount+1,
628	<	(unsigned long)source_p->tsinfo,
629	<	ubuf, source_p->username, source_p->host,
630	<	source_p->servptr->name, source_p->info);
631	<	}
632	<	}
633	<	else
634	<	{
635	<	DLINK_FOREACH(server_node, serv_list.head)
636	<	{
637	<	struct Client *server = server_node->data;
638	<
639	<	if (IsCapable(server, CAP_LL) || server == client_p)
640	<	continue;
675	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
676	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
677	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
678	>	source_p->servptr->name,
679	>	source_p->name, source_p->username, source_p->host,
680	>	source_p->info, source_p->id);
681
682	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
643	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
644	<	source_p->servptr->id,
645	<	source_p->name, source_p->hopcount+1,
646	<	(unsigned long)source_p->tsinfo,
647	<	ubuf, source_p->username, source_p->host,
648	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
649	<	"0" : source_p->sockhost, source_p->id, source_p->info);
650	<	else
651	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
652	<	source_p->name, source_p->hopcount+1,
653	<	(unsigned long)source_p->tsinfo,
654	<	ubuf, source_p->username, source_p->host,
655	<	source_p->servptr->name, source_p->info);
656	<	}
657	<	}
682	>	introduce_client(source_p);
683		}
684
685		/* valid_hostname()
#	Line 671 | Line 696 | valid_hostname(const char *hostname)
696		{
697		const char *p = hostname;
698
699	<	assert(p != NULL);
699	>	assert(p);
700
701	<	if ('.' == *p || ':' == *p)
701	>	if (EmptyString(p) || *p == '.' || *p == ':')
702		return 0;
703
704	<	while (*p)
680	<	{
704	>	for (; *p; ++p)
705		if (!IsHostChar(*p))
706		return 0;
683	–	p++;
684	–	}
707
708	<	return 1;
708	>	return p - hostname <= HOSTLEN;
709		}
710
711		/* valid_username()
#	Line 698 | Line 720 | valid_hostname(const char *hostname)
720		* style of username
721		*/
722		int
723	<	valid_username(const char *username)
723	>	valid_username(const char *username, const int local)
724		{
725		int dots      = 0;
726		const char *p = username;
727
728	<	assert(p != NULL);
728	>	assert(p);
729
730	<	if ('~' == *p)
730	>	if (*p == '~')
731		++p;
732
733	<	/* reject usernames that don't start with an alphanum
733	>	/*
734	>	* Reject usernames that don't start with an alphanum
735		* i.e. reject jokers who have '-@somehost' or '.@somehost'
736		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
737		*/
738		if (!IsAlNum(*p))
739		return 0;
740
741	<	while (*++p)
741	>	if (local)
742		{
743	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
743	>	while (*++p)
744		{
745	<	dots++;
746	<
747	<	if (dots > ConfigFileEntry.dots_in_ident)
748	<	return 0;
749	<	if (!IsUserChar(p[1]))
745	>	if (*p == '.' && ConfigFileEntry.dots_in_ident)
746	>	{
747	>	if (++dots > ConfigFileEntry.dots_in_ident)
748	>	return 0;
749	>	if (!IsUserChar(*(p + 1)))
750	>	return 0;
751	>	}
752	>	else if (!IsUserChar(*p))
753		return 0;
754		}
729	–	else if (!IsUserChar(*p))
730	–	return 0;
731	–	}
732	–
733	–	return 1;
734	–	}
735	–
736	–	/* report_and_set_user_flags()
737	–	*
738	–	* inputs       - pointer to source_p
739	–	*              - pointer to aconf for this user
740	–	* output       - NONE
741	–	* side effects - Report to user any special flags
742	–	*                they are getting, and set them.
743	–	*/
744	–	static void
745	–	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
746	–	{
747	–	/* If this user is being spoofed, tell them so */
748	–	if (IsConfDoSpoofIp(aconf))
749	–	{
750	–	sendto_one(source_p,
751	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
752	–	me.name, source_p->name);
753	–	}
754	–
755	–	/* If this user is in the exception class, Set it "E lined" */
756	–	if (IsConfExemptKline(aconf))
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	–	/* The else here is to make sure that G line exempt users
765	–	* do not get noticed twice.
766	–	*/
767	–	else if (IsConfExemptGline(aconf))
768	–	{
769	–	SetExemptGline(source_p);
770	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
771	–	me.name, source_p->name);
772	–	}
773	–
774	–	if (IsConfExemptResv(aconf))
775	–	{
776	–	SetExemptResv(source_p);
777	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
778	–	me.name, source_p->name);
755		}
756	<
781	<	/* If this user is exempt from user limits set it "F lined" */
782	<	if (IsConfExemptLimits(aconf))
783	<	{
784	<	SetExemptLimits(source_p);
785	<	sendto_one(source_p,
786	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
787	<	me.name,source_p->name);
788	<	}
789	<
790	<	/* If this user is exempt from idle time outs */
791	<	if (IsConfIdlelined(aconf))
756	>	else
757		{
758	<	SetIdlelined(source_p);
759	<	sendto_one(source_p,
760	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
796	<	me.name, source_p->name);
758	>	while (*++p)
759	>	if (!IsUserChar(*p))
760	>	return 0;
761		}
762
763	<	if (IsConfCanFlood(aconf))
800	<	{
801	<	SetCanFlood(source_p);
802	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
803	<	"protection, aren't you fearsome.",
804	<	me.name, source_p->name);
805	<	}
763	>	return p - username <= USERLEN;;
764		}
765
766	<	/* do_local_user()
766	>	/* clean_nick_name()
767		*
768	<	* inputs       -
769	<	* output       - NONE
770	<	* side effects -
768	>	* input        - nickname
769	>	*              - whether it's a local nick (1) or remote (0)
770	>	* output       - none
771	>	* side effects - walks through the nickname, returning 0 if erroneous
772		*/
773	<	void
774	<	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
816	<	const char *username, const char *host, const char *server,
817	<	const char *realname)
773	>	int
774	>	valid_nickname(const char *nickname, const int local)
775		{
776	<	assert(source_p != NULL);
820	<	assert(source_p->username != username);
821	<
822	<	if (source_p == NULL)
823	<	return;
824	<
825	<	if (!IsUnknown(source_p))
826	<	{
827	<	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
828	<	me.name, nick);
829	<	return;
830	<	}
776	>	const char *p = nickname;
777
778	<	source_p->localClient->registration &= ~REG_NEED_USER;
778	>	assert(nickname && *nickname);
779
780		/*
781	<	* don't take the clients word for it, ever
781	>	* Nicks can't start with a digit or - or be 0 length.
782		*/
783	<	source_p->servptr = &me;
784	<
839	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
840	<
841	<	if (!IsGotId(source_p))
842	<	{
843	<	/* save the username in the client
844	<	* If you move this you'll break ping cookies..you've been warned
845	<	*/
846	<	strlcpy(source_p->username, username, sizeof(source_p->username));
847	<	}
848	<
849	<	if (!source_p->localClient->registration)
850	<	/* NICK already received, now I have USER... */
851	<	register_local_user(client_p, source_p, source_p->name, username);
852	<	}
853	<
854	<	/* change_simple_umode()
855	<	*
856	<	* this callback can be hooked to allow special handling of
857	<	* certain usermodes
858	<	*/
859	<	static void *
860	<	change_simple_umode(va_list args)
861	<	{
862	<	struct Client *client_p;
863	<	struct Client *source_p;
864	<	int what;
865	<	unsigned int flag;
866	<
867	<	client_p = va_arg(args, struct Client *);
868	<	source_p = va_arg(args, struct Client *);
869	<	what = va_arg(args, int);
870	<	flag = va_arg(args, unsigned int);
871	<
872	<	if (what == MODE_ADD)
873	<	source_p->umodes |= flag;
874	<	else
875	<	source_p->umodes &= ~flag;
876	<
877	<	return NULL;
878	<	}
879	<
880	<	/* set_user_mode()
881	<	*
882	<	* added 15/10/91 By Darren Reed.
883	<	* parv[0] - sender
884	<	* parv[1] - username to change mode for
885	<	* parv[2] - modes to change
886	<	*/
887	<	void
888	<	set_user_mode(struct Client *client_p, struct Client *source_p,
889	<	int parc, char *parv[])
890	<	{
891	<	unsigned int flag, setflags;
892	<	char **p, *m, buf[IRCD_BUFSIZE];
893	<	struct Client *target_p;
894	<	int what = MODE_ADD, badflag = 0, i;
895	<
896	<	assert(!(parc < 2));
897	<
898	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
899	<	{
900	<	if (MyConnect(source_p))
901	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
902	<	me.name, source_p->name, parv[1]);
903	<	return;
904	<	}
905	<
906	<	if (IsServer(source_p))
907	<	{
908	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
909	<	parv[1], source_p->name);
910	<	return;
911	<	}
912	<
913	<	if (source_p != target_p || target_p->from != source_p->from)
914	<	{
915	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
916	<	me.name, source_p->name);
917	<	return;
918	<	}
919	<
920	<	if (parc < 3)
921	<	{
922	<	m = buf;
923	<	*m++ = '+';
924	<
925	<	for (i = 0; i < 128; i++)
926	<	if (source_p->umodes & user_modes[i])
927	<	*m++ = (char)i;
928	<	*m = '\0';
929	<
930	<	sendto_one(source_p, form_str(RPL_UMODEIS),
931	<	me.name, source_p->name, buf);
932	<	return;
933	<	}
934	<
935	<	execute_callback(entering_umode_cb, client_p, source_p);
936	<
937	<	/* find flags already set for user */
938	<	setflags = source_p->umodes;
939	<
940	<	/* parse mode change string(s) */
941	<	for (p = &parv[2]; p && *p; p++)
942	<	{
943	<	for (m = *p; *m; m++)
944	<	{
945	<	switch (*m)
946	<	{
947	<	case '+':
948	<	what = MODE_ADD;
949	<	break;
950	<	case '-':
951	<	what = MODE_DEL;
952	<	break;
953	<	case 'o':
954	<	if (what == MODE_ADD)
955	<	{
956	<	if (IsServer(client_p) && !IsOper(source_p))
957	<	{
958	<	++Count.oper;
959	<	SetOper(source_p);
960	<	}
961	<	}
962	<	else
963	<	{
964	<	/* Only decrement the oper counts if an oper to begin with
965	<	* found by Pat Szuta, Perly , perly@xnet.com
966	<	*/
967	<	if (!IsOper(source_p))
968	<	break;
969	<
970	<	ClearOper(source_p);
971	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
972	<	Count.oper--;
973	<
974	<	if (MyConnect(source_p))
975	<	{
976	<	dlink_node *dm;
977	<
978	<	detach_conf(source_p, OPER_TYPE);
979	<	ClearOperFlags(source_p);
980	<
981	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
982	<	free_dlink_node(dm);
983	<	}
984	<	}
985	<
986	<	break;
987	<
988	<	/* we may not get these,
989	<	* but they shouldnt be in default
990	<	*/
991	<	case ' ' :
992	<	case '\n':
993	<	case '\r':
994	<	case '\t':
995	<	break;
996	<
997	<	default:
998	<	if ((flag = user_modes[(unsigned char)*m]))
999	<	{
1000	<	if (MyConnect(source_p) && !IsOper(source_p) &&
1001	<	(ConfigFileEntry.oper_only_umodes & flag))
1002	<	{
1003	<	badflag = 1;
1004	<	}
1005	<	else
1006	<	execute_callback(umode_cb, client_p, source_p, what, flag);
1007	<	}
1008	<	else
1009	<	{
1010	<	if (MyConnect(source_p))
1011	<	badflag = 1;
1012	<	}
1013	<
1014	<	break;
1015	<	}
1016	<	}
1017	<	}
1018	<
1019	<	if (badflag)
1020	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
1021	<	me.name, source_p->name);
1022	<
1023	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
1024	<	{
1025	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1026	<	me.name, source_p->name);
1027	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1028	<	}
1029	<
1030	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
1031	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
1032	<	{
1033	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1034	<	me.name, source_p->name);
1035	<	source_p->umodes &= ~UMODE_ADMIN;
1036	<	}
783	>	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
784	>	return 0;
785
786	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
787	<	++Count.invisi;
788	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
1041	<	--Count.invisi;
786	>	for (; *p; ++p)
787	>	if (!IsNickChar(*p))
788	>	return 0;
789
790	<	/*
1044	<	* compare new flags with old flags and send string which
1045	<	* will cause servers to update correctly.
1046	<	*/
1047	<	send_umode_out(client_p, source_p, setflags);
790	>	return p - nickname <= NICKLEN;
791		}
792
793		/* send_umode()
794		* send the MODE string for user (user) to connection client_p
795		* -avalon
796	+	*
797	+	* inputs       - client_p
798	+	*              - source_p
799	+	*              - int old
800	+	*              - sendmask mask of modes to send
801	+	*              - suplied umode_buf
802	+	* output       - NONE
803		*/
804		void
805		send_umode(struct Client *client_p, struct Client *source_p,
806		unsigned int old, unsigned int sendmask, char *umode_buf)
807		{
1058	–	int what = 0;
1059	–	unsigned int i;
1060	–	unsigned int flag;
808		char *m = umode_buf;
809	+	int what = 0;
810
811		/*
812	<	* build a string in umode_buf to represent the change in the user's
812	>	* Build a string in umode_buf to represent the change in the user's
813		* mode between the new (source_p->umodes) and 'old'.
814		*/
815	<	for (i = 0; i < 128; i++)
815	>	for (unsigned int i = 0; i < 128; ++i)
816		{
817	<	flag = user_modes[i];
817	>	unsigned int flag = user_modes[i];
818	>
819		if (!flag)
820		continue;
821
822		if (MyClient(source_p) && !(flag & sendmask))
823		continue;
824
825	<	if ((flag & old) && !(source_p->umodes & flag))
825	>	if ((flag & old) && !HasUMode(source_p, flag))
826		{
827		if (what == MODE_DEL)
828		*m++ = (char)i;
#	Line 1084 | Line 833 | send_umode(struct Client *client_p, stru
833		*m++ = (char)i;
834		}
835		}
836	<	else if (!(flag & old) && (source_p->umodes & flag))
836	>	else if (!(flag & old) && HasUMode(source_p, flag))
837		{
838		if (what == MODE_ADD)
839		*m++ = (char)i;
#	Line 1115 | Line 864 | void
864		send_umode_out(struct Client *client_p, struct Client *source_p,
865		unsigned int old)
866		{
867	<	char buf[IRCD_BUFSIZE] = { '\0' };
1119	<	dlink_node *ptr = NULL;
867	>	char buf[IRCD_BUFSIZE] = "";
868
869	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1122	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
869	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
870
871		if (buf[0])
872	<	{
873	<	DLINK_FOREACH(ptr, serv_list.head)
1127	<	{
1128	<	struct Client *target_p = ptr->data;
1129	<
1130	<	if ((target_p != client_p) && (target_p != source_p))
1131	<	{
1132	<	if ((!(ServerInfo.hub && IsCapable(target_p, CAP_LL))) ||
1133	<	(target_p->localClient->serverMask &
1134	<	source_p->lazyLinkClientExists))
1135	<	sendto_one(target_p, ":%s MODE %s :%s",
1136	<	ID_or_name(source_p, target_p),
1137	<	ID_or_name(source_p, target_p), buf);
1138	<	}
1139	<	}
1140	<	}
872	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
873	>	source_p->id, source_p->id, buf);
874
875		if (client_p && MyClient(client_p))
876		send_umode(client_p, source_p, old, 0xffffffff, buf);
877		}
878
879	<	/* user_welcome()
880	<	*
1148	<	* inputs       - client pointer to client to welcome
1149	<	* output       - NONE
1150	<	* side effects -
1151	<	*/
1152	<	static void
1153	<	user_welcome(struct Client *source_p)
879	>	void
880	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
881		{
882	<	#if defined(__TIME__) && defined(__DATE__)
1156	<	static const char built_date[] = __DATE__ " at " __TIME__;
1157	<	#else
1158	<	static const char built_date[] = "unknown";
1159	<	#endif
882	>	dlink_node *ptr = NULL;
883
884	<	#ifdef HAVE_LIBCRYPTO
885	<	if (source_p->localClient->fd.ssl != NULL)
1163	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1164	<	me.name, source_p->name,
1165	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1166	<	#endif
884	>	if (!strcmp(target_p->host, hostname))
885	>	return;
886
887	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
888	<	ServerInfo.network_name, source_p->name);
889	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
890	<	get_listener_name(source_p->localClient->listener), ircd_version);
891	<	sendto_one(source_p, form_str(RPL_CREATED),
892	<	me.name, source_p->name, built_date);
893	<	sendto_one(source_p, form_str(RPL_MYINFO),
894	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1176	<	show_isupport(source_p);
887	>	switch (what)
888	>	{
889	>	case MODE_ADD:
890	>	AddUMode(target_p, UMODE_HIDDENHOST);
891	>	AddFlag(target_p, FLAGS_IP_SPOOFING);
892	>	break;
893	>	case MODE_DEL:
894	>	DelUMode(target_p, UMODE_HIDDENHOST);
895
896	<	if (source_p->id[0] != '\0')
897	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
898	<	source_p->name, source_p->id);
896	>	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
897	>	DelFlag(target_p, FLAGS_IP_SPOOFING);
898	>	break;
899	>	default: return;
900	>	}
901
902	<	show_lusers(source_p);
902	>	if (ConfigFileEntry.cycle_on_host_change)
903	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
904	>	target_p->name, target_p->username, target_p->host);
905	>
906	>	if (IsUserHostIp(target_p))
907	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
908	>
909	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
910
911	<	if (ConfigFileEntry.short_motd)
911	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
912	>	SetUserHost(target_p);
913	>
914	>	if (MyClient(target_p))
915		{
916	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
917	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1188	<	sendto_one(source_p,
1189	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1190	<	"read it", source_p->name);
1191	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1192	<	me.name, source_p->name, me.name);
1193	<	sendto_one(source_p, form_str(RPL_MOTD),
1194	<	me.name, source_p->name,
1195	<	"*** This is the short motd ***");
1196	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1197	<	me.name, source_p->name);
916	>	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
917	>	clear_ban_cache_client(target_p);
918		}
1199	–	else
1200	–	send_message_file(source_p, &ConfigFileEntry.motd);
1201	–	}
919
920	<	/* check_xline()
921	<	*
1205	<	* inputs       - pointer to client to test
1206	<	* outupt       - 1 if exiting 0 if ok
1207	<	* side effects -
1208	<	*/
1209	<	static int
1210	<	check_xline(struct Client *source_p)
1211	<	{
1212	<	struct ConfItem *conf = NULL;
1213	<	const char *reason = NULL;
920	>	if (!ConfigFileEntry.cycle_on_host_change)
921	>	return;
922
923	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1216	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
923	>	DLINK_FOREACH(ptr, target_p->channel.head)
924		{
925	<	struct MatchItem *reg = map_to_conf(conf);
926	<
927	<	++reg->count;
925	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
926	>	char *p = modebuf;
927	>	int len = 0;
928	>	const struct Membership *ms = ptr->data;
929
930	<	if (reg->reason != NULL)
931	<	reason = reg->reason;
932	<	else
933	<	reason = "No Reason";
930	>	if (has_member_flags(ms, CHFL_CHANOP))
931	>	{
932	>	*p++ = 'o';
933	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
934	>	}
935
936	<	sendto_realops_flags(UMODE_REJ, L_ALL,
937	<	"X-line Rejecting [%s] [%s], user %s [%s]",
938	<	source_p->info, reason,
939	<	get_client_name(source_p, HIDE_IP),
940	<	source_p->sockhost);
936	>	if (has_member_flags(ms, CHFL_HALFOP))
937	>	{
938	>	*p++ = 'h';
939	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
940	>	}
941
942	<	ServerStats->is_ref++;
1234	<	if (REJECT_HOLD_TIME > 0)
942	>	if (has_member_flags(ms, CHFL_VOICE))
943		{
944	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
945	<	me.name, source_p->name);
1238	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1239	<	SetCaptured(source_p);
944	>	*p++ = 'v';
945	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
946		}
1241	–	else
1242	–	exit_client(source_p, &me, "Bad user info");
1243	–	return 1;
1244	–	}
947
948	<	return 0;
1247	<	}
948	>	*p = '\0';
949
950	<	/* oper_up()
951	<	*
952	<	* inputs       - pointer to given client to oper
953	<	* output       - NONE
954	<	* side effects - Blindly opers up given source_p, using aconf info
955	<	*                all checks on passwords have already been done.
956	<	*                This could also be used by rsa oper routines.
950	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
951	>	target_p->name, target_p->username, target_p->host,
952	>	ms->chptr->chname);
953	>	if (nickbuf[0])
954	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
955	>	target_p->servptr->name, ms->chptr->chname,
956	>	modebuf, nickbuf);
957	>
958	>	}
959	>
960	>	if (target_p->away[0])
961	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
962	>	":%s!%s@%s AWAY :%s",
963	>	target_p->name, target_p->username,
964	>	target_p->host, target_p->away);
965	>	}
966	>
967	>	/*! \brief Blindly opers up given source_p, using conf info.
968	>	*         All checks on passwords have already been done.
969	>	* \param source_p Pointer to given client to oper
970		*/
971		void
972		oper_up(struct Client *source_p)
973		{
974	<	unsigned int old = source_p->umodes;
975	<	const char *operprivs = "";
1262	<	const struct AccessItem *oconf = NULL;
974	>	const unsigned int old = source_p->umodes;
975	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
976
977		assert(source_p->localClient->confs.head);
1265	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
978
979		++Count.oper;
980		SetOper(source_p);
981
982	<	if (oconf->modes)
983	<	source_p->umodes |= oconf->modes;
982	>	if (conf->modes)
983	>	AddUMode(source_p, conf->modes);
984		else if (ConfigFileEntry.oper_umodes)
985	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
986	<	else
987	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
988	<	UMODE_WALLOP|UMODE_LOCOPS);
985	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
986	>
987	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
988	>	++Count.invisi;
989	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
990	>	--Count.invisi;
991
992		assert(dlinkFind(&oper_list, source_p) == NULL);
993		dlinkAdd(source_p, make_dlink_node(), &oper_list);
994
995	<	operprivs = oper_privs_as_string(oconf->port);
995	>	AddOFlag(source_p, conf->port);
996
997	<	SetOFlag(source_p, oconf->port);
997	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
998	>	AddUMode(source_p, UMODE_ADMIN);
999
1000	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1001	<	source_p->umodes |= UMODE_ADMIN;
1287	<	if (!IsOperN(source_p))
1288	<	source_p->umodes &= ~UMODE_NCHANGE;
1289	<
1290	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1291	<	source_p->name, source_p->username, source_p->host);
1000	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1001	>	get_oper_name(source_p));
1002		send_umode_out(source_p, source_p, old);
1003	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1294	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1295	<	me.name, source_p->name, operprivs);
1296	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1003	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1004		}
1005
1006	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1006	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
1007
1008		int
1009		valid_sid(const char *sid)
1010		{
1304	–
1011		if (strlen(sid) == IRC_MAXSID)
1012		if (IsDigit(*sid))
1013		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1312 | Line 1018 | valid_sid(const char *sid)
1018
1019		/*
1020		* init_uid()
1021	<	*
1021	>	*
1022		* inputs       - NONE
1023		* output       - NONE
1024		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1322 | Line 1028 | valid_sid(const char *sid)
1028		void
1029		init_uid(void)
1030		{
1325	–	int i;
1326	–
1031		memset(new_uid, 0, sizeof(new_uid));
1032
1033	<	if (ServerInfo.sid != NULL)
1330	<	{
1033	>	if (!EmptyString(ServerInfo.sid))
1034		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1332	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1333	–
1334	–	hash_add_id(&me);
1335	–	}
1035
1036	<	for (i = 0; i < IRC_MAXSID; i++)
1037	<	if (new_uid[i] == '\0')
1036	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1037	>	if (new_uid[i] == '\0')
1038		new_uid[i] = 'A';
1039
1040		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1342	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1343	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1344	–	* -Dianora
1345	–	*/
1041		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1347	–
1348	–	entering_umode_cb = register_callback("entering_umode", NULL);
1349	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1350	–	uid_get_cb = register_callback("uid_get", uid_get);
1042		}
1043
1044		/*
#	Line 1359 | Line 1050 | init_uid(void)
1050		*                note this is a recursive function
1051		*/
1052		static void
1053	<	add_one_to_uid(int i)
1053	>	add_one_to_uid(unsigned int i)
1054		{
1055	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1055	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1056		{
1057		if (new_uid[i] == 'Z')
1058		new_uid[i] = '0';
1059		else if (new_uid[i] == '9')
1060		{
1061		new_uid[i] = 'A';
1062	<	add_one_to_uid(i-1);
1062	>	add_one_to_uid(i - 1);
1063		}
1064		else
1065		++new_uid[i];
#	Line 1390 | Line 1081 | add_one_to_uid(int i)
1081		* output       - new UID is returned to caller
1082		* side effects - new_uid is incremented by one.
1083		*/
1084	<	static void *
1085	<	uid_get(va_list args)
1084	>	static const char *
1085	>	uid_get(void)
1086		{
1087	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1087	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1088		return new_uid;
1089		}
1090
#	Line 1407 | Line 1098 | uid_get(va_list args)
1098		void
1099		init_isupport(void)
1100		{
1410	–	isupportFile = init_MessageLine();
1411	–
1101		add_isupport("CALLERID", NULL, -1);
1102		add_isupport("CASEMAPPING", CASEMAP, -1);
1103	+	add_isupport("DEAF", "D", -1);
1104		add_isupport("KICKLEN", NULL, KICKLEN);
1105		add_isupport("MODES", NULL, MAXMODEPARAMS);
1416	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1106		#ifdef HALFOPS
1107		add_isupport("PREFIX", "(ohv)@%+", -1);
1108		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1421 | Line 1110 | init_isupport(void)
1110		add_isupport("PREFIX", "(ov)@+", -1);
1111		add_isupport("STATUSMSG", "@+", -1);
1112		#endif
1113	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1113	>	add_isupport("EXCEPTS", "e", -1);
1114	>	add_isupport("INVEX", "I", -1);
1115		}
1116
1117		/*
#	Line 1452 | Line 1142 | add_isupport(const char *name, const cha
1142
1143		if (ptr == NULL)
1144		{
1145	<	support = MyMalloc(sizeof(*support));
1145	>	support = MyCalloc(sizeof(*support));
1146		dlinkAddTail(support, &support->node, &support_list);
1147		}
1148
1149	<	DupString(support->name, name);
1150	<	if (options != NULL)
1151	<	DupString(support->options, options);
1149	>	support->name = xstrdup(name);
1150	>	if (options)
1151	>	support->options = xstrdup(options);
1152		support->number = n;
1153
1154		rebuild_isupport_message_line();
#	Line 1505 | Line 1195 | rebuild_isupport_message_line(void)
1195		{
1196		char isupportbuffer[IRCD_BUFSIZE];
1197		char *p = isupportbuffer;
1198	<	dlink_node *ptr = NULL;
1198	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1199		int n = 0;
1200		int tokens = 0;
1201		size_t len = 0;
1202	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1202	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1203
1204	<	destroy_MessageLine(isupportFile);
1204	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1205	>	{
1206	>	dlinkDelete(ptr, &support_list_lines);
1207	>	MyFree(ptr->data);
1208	>	free_dlink_node(ptr);
1209	>	}
1210
1211		DLINK_FOREACH(ptr, support_list.head)
1212		{
1213		struct Isupport *support = ptr->data;
1214
1215	<	p += (n = ircsprintf(p, "%s", support->name));
1215	>	p += (n = sprintf(p, "%s", support->name));
1216		len += n;
1217
1218	<	if (support->options != NULL)
1218	>	if (support->options)
1219		{
1220	<	p += (n = ircsprintf(p, "=%s", support->options));
1220	>	p += (n = sprintf(p, "=%s", support->options));
1221		len += n;
1222		}
1223
1224		if (support->number > 0)
1225		{
1226	<	p += (n = ircsprintf(p, "=%d", support->number));
1226	>	p += (n = sprintf(p, "=%d", support->number));
1227		len += n;
1228		}
1229
#	Line 1541 | Line 1236 | rebuild_isupport_message_line(void)
1236		if (*--p == ' ')
1237		*p = '\0';
1238
1239	<	addto_MessageLine(isupportFile, isupportbuffer);
1239	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1240		p = isupportbuffer;
1241		len = 0;
1242		n = tokens = 0;
1243		}
1244		}
1245
1246	<	if (len != 0)
1246	>	if (len)
1247		{
1248		if (*--p == ' ')
1249		*p = '\0';
1250	<	addto_MessageLine(isupportFile, isupportbuffer);
1250	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1251		}
1252		}

Diff Legend

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