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 889 by michael, Thu Nov 1 12:59:05 2007 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4105 by michael, Mon Jun 30 15:39:47 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"
49	–	#include "supported.h"
50	–	#include "whowas.h"
43		#include "memory.h"
44		#include "packet.h"
45	+	#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "hook.h"
48	<	#include "s_misc.h"
56	<	#include "msg.h"
57	<	#include "pcre.h"
47	>	#include "misc.h"
48	>	#include "parse.h"
49		#include "watch.h"
50
60	–	int MaxClientCount     = 1;
61	–	int MaxConnectionCount = 1;
62	–	struct Callback *entering_umode_cb = NULL;
63	–	struct Callback *umode_cb = NULL;
64	–	struct Callback *uid_get_cb = NULL;
65	–
51		static char umode_buffer[IRCD_BUFSIZE];
52	<
68	<	static void user_welcome(struct Client *);
69	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
70	<	static int check_xline(struct Client *);
71	<	static void introduce_client(struct Client *, struct Client *);
72	<	static void *uid_get(va_list);
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		*/
57	<
78	<	struct Isupport
57	>	struct Isupport
58		{
59		dlink_node node;
60		char *name;
#	Line 83 | Line 62 | struct Isupport
62		int number;
63		};
64
65	<	static dlink_list support_list = { NULL, NULL, 0 };
66	<	MessageFile *isupportFile;
65	>	static dlink_list support_list;
66	>	static dlink_list support_list_lines;
67
68		/* memory is cheap. map 0-255 to equivalent mode */
69	<	unsigned int user_modes[256] =
69	>	const unsigned int user_modes[256] =
70		{
71		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
72		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 96 | Line 75 | unsigned int user_modes[256] =
75		0,                  /* @ */
76		0,                  /* A */
77		0,                  /* B */
78	<	UMODE_CCONN_FULL,   /* C */
78	>	0,                  /* C */
79		UMODE_DEAF,         /* D */
80		0,                  /* E */
81	<	0,                  /* F */
81	>	UMODE_FARCONNECT,   /* F */
82		UMODE_SOFTCALLERID, /* G */
83	<	0,                  /* H */
83	>	UMODE_HIDDEN,       /* H */
84		0,                  /* I */
85		0,                  /* J */
86		0,                  /* K */
#	Line 111 | Line 90 | unsigned int user_modes[256] =
90		0,                  /* O */
91		0,                  /* P */
92		0,                  /* Q */
93	<	0,                  /* R */
94	<	0,                  /* S */
93	>	UMODE_REGONLY,      /* R */
94	>	UMODE_SSL,          /* S */
95		0,                  /* T */
96		0,                  /* U */
97		0,                  /* V */
98	<	0,                  /* W */
98	>	UMODE_WEBIRC,       /* W */
99		0,                  /* X */
100		0,                  /* Y */
101		0,                  /* Z 0x5A */
102	<	0, 0, 0, 0, 0,      /* 0x5F   */
102	>	0, 0, 0, 0, 0,      /* 0x5F   */
103		0,                  /* 0x60   */
104		UMODE_ADMIN,        /* a */
105		UMODE_BOTS,         /* b */
106		UMODE_CCONN,        /* c */
107		UMODE_DEBUG,        /* d */
108	<	0,                  /* e */
108	>	UMODE_EXTERNAL,     /* e */
109		UMODE_FULL,         /* f */
110		UMODE_CALLERID,     /* g */
111		0,                  /* h */
112		UMODE_INVISIBLE,    /* i */
113	<	0,                  /* j */
113	>	UMODE_REJ,          /* j */
114		UMODE_SKILL,        /* k */
115		UMODE_LOCOPS,       /* l */
116		0,                  /* m */
117		UMODE_NCHANGE,      /* n */
118		UMODE_OPER,         /* o */
119	<	0,                  /* p */
120	<	0,                  /* q */
121	<	UMODE_REJ,          /* r */
119	>	UMODE_HIDECHANS,    /* p */
120	>	UMODE_HIDEIDLE,     /* q */
121	>	UMODE_REGISTERED,   /* r */
122		UMODE_SERVNOTICE,   /* s */
123		0,                  /* t */
124		UMODE_UNAUTH,       /* u */
125		0,                  /* v */
126		UMODE_WALLOP,       /* w */
127	<	UMODE_EXTERNAL,     /* x */
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 166 | Line 145 | assemble_umode_buffer(void)
145		unsigned int idx = 0;
146		char *umode_buffer_ptr = umode_buffer;
147
148	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
148	>	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
149		if (user_modes[idx])
150		*umode_buffer_ptr++ = idx;
151
#	Line 180 | Line 159 | assemble_umode_buffer(void)
159		* side effects - display to client user counts etc.
160		*/
161		void
162	<	show_lusers(struct Client *source_p)
162	>	show_lusers(struct Client *source_p)
163		{
164	<	const char *from, *to;
164	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
165	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
166	>	Count.invisi, dlink_list_length(&global_serv_list));
167	>	else
168	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
169	>	(Count.total - Count.invisi), Count.invisi, 1);
170	>
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 (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
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	<	from = me.id;
183	<	to = source_p->id;
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	<	from = me.name;
188	<	to = source_p->name;
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	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
199	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
200	<	from, to, (Count.total-Count.invisi),
201	<	Count.invisi, dlink_list_length(&global_serv_list));
202	<	else
203	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
204	<	(Count.total-Count.invisi), Count.invisi, 1);
191	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
192
193	<	if (Count.oper > 0)
194	<	sendto_one(source_p, form_str(RPL_LUSEROP),
195	<	from, to, Count.oper);
209	<
210	<	if (dlink_list_length(&unknown_list) > 0)
211	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
212	<	from, to, dlink_list_length(&unknown_list));
213	<
214	<	if (dlink_list_length(&global_channel_list) > 0)
215	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
216	<	from, to, dlink_list_length(&global_channel_list));
217	<
218	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
219	<	{
220	<	sendto_one(source_p, form_str(RPL_LUSERME),
221	<	from, to, Count.local, Count.myserver);
222	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
223	<	from, to, Count.local, Count.max_loc,
224	<	Count.local, Count.max_loc);
225	<	}
226	<	else
227	<	{
228	<	sendto_one(source_p, form_str(RPL_LUSERME),
229	<	from, to, Count.total, 0);
230	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
231	<	from, to, Count.total, Count.max_tot,
232	<	Count.total, Count.max_tot);
233	<	}
234	<
235	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
236	<	from, to, Count.total, Count.max_tot,
237	<	Count.total, Count.max_tot);
238	<
239	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
240	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
241	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
193	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
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 > MaxClientCount)
198	<	MaxClientCount = Count.local;
197	>	if (Count.local > Count.max_loc_cli)
198	>	Count.max_loc_cli = Count.local;
199
200	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
201	<	MaxConnectionCount = Count.local + Count.myserver;
200	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
201	>	Count.max_loc_con = Count.local + Count.myserver;
202		}
203
204		/* show_isupport()
#	Line 254 | Line 208 | show_lusers(struct Client *source_p)
208		* side effects - display to client what we support (for them)
209		*/
210		void
211	<	show_isupport(struct Client *source_p)
211	>	show_isupport(struct Client *source_p)
212		{
213	<	send_message_file(source_p, isupportFile);
213	>	const dlink_node *ptr = NULL;
214	>
215	>	DLINK_FOREACH(ptr, support_list_lines.head)
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	<	*/
242	<	void
243	<	register_local_user(struct Client *client_p, struct Client *source_p,
244	<	const char *nick, const char *username)
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		{
289	–	const struct AccessItem *aconf = NULL;
290	–	char ipaddr[HOSTIPLEN];
284		dlink_node *ptr = NULL;
285	<	dlink_node *m = 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, serv_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, ServerInfo.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	>
363	>	if (source_p->id[0])
364	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
365	>
366	>	show_lusers(source_p);
367	>	motd_signon(source_p);
368	>	}
369	>
370	>	/* check_xline()
371	>	*
372	>	* inputs       - pointer to client to test
373	>	* outupt       - 1 if exiting 0 if ok
374	>	* side effects -
375	>	*/
376	>	static int
377	>	check_xline(struct Client *source_p)
378	>	{
379	>	struct MaskItem *conf = NULL;
380	>	const char *reason = NULL;
381	>
382	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
383	>	{
384	>	++conf->count;
385	>
386	>	if (conf->reason)
387	>	reason = conf->reason;
388	>	else
389	>	reason = CONF_NOREASON;
390	>
391	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
392	>	"X-line Rejecting [%s] [%s], user %s [%s]",
393	>	source_p->info, reason,
394	>	get_client_name(source_p, HIDE_IP),
395	>	source_p->sockhost);
396
397	<	assert(source_p != NULL);
397	>	++ServerStats.is_ref;
398	>	exit_client(source_p, "Bad user info");
399	>	return 1;
400	>	}
401	>
402	>	return 0;
403	>	}
404	>
405	>	/*! \brief This function is called when both NICK and USER messages
406	>	*      have been accepted for the client, in whatever order. Only
407	>	*      after this, is the UID message propagated.
408	>	* \param source_p Pointer to given client to introduce
409	>	*/
410	>	void
411	>	register_local_user(struct Client *source_p)
412	>	{
413	>	const char *id = NULL;
414	>	const struct MaskItem *conf = NULL;
415	>
416	>	assert(source_p == source_p->from);
417		assert(MyConnect(source_p));
296	–	assert(source_p->username != username);
418		assert(!source_p->localClient->registration);
419
420	<	ClearCap(client_p, CAP_TS6);
420	>	ClearCap(source_p, CAP_TS6);
421
422		if (ConfigFileEntry.ping_cookie)
423		{
424	<	if (!IsPingSent(source_p) &&
304	<	source_p->localClient->random_ping == 0)
424	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
425		{
426	<	source_p->localClient->random_ping = (unsigned long)rand();
427	<	sendto_one(source_p, "PING :%lu",
426	>	do
427	>	source_p->localClient->random_ping = genrand_int32();
428	>	while (!source_p->localClient->random_ping);
429	>
430	>	sendto_one(source_p, "PING :%u",
431		source_p->localClient->random_ping);
432		SetPingSent(source_p);
433		return;
#	Line 314 | Line 437 | register_local_user(struct Client *clien
437		return;
438		}
439
440	<	source_p->localClient->last = CurrentTime;
440	>	source_p->localClient->last_privmsg = CurrentTime;
441		/* Straight up the maximum rate of flooding... */
442		source_p->localClient->allow_read = MAX_FLOOD_BURST;
443
444	<	if (!execute_callback(client_check_cb, source_p, username))
444	>	if (!check_client(source_p))
445		return;
446
447	<	if (valid_hostname(source_p->host) == 0)
447	>	if (!valid_hostname(source_p->host))
448		{
449	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
450	<	"character in your hostname", me.name, source_p->name);
449	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
450	>	"character in your hostname");
451		strlcpy(source_p->host, source_p->sockhost,
452		sizeof(source_p->host));
453		}
454
455	<	ptr   = source_p->localClient->confs.head;
333	<	aconf = map_to_conf(ptr->data);
455	>	conf = source_p->localClient->confs.head->data;
456
457		if (!IsGotId(source_p))
458		{
459	<	const char *p = NULL;
459	>	char username[USERLEN + 1] = "";
460	>	const char *p = username;
461		unsigned int i = 0;
462
463	<	if (IsNeedIdentd(aconf))
463	>	if (IsNeedIdentd(conf))
464		{
465	<	ServerStats->is_ref++;
466	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
467	<	"identd to use this server", me.name, source_p->name);
468	<	exit_client(source_p, &me, "Install identd");
465	>	++ServerStats.is_ref;
466	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
467	>	"identd to use this server");
468	>	exit_client(source_p, "Install identd");
469		return;
470		}
471
472	<	p = username;
472	>	strlcpy(username, source_p->username, sizeof(username));
473
474	<	if (!IsNoTilde(aconf))
474	>	if (!IsNoTilde(conf))
475		source_p->username[i++] = '~';
476
477	<	while (*p && i < USERLEN)
355	<	{
477	>	for (; *p && i < USERLEN; ++p)
478		if (*p != '[')
479		source_p->username[i++] = *p;
358	–	p++;
359	–	}
480
481		source_p->username[i] = '\0';
482		}
483
484	<	/* password check */
485	<	if (!EmptyString(aconf->passwd))
484	>	/* Password check */
485	>	if (!EmptyString(conf->passwd))
486		{
487	<	const char *pass = source_p->localClient->passwd;
368	<
369	<	if (!match_conf_password(pass, aconf))
487	>	if (!match_conf_password(source_p->localClient->passwd, conf))
488		{
489	<	ServerStats->is_ref++;
490	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
491	<	me.name, source_p->name);
492	<	exit_client(source_p, &me, "Bad Password");
489	>	++ServerStats.is_ref;
490	>
491	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
492	>	exit_client(source_p, "Bad Password");
493		return;
494		}
495		}
496
497	<	/* don't free source_p->localClient->passwd here - it can be required
497	>	/*
498	>	* Don't free source_p->localClient->passwd here - it can be required
499		* by masked /stats I if there are auth{} blocks with need_password = no;
500		* --adx
501		*/
502
503	<	/* report if user has &^>= etc. and set flags as needed in source_p */
504	<	report_and_set_user_flags(source_p, aconf);
503	>	/*
504	>	* Report if user has &^>= etc. and set flags as needed in source_p
505	>	*/
506	>	report_and_set_user_flags(source_p, conf);
507	>
508	>	if (IsDead(source_p))
509	>	return;
510
511	<	/* Limit clients -
511	>	/*
512	>	* Limit clients -
513		* We want to be able to have servers and F-line clients
514		* connect, so save room for "buffer" connections.
515		* Smaller servers may want to decrease this, and it should
516		* probably be just a percentage of the MAXCLIENTS...
517		*   -Taner
518		*/
394	–	/* Except "F:" clients */
519		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
520		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
521		{
522	<	sendto_realops_flags(UMODE_FULL, L_ALL,
522	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
523		"Too many clients, rejecting %s[%s].",
524	<	nick, source_p->host);
525	<	ServerStats->is_ref++;
526	<	exit_client(source_p, &me, "Sorry, server is full - try later");
524	>	source_p->name, source_p->host);
525	>	++ServerStats.is_ref;
526	>	exit_client(source_p, "Sorry, server is full - try later");
527		return;
528		}
529
530	<	/* valid user name check */
407	<	if (valid_username(source_p->username) == 0)
530	>	if (!valid_username(source_p->username, 1))
531		{
532	<	char tmpstr2[IRCD_BUFSIZE];
532	>	char buf[IRCD_BUFSIZE] = "";
533
534	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
535	<	nick, source_p->username, source_p->host);
536	<	ServerStats->is_ref++;
537	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
538	<	exit_client(source_p, &me, tmpstr2);
534	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
535	>	"Invalid username: %s (%s@%s)",
536	>	source_p->name, source_p->username, source_p->host);
537	>	++ServerStats.is_ref;
538	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
539	>	exit_client(source_p, buf);
540		return;
541		}
542
419	–	assert(source_p == client_p);
420	–
543		if (check_xline(source_p))
544		return;
545
546	<	if (IsDead(client_p))
547	<	return;
546	>	while (hash_find_id((id = uid_get())))
547	>	;
548
549	<	if (me.id[0])
550	<	{
429	<	const char *id = execute_callback(uid_get_cb, source_p);
430	<
431	<	while (hash_find_id(id) != NULL)
432	<	id = uid_get(NULL);
433	<
434	<	strlcpy(source_p->id, id, sizeof(source_p->id));
435	<	hash_add_id(source_p);
436	<	}
549	>	strlcpy(source_p->id, id, sizeof(source_p->id));
550	>	hash_add_id(source_p);
551
552	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
553	<	source_p->localClient->ip.ss_len, ipaddr,
554	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
441	<
442	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
443	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
444	<	nick, source_p->username, source_p->host,
445	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
446	<	"255.255.255.255" : ipaddr, get_client_class(source_p),
447	<	source_p->info);
448	<
449	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
450	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
451	<	nick, source_p->username, source_p->host,
552	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
553	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
554	>	source_p->name, source_p->username, source_p->host,
555		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
556	<	"255.255.255.255" : ipaddr,
557	<	get_client_class(source_p),
558	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
456	<	"<hidden>" : source_p->client_host,
457	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
458	<	"<hidden>" : source_p->client_server,
459	<	source_p->info);
460	<
461	<
462	<	/* If they have died in send_* don't do anything. */
463	<	if (IsDead(source_p))
464	<	return;
556	>	"255.255.255.255" : source_p->sockhost,
557	>	get_client_class(&source_p->localClient->confs),
558	>	source_p->info, source_p->id);
559
560		if (ConfigFileEntry.invisible_on_connect)
561		{
562	<	source_p->umodes |= UMODE_INVISIBLE;
563	<	Count.invisi++;
562	>	AddUMode(source_p, UMODE_INVISIBLE);
563	>	++Count.invisi;
564		}
565
566	<	if ((++Count.local) > Count.max_loc)
566	>	if (++Count.local > Count.max_loc)
567		{
568		Count.max_loc = Count.local;
569
570		if (!(Count.max_loc % 10))
571	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
571	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
572	>	"New Max Local Clients: %d",
573		Count.max_loc);
574		}
575
481	–	SetClient(source_p);
482	–
483	–	source_p->servptr = &me;
484	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
485	–
486	–	/* Increment our total user count here */
576		if (++Count.total > Count.max_tot)
577		Count.max_tot = Count.total;
578	<	Count.totalrestartcount++;
578	>	++Count.totalrestartcount;
579
580	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
580	>	assert(source_p->servptr == &me);
581	>	SetClient(source_p);
582	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
583
584	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
585	<	{
586	<	free_dlink_node(m);
587	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
497	<	}
498	<	else assert(0);
584	>	assert(dlinkFind(&unknown_list, source_p));
585	>
586	>	dlink_move_node(&source_p->localClient->lclient_node,
587	>	&unknown_list, &local_client_list);
588
589		user_welcome(source_p);
590		add_user_host(source_p->username, source_p->host, 0);
591		SetUserHost(source_p);
592
593	<	introduce_client(client_p, source_p);
593	>	introduce_client(source_p);
594		}
595
596		/* register_remote_user()
597		*
598	<	* inputs       - client_p directly connected client
510	<	*              - source_p remote or directly connected client
598	>	* inputs       - source_p remote or directly connected client
599		*              - username to register as
600		*              - host name to register as
601		*              - server name
514	–	*              - realname (gecos)
602		* output       - NONE
603		* side effects - This function is called when a remote client
604		*                is introduced by a server.
605		*/
606		void
607	<	register_remote_user(struct Client *client_p, struct Client *source_p,
521	<	const char *username, const char *host, const char *server,
522	<	const char *realname)
607	>	register_remote_user(struct Client *source_p)
608		{
609		struct Client *target_p = NULL;
610
526	–	assert(source_p != NULL);
527	–	assert(source_p->username != username);
528	–
529	–	strlcpy(source_p->host, host, sizeof(source_p->host));
530	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
531	–	strlcpy(source_p->username, username, sizeof(source_p->username));
532	–
533	–	/*
534	–	* coming from another server, take the servers word for it
535	–	*/
536	–	source_p->servptr = find_server(server);
537	–
538	–	/* Super GhostDetect:
539	–	* If we can't find the server the user is supposed to be on,
540	–	* then simply blow the user away.        -Taner
541	–	*/
542	–	if (source_p->servptr == NULL)
543	–	{
544	–	sendto_realops_flags(UMODE_ALL, L_ALL,
545	–	"No server %s for user %s[%s@%s] from %s",
546	–	server, source_p->name, source_p->username,
547	–	source_p->host, source_p->from->name);
548	–	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
549	–
550	–	SetKilled(source_p);
551	–	exit_client(source_p, &me, "Ghosted Client");
552	–	return;
553	–	}
554	–
611		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
612		{
613	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
613	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
614		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
615	<	client_p->name, source_p->name, source_p->username,
615	>	source_p->from->name, source_p->name, source_p->username,
616		source_p->host, source_p->servptr->name,
617		target_p->name, target_p->from->name);
618	<	kill_client(client_p, source_p,
619	<	"%s (NICK from wrong direction (%s != %s))",
620	<	me.name, source_p->servptr->name, target_p->from->name);
621	<	SetKilled(source_p);
622	<	exit_client(source_p, &me, "USER server wrong direction");
618	>	sendto_one(source_p->from,
619	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
620	>	me.id, source_p->id, me.name, source_p->servptr->name,
621	>	target_p->from->name);
622	>
623	>	AddFlag(source_p, FLAGS_KILLED);
624	>	exit_client(source_p, "USER server wrong direction");
625		return;
626		}
627
628	<	/* Increment our total user count here */
628	>	/*
629	>	* If the nick has been introduced by a services server,
630	>	* make it a service as well.
631	>	*/
632	>	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
633	>	AddFlag(source_p, FLAGS_SERVICE);
634	>
635		if (++Count.total > Count.max_tot)
636		Count.max_tot = Count.total;
637
#	Line 576 | Line 640 | register_remote_user(struct Client *clie
640		add_user_host(source_p->username, source_p->host, 1);
641		SetUserHost(source_p);
642
643	<	introduce_client(client_p, source_p);
644	<	}
645	<
646	<	/* introduce_client()
647	<	*
648	<	* inputs       - client_p
585	<	*              - source_p
586	<	* output       - NONE
587	<	* side effects - This common function introduces a client to the rest
588	<	*                of the net, either from a local client connect or
589	<	*                from a remote connect.
590	<	*/
591	<	static void
592	<	introduce_client(struct Client *client_p, struct Client *source_p)
593	<	{
594	<	dlink_node *server_node = NULL;
595	<	static char ubuf[12];
596	<
597	<	if (MyClient(source_p))
598	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
599	<	else
600	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
601	<
602	<	watch_check_hash(source_p, RPL_LOGON);
603	<
604	<	if (*ubuf == '\0')
605	<	{
606	<	ubuf[0] = '+';
607	<	ubuf[1] = '\0';
608	<	}
609	<
610	<	DLINK_FOREACH(server_node, serv_list.head)
611	<	{
612	<	struct Client *server = server_node->data;
643	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
644	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
645	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
646	>	source_p->servptr->name,
647	>	source_p->name, source_p->username, source_p->host,
648	>	source_p->info, source_p->id);
649
650	<	if (server == client_p)
615	<	continue;
616	<
617	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
618	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
619	<	source_p->servptr->id,
620	<	source_p->name, source_p->hopcount+1,
621	<	(unsigned long)source_p->tsinfo,
622	<	ubuf, source_p->username, source_p->host,
623	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
624	<	"0" : source_p->sockhost, source_p->id, source_p->info);
625	<	else
626	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
627	<	source_p->name, source_p->hopcount+1,
628	<	(unsigned long)source_p->tsinfo,
629	<	ubuf, source_p->username, source_p->host,
630	<	source_p->servptr->name, source_p->info);
631	<	}
650	>	introduce_client(source_p);
651		}
652
653		/* valid_hostname()
#	Line 645 | Line 664 | valid_hostname(const char *hostname)
664		{
665		const char *p = hostname;
666
667	<	assert(p != NULL);
667	>	assert(p);
668
669	<	if ('.' == *p || ':' == *p)
669	>	if (EmptyString(p) || *p == '.' || *p == ':')
670		return 0;
671
672	<	while (*p)
654	<	{
672	>	for (; *p; ++p)
673		if (!IsHostChar(*p))
674		return 0;
657	–	p++;
658	–	}
675
676	<	return 1;
676	>	return p - hostname <= HOSTLEN;
677		}
678
679		/* valid_username()
#	Line 672 | Line 688 | valid_hostname(const char *hostname)
688		* style of username
689		*/
690		int
691	<	valid_username(const char *username)
691	>	valid_username(const char *username, const int local)
692		{
693	<	int dots      = 0;
693	>	unsigned int dots = 0;
694		const char *p = username;
695
696	<	assert(p != NULL);
696	>	assert(p);
697
698	<	if ('~' == *p)
698	>	if (*p == '~')
699		++p;
700
701	<	/* reject usernames that don't start with an alphanum
701	>	/*
702	>	* Reject usernames that don't start with an alphanum
703		* i.e. reject jokers who have '-@somehost' or '.@somehost'
704		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
705		*/
706		if (!IsAlNum(*p))
707		return 0;
708
709	<	while (*++p)
709	>	if (local)
710		{
711	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
711	>	while (*++p)
712		{
713	<	dots++;
714	<
715	<	if (dots > ConfigFileEntry.dots_in_ident)
716	<	return 0;
717	<	if (!IsUserChar(p[1]))
713	>	if (*p == '.' && ConfigFileEntry.dots_in_ident)
714	>	{
715	>	if (++dots > ConfigFileEntry.dots_in_ident)
716	>	return 0;
717	>	if (!IsUserChar(*(p + 1)))
718	>	return 0;
719	>	}
720	>	else if (!IsUserChar(*p))
721		return 0;
722		}
703	–	else if (!IsUserChar(*p))
704	–	return 0;
705	–	}
706	–
707	–	return 1;
708	–	}
709	–
710	–	/* report_and_set_user_flags()
711	–	*
712	–	* inputs       - pointer to source_p
713	–	*              - pointer to aconf for this user
714	–	* output       - NONE
715	–	* side effects - Report to user any special flags
716	–	*                they are getting, and set them.
717	–	*/
718	–	static void
719	–	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
720	–	{
721	–	/* If this user is being spoofed, tell them so */
722	–	if (IsConfDoSpoofIp(aconf))
723	–	{
724	–	sendto_one(source_p,
725	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
726	–	me.name, source_p->name);
727	–	}
728	–
729	–	/* If this user is in the exception class, Set it "E lined" */
730	–	if (IsConfExemptKline(aconf))
731	–	{
732	–	SetExemptKline(source_p);
733	–	sendto_one(source_p,
734	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
735	–	me.name, source_p->name);
736	–	}
737	–
738	–	/* The else here is to make sure that G line exempt users
739	–	* do not get noticed twice.
740	–	*/
741	–	else if (IsConfExemptGline(aconf))
742	–	{
743	–	SetExemptGline(source_p);
744	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
745	–	me.name, source_p->name);
746	–	}
747	–
748	–	if (IsConfExemptResv(aconf))
749	–	{
750	–	SetExemptResv(source_p);
751	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
752	–	me.name, source_p->name);
753	–	}
754	–
755	–	/* If this user is exempt from user limits set it "F lined" */
756	–	if (IsConfExemptLimits(aconf))
757	–	{
758	–	SetExemptLimits(source_p);
759	–	sendto_one(source_p,
760	–	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
761	–	me.name,source_p->name);
723		}
724	<
764	<	/* If this user is exempt from idle time outs */
765	<	if (IsConfIdlelined(aconf))
724	>	else
725		{
726	<	SetIdlelined(source_p);
727	<	sendto_one(source_p,
728	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
770	<	me.name, source_p->name);
726	>	while (*++p)
727	>	if (!IsUserChar(*p))
728	>	return 0;
729		}
730
731	<	if (IsConfCanFlood(aconf))
774	<	{
775	<	SetCanFlood(source_p);
776	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
777	<	"protection, aren't you fearsome.",
778	<	me.name, source_p->name);
779	<	}
731	>	return p - username <= USERLEN;
732		}
733
734	<	/* do_local_user()
734	>	/* clean_nick_name()
735		*
736	<	* inputs       -
737	<	* output       - NONE
738	<	* side effects -
736	>	* input        - nickname
737	>	*              - whether it's a local nick (1) or remote (0)
738	>	* output       - none
739	>	* side effects - walks through the nickname, returning 0 if erroneous
740		*/
741	<	void
742	<	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
790	<	const char *username, const char *host, const char *server,
791	<	const char *realname)
741	>	int
742	>	valid_nickname(const char *nickname, const int local)
743		{
744	<	assert(source_p != NULL);
794	<	assert(source_p->username != username);
795	<
796	<	if (source_p == NULL)
797	<	return;
798	<
799	<	if (!IsUnknown(source_p))
800	<	{
801	<	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
802	<	me.name, nick);
803	<	return;
804	<	}
744	>	const char *p = nickname;
745
746	<	source_p->localClient->registration &= ~REG_NEED_USER;
746	>	assert(nickname && *nickname);
747
748		/*
749	<	* don't take the clients word for it, ever
749	>	* Nicks can't start with a digit or - or be 0 length.
750		*/
751	<	source_p->servptr = &me;
752	<
813	<	strlcpy(source_p->info, realname, sizeof(source_p->info));
814	<
815	<	/* stash for later */
816	<	strlcpy(source_p->client_host, host, sizeof(source_p->client_host));
817	<	strlcpy(source_p->client_server, server, sizeof(source_p->client_server));
818	<
819	<	if (!IsGotId(source_p))
820	<	{
821	<	/* save the username in the client
822	<	* If you move this you'll break ping cookies..you've been warned
823	<	*/
824	<	strlcpy(source_p->username, username, sizeof(source_p->username));
825	<	}
826	<
827	<	if (!source_p->localClient->registration)
828	<	/* NICK already received, now I have USER... */
829	<	register_local_user(client_p, source_p, source_p->name, username);
830	<	}
831	<
832	<	/* change_simple_umode()
833	<	*
834	<	* this callback can be hooked to allow special handling of
835	<	* certain usermodes
836	<	*/
837	<	static void *
838	<	change_simple_umode(va_list args)
839	<	{
840	<	struct Client *client_p;
841	<	struct Client *source_p;
842	<	int what;
843	<	unsigned int flag;
844	<
845	<	client_p = va_arg(args, struct Client *);
846	<	source_p = va_arg(args, struct Client *);
847	<	what = va_arg(args, int);
848	<	flag = va_arg(args, unsigned int);
849	<
850	<	if (what == MODE_ADD)
851	<	source_p->umodes |= flag;
852	<	else
853	<	source_p->umodes &= ~flag;
854	<
855	<	return NULL;
856	<	}
857	<
858	<	/* set_user_mode()
859	<	*
860	<	* added 15/10/91 By Darren Reed.
861	<	* parv[0] - sender
862	<	* parv[1] - username to change mode for
863	<	* parv[2] - modes to change
864	<	*/
865	<	void
866	<	set_user_mode(struct Client *client_p, struct Client *source_p,
867	<	int parc, char *parv[])
868	<	{
869	<	unsigned int flag, setflags;
870	<	char **p, *m, buf[IRCD_BUFSIZE];
871	<	struct Client *target_p;
872	<	int what = MODE_ADD, badflag = 0, i;
873	<
874	<	assert(!(parc < 2));
875	<
876	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
877	<	{
878	<	if (MyConnect(source_p))
879	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
880	<	me.name, source_p->name, parv[1]);
881	<	return;
882	<	}
883	<
884	<	if (IsServer(source_p))
885	<	{
886	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
887	<	parv[1], source_p->name);
888	<	return;
889	<	}
890	<
891	<	if (source_p != target_p || target_p->from != source_p->from)
892	<	{
893	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
894	<	me.name, source_p->name);
895	<	return;
896	<	}
897	<
898	<	if (parc < 3)
899	<	{
900	<	m = buf;
901	<	*m++ = '+';
902	<
903	<	for (i = 0; i < 128; i++)
904	<	if (source_p->umodes & user_modes[i])
905	<	*m++ = (char)i;
906	<	*m = '\0';
907	<
908	<	sendto_one(source_p, form_str(RPL_UMODEIS),
909	<	me.name, source_p->name, buf);
910	<	return;
911	<	}
912	<
913	<	execute_callback(entering_umode_cb, client_p, source_p);
914	<
915	<	/* find flags already set for user */
916	<	setflags = source_p->umodes;
917	<
918	<	/* parse mode change string(s) */
919	<	for (p = &parv[2]; p && *p; p++)
920	<	{
921	<	for (m = *p; *m; m++)
922	<	{
923	<	switch (*m)
924	<	{
925	<	case '+':
926	<	what = MODE_ADD;
927	<	break;
928	<	case '-':
929	<	what = MODE_DEL;
930	<	break;
931	<	case 'o':
932	<	if (what == MODE_ADD)
933	<	{
934	<	if (IsServer(client_p) && !IsOper(source_p))
935	<	{
936	<	++Count.oper;
937	<	SetOper(source_p);
938	<	}
939	<	}
940	<	else
941	<	{
942	<	/* Only decrement the oper counts if an oper to begin with
943	<	* found by Pat Szuta, Perly , perly@xnet.com
944	<	*/
945	<	if (!IsOper(source_p))
946	<	break;
947	<
948	<	ClearOper(source_p);
949	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
950	<	Count.oper--;
951	<
952	<	if (MyConnect(source_p))
953	<	{
954	<	dlink_node *dm;
955	<
956	<	detach_conf(source_p, OPER_TYPE);
957	<	ClearOperFlags(source_p);
958	<
959	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
960	<	free_dlink_node(dm);
961	<	}
962	<	}
963	<
964	<	break;
965	<
966	<	/* we may not get these,
967	<	* but they shouldnt be in default
968	<	*/
969	<	case ' ' :
970	<	case '\n':
971	<	case '\r':
972	<	case '\t':
973	<	break;
974	<
975	<	default:
976	<	if ((flag = user_modes[(unsigned char)*m]))
977	<	{
978	<	if (MyConnect(source_p) && !IsOper(source_p) &&
979	<	(ConfigFileEntry.oper_only_umodes & flag))
980	<	{
981	<	badflag = 1;
982	<	}
983	<	else
984	<	execute_callback(umode_cb, client_p, source_p, what, flag);
985	<	}
986	<	else
987	<	{
988	<	if (MyConnect(source_p))
989	<	badflag = 1;
990	<	}
991	<
992	<	break;
993	<	}
994	<	}
995	<	}
996	<
997	<	if (badflag)
998	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
999	<	me.name, source_p->name);
1000	<
1001	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
1002	<	{
1003	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1004	<	me.name, source_p->name);
1005	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1006	<	}
1007	<
1008	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
1009	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
1010	<	{
1011	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1012	<	me.name, source_p->name);
1013	<	source_p->umodes &= ~UMODE_ADMIN;
1014	<	}
751	>	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
752	>	return 0;
753
754	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
755	<	++Count.invisi;
756	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
1019	<	--Count.invisi;
754	>	for (; *p; ++p)
755	>	if (!IsNickChar(*p))
756	>	return 0;
757
758	<	/*
1022	<	* compare new flags with old flags and send string which
1023	<	* will cause servers to update correctly.
1024	<	*/
1025	<	send_umode_out(client_p, source_p, setflags);
758	>	return p - nickname <= NICKLEN;
759		}
760
761		/* send_umode()
#	Line 1038 | Line 771 | set_user_mode(struct Client *client_p, s
771		*/
772		void
773		send_umode(struct Client *client_p, struct Client *source_p,
774	<	unsigned int old, unsigned int sendmask, char *umode_buf)
774	>	unsigned int old, char *umode_buf)
775		{
1043	–	int what = 0;
1044	–	unsigned int i;
1045	–	unsigned int flag;
776		char *m = umode_buf;
777	+	int what = 0;
778
779		/*
780	<	* build a string in umode_buf to represent the change in the user's
780	>	* Build a string in umode_buf to represent the change in the user's
781		* mode between the new (source_p->umodes) and 'old'.
782		*/
783	<	for (i = 0; i < 128; i++)
783	>	for (unsigned int i = 0; i < 128; ++i)
784		{
785	<	flag = user_modes[i];
1055	<	if (!flag)
1056	<	continue;
785	>	unsigned int flag = user_modes[i];
786
787	<	if (MyClient(source_p) && !(flag & sendmask))
787	>	if (!flag)
788		continue;
789
790	<	if ((flag & old) && !(source_p->umodes & flag))
790	>	if ((flag & old) && !HasUMode(source_p, flag))
791		{
792		if (what == MODE_DEL)
793		*m++ = (char)i;
#	Line 1069 | Line 798 | send_umode(struct Client *client_p, stru
798		*m++ = (char)i;
799		}
800		}
801	<	else if (!(flag & old) && (source_p->umodes & flag))
801	>	else if (!(flag & old) && HasUMode(source_p, flag))
802		{
803		if (what == MODE_ADD)
804		*m++ = (char)i;
#	Line 1100 | Line 829 | void
829		send_umode_out(struct Client *client_p, struct Client *source_p,
830		unsigned int old)
831		{
832	<	char buf[IRCD_BUFSIZE] = { '\0' };
1104	<	dlink_node *ptr = NULL;
832	>	char buf[IRCD_BUFSIZE] = "";
833
834	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1107	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
834	>	send_umode(NULL, source_p, old, buf);
835
836		if (buf[0])
837	<	{
838	<	DLINK_FOREACH(ptr, serv_list.head)
1112	<	{
1113	<	struct Client *target_p = ptr->data;
1114	<
1115	<	if ((target_p != client_p) && (target_p != source_p))
1116	<	sendto_one(target_p, ":%s MODE %s :%s",
1117	<	ID_or_name(source_p, target_p),
1118	<	ID_or_name(source_p, target_p), buf);
1119	<	}
1120	<	}
837	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
838	>	source_p->id, source_p->id, buf);
839
840		if (client_p && MyClient(client_p))
841	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
841	>	send_umode(client_p, source_p, old, buf);
842		}
843
844	<	/* user_welcome()
845	<	*
1128	<	* inputs       - client pointer to client to welcome
1129	<	* output       - NONE
1130	<	* side effects -
1131	<	*/
1132	<	static void
1133	<	user_welcome(struct Client *source_p)
844	>	void
845	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
846		{
847	<	#if defined(__TIME__) && defined(__DATE__)
1136	<	static const char built_date[] = __DATE__ " at " __TIME__;
1137	<	#else
1138	<	static const char built_date[] = "unknown";
1139	<	#endif
847	>	dlink_node *ptr = NULL;
848
849	<	#ifdef HAVE_LIBCRYPTO
850	<	if (source_p->localClient->fd.ssl != NULL)
1143	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1144	<	me.name, source_p->name,
1145	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1146	<	#endif
849	>	if (!strcmp(target_p->host, hostname))
850	>	return;
851
852	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
853	<	ServerInfo.network_name, source_p->name);
854	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
855	<	get_listener_name(source_p->localClient->listener), ircd_version);
856	<	sendto_one(source_p, form_str(RPL_CREATED),
857	<	me.name, source_p->name, built_date);
858	<	sendto_one(source_p, form_str(RPL_MYINFO),
859	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
860	<	show_isupport(source_p);
852	>	switch (what)
853	>	{
854	>	case MODE_ADD:
855	>	AddUMode(target_p, UMODE_HIDDENHOST);
856	>	AddFlag(target_p, FLAGS_IP_SPOOFING);
857	>	break;
858	>	case MODE_DEL:
859	>	DelUMode(target_p, UMODE_HIDDENHOST);
860	>
861	>	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
862	>	DelFlag(target_p, FLAGS_IP_SPOOFING);
863	>	break;
864	>	default: return;
865	>	}
866
867	<	if (source_p->id[0] != '\0')
868	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
869	<	source_p->name, source_p->id);
867	>	if (ConfigFileEntry.cycle_on_host_change)
868	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
869	>	target_p->name, target_p->username, target_p->host);
870
871	<	show_lusers(source_p);
871	>	if (IsUserHostIp(target_p))
872	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
873	>
874	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
875
876	<	if (ConfigFileEntry.short_motd)
876	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
877	>	SetUserHost(target_p);
878	>
879	>	if (MyClient(target_p))
880		{
881	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
882	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1168	<	sendto_one(source_p,
1169	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1170	<	"read it", source_p->name);
1171	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1172	<	me.name, source_p->name, me.name);
1173	<	sendto_one(source_p, form_str(RPL_MOTD),
1174	<	me.name, source_p->name,
1175	<	"*** This is the short motd ***");
1176	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1177	<	me.name, source_p->name);
881	>	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
882	>	clear_ban_cache_client(target_p);
883		}
1179	–	else
1180	–	send_message_file(source_p, &ConfigFileEntry.motd);
1181	–	}
884
885	<	/* check_xline()
886	<	*
1185	<	* inputs       - pointer to client to test
1186	<	* outupt       - 1 if exiting 0 if ok
1187	<	* side effects -
1188	<	*/
1189	<	static int
1190	<	check_xline(struct Client *source_p)
1191	<	{
1192	<	struct ConfItem *conf = NULL;
1193	<	const char *reason = NULL;
885	>	if (!ConfigFileEntry.cycle_on_host_change)
886	>	return;
887
888	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1196	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
888	>	DLINK_FOREACH(ptr, target_p->channel.head)
889		{
890	<	struct MatchItem *reg = map_to_conf(conf);
891	<
892	<	++reg->count;
890	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
891	>	char *p = modebuf;
892	>	int len = 0;
893	>	const struct Membership *ms = ptr->data;
894
895	<	if (reg->reason != NULL)
896	<	reason = reg->reason;
897	<	else
898	<	reason = "No Reason";
895	>	if (has_member_flags(ms, CHFL_CHANOP))
896	>	{
897	>	*p++ = 'o';
898	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
899	>	}
900
901	<	sendto_realops_flags(UMODE_REJ, L_ALL,
902	<	"X-line Rejecting [%s] [%s], user %s [%s]",
903	<	source_p->info, reason,
904	<	get_client_name(source_p, HIDE_IP),
905	<	source_p->sockhost);
901	>	if (has_member_flags(ms, CHFL_HALFOP))
902	>	{
903	>	*p++ = 'h';
904	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
905	>	}
906
907	<	ServerStats->is_ref++;
1214	<	if (REJECT_HOLD_TIME > 0)
907	>	if (has_member_flags(ms, CHFL_VOICE))
908		{
909	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
910	<	me.name, source_p->name);
1218	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1219	<	SetCaptured(source_p);
909	>	*p++ = 'v';
910	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
911		}
1221	–	else
1222	–	exit_client(source_p, &me, "Bad user info");
1223	–	return 1;
1224	–	}
912
913	<	return 0;
1227	<	}
913	>	*p = '\0';
914
915	<	/* oper_up()
916	<	*
917	<	* inputs       - pointer to given client to oper
918	<	* output       - NONE
919	<	* side effects - Blindly opers up given source_p, using aconf info
920	<	*                all checks on passwords have already been done.
921	<	*                This could also be used by rsa oper routines.
915	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
916	>	target_p->name, target_p->username, target_p->host,
917	>	ms->chptr->chname);
918	>	if (nickbuf[0])
919	>	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
920	>	target_p->servptr->name, ms->chptr->chname,
921	>	modebuf, nickbuf);
922	>
923	>	}
924	>
925	>	if (target_p->away[0])
926	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
927	>	":%s!%s@%s AWAY :%s",
928	>	target_p->name, target_p->username,
929	>	target_p->host, target_p->away);
930	>	}
931	>
932	>	/*! \brief Blindly opers up given source_p, using conf info.
933	>	*         All checks on passwords have already been done.
934	>	* \param source_p Pointer to given client to oper
935		*/
936		void
937		oper_up(struct Client *source_p)
938		{
939	<	unsigned int old = source_p->umodes;
940	<	const char *operprivs = "";
1242	<	const struct AccessItem *oconf = NULL;
939	>	const unsigned int old = source_p->umodes;
940	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
941
942		assert(source_p->localClient->confs.head);
1245	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
943
944		++Count.oper;
945		SetOper(source_p);
946
947	<	if (oconf->modes)
948	<	source_p->umodes |= oconf->modes;
947	>	if (conf->modes)
948	>	AddUMode(source_p, conf->modes);
949		else if (ConfigFileEntry.oper_umodes)
950	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1254	<	else
1255	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1256	<	UMODE_WALLOP|UMODE_LOCOPS);
950	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
951
952	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
952	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
953		++Count.invisi;
954	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
954	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
955		--Count.invisi;
956
957		assert(dlinkFind(&oper_list, source_p) == NULL);
958		dlinkAdd(source_p, make_dlink_node(), &oper_list);
959
960	<	operprivs = oper_privs_as_string(oconf->port);
960	>	AddOFlag(source_p, conf->port);
961
962	<	SetOFlag(source_p, oconf->port);
962	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
963	>	AddUMode(source_p, UMODE_ADMIN);
964
965	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
966	<	source_p->umodes |= UMODE_ADMIN;
1272	<	if (!IsOperN(source_p))
1273	<	source_p->umodes &= ~UMODE_NCHANGE;
1274	<
1275	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1276	<	source_p->name, source_p->username, source_p->host);
965	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
966	>	get_oper_name(source_p));
967		send_umode_out(source_p, source_p, old);
968	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1279	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1280	<	me.name, source_p->name, operprivs);
1281	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
968	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
969		}
970
971	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
971	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
972
973		int
974		valid_sid(const char *sid)
975		{
1289	–
976		if (strlen(sid) == IRC_MAXSID)
977		if (IsDigit(*sid))
978		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1297 | Line 983 | valid_sid(const char *sid)
983
984		/*
985		* init_uid()
986	<	*
986	>	*
987		* inputs       - NONE
988		* output       - NONE
989		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1307 | Line 993 | valid_sid(const char *sid)
993		void
994		init_uid(void)
995		{
1310	–	int i;
1311	–
996		memset(new_uid, 0, sizeof(new_uid));
997
998	<	if (ServerInfo.sid != NULL)
1315	<	{
998	>	if (!EmptyString(ServerInfo.sid))
999		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1317	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1318	–
1319	–	hash_add_id(&me);
1320	–	}
1000
1001	<	for (i = 0; i < IRC_MAXSID; i++)
1002	<	if (new_uid[i] == '\0')
1001	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1002	>	if (new_uid[i] == '\0')
1003		new_uid[i] = 'A';
1004
1005		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1327	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1328	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1329	–	* -Dianora
1330	–	*/
1006		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1332	–
1333	–	entering_umode_cb = register_callback("entering_umode", NULL);
1334	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1335	–	uid_get_cb = register_callback("uid_get", uid_get);
1007		}
1008
1009		/*
#	Line 1344 | Line 1015 | init_uid(void)
1015		*                note this is a recursive function
1016		*/
1017		static void
1018	<	add_one_to_uid(int i)
1018	>	add_one_to_uid(unsigned int i)
1019		{
1020	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1020	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1021		{
1022		if (new_uid[i] == 'Z')
1023		new_uid[i] = '0';
1024		else if (new_uid[i] == '9')
1025		{
1026		new_uid[i] = 'A';
1027	<	add_one_to_uid(i-1);
1027	>	add_one_to_uid(i - 1);
1028		}
1029		else
1030		++new_uid[i];
#	Line 1375 | Line 1046 | add_one_to_uid(int i)
1046		* output       - new UID is returned to caller
1047		* side effects - new_uid is incremented by one.
1048		*/
1049	<	static void *
1050	<	uid_get(va_list args)
1049	>	static const char *
1050	>	uid_get(void)
1051		{
1052	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1052	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1053		return new_uid;
1054		}
1055
#	Line 1392 | Line 1063 | uid_get(va_list args)
1063		void
1064		init_isupport(void)
1065		{
1395	–	isupportFile = init_MessageLine();
1396	–
1066		add_isupport("CALLERID", NULL, -1);
1067	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1067	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1068		add_isupport("DEAF", "D", -1);
1069		add_isupport("KICKLEN", NULL, KICKLEN);
1070		add_isupport("MODES", NULL, MAXMODEPARAMS);
1402	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1403	–	#ifdef HALFOPS
1071		add_isupport("PREFIX", "(ohv)@%+", -1);
1072		add_isupport("STATUSMSG", "@%+", -1);
1073	<	#else
1074	<	add_isupport("PREFIX", "(ov)@+", -1);
1408	<	add_isupport("STATUSMSG", "@+", -1);
1409	<	#endif
1410	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1073	>	add_isupport("EXCEPTS", "e", -1);
1074	>	add_isupport("INVEX", "I", -1);
1075		}
1076
1077		/*
#	Line 1423 | Line 1087 | void
1087		add_isupport(const char *name, const char *options, int n)
1088		{
1089		dlink_node *ptr;
1090	<	struct Isupport *support;
1090	>	struct Isupport *support = NULL;
1091
1092		DLINK_FOREACH(ptr, support_list.head)
1093		{
#	Line 1438 | Line 1102 | add_isupport(const char *name, const cha
1102
1103		if (ptr == NULL)
1104		{
1105	<	support = MyMalloc(sizeof(*support));
1105	>	support = MyCalloc(sizeof(*support));
1106		dlinkAddTail(support, &support->node, &support_list);
1107		}
1108
1109	<	DupString(support->name, name);
1110	<	if (options != NULL)
1111	<	DupString(support->options, options);
1109	>	support->name = xstrdup(name);
1110	>	if (options)
1111	>	support->options = xstrdup(options);
1112		support->number = n;
1113
1114		rebuild_isupport_message_line();
#	Line 1491 | Line 1155 | rebuild_isupport_message_line(void)
1155		{
1156		char isupportbuffer[IRCD_BUFSIZE];
1157		char *p = isupportbuffer;
1158	<	dlink_node *ptr = NULL;
1158	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1159		int n = 0;
1160		int tokens = 0;
1161		size_t len = 0;
1162	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1162	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1163
1164	<	destroy_MessageLine(isupportFile);
1164	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1165	>	{
1166	>	dlinkDelete(ptr, &support_list_lines);
1167	>	MyFree(ptr->data);
1168	>	free_dlink_node(ptr);
1169	>	}
1170
1171		DLINK_FOREACH(ptr, support_list.head)
1172		{
1173		struct Isupport *support = ptr->data;
1174
1175	<	p += (n = ircsprintf(p, "%s", support->name));
1175	>	p += (n = sprintf(p, "%s", support->name));
1176		len += n;
1177
1178	<	if (support->options != NULL)
1178	>	if (support->options)
1179		{
1180	<	p += (n = ircsprintf(p, "=%s", support->options));
1180	>	p += (n = sprintf(p, "=%s", support->options));
1181		len += n;
1182		}
1183
1184		if (support->number > 0)
1185		{
1186	<	p += (n = ircsprintf(p, "=%d", support->number));
1186	>	p += (n = sprintf(p, "=%d", support->number));
1187		len += n;
1188		}
1189
#	Line 1527 | Line 1196 | rebuild_isupport_message_line(void)
1196		if (*--p == ' ')
1197		*p = '\0';
1198
1199	<	addto_MessageLine(isupportFile, isupportbuffer);
1199	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1200		p = isupportbuffer;
1201		len = 0;
1202		n = tokens = 0;
1203		}
1204		}
1205
1206	<	if (len != 0)
1206	>	if (len)
1207		{
1208		if (*--p == ' ')
1209		*p = '\0';
1210	<	addto_MessageLine(isupportFile, isupportbuffer);
1210	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1211		}
1212		}

Diff Legend

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