ViewVC Help

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

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

Comparing:
ircd-hybrid-7.3/src/s_user.c (file contents), Revision 1125 by michael, Sun Feb 20 13:44:39 2011 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 7113 by michael, Sat Jan 23 20:31:25 2016 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-2016 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file user.c
23	>	* \brief User related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29	<	#include "s_user.h"
28	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "common.h"
33	–	#include "fdlist.h"
33		#include "hash.h"
34	+	#include "id.h"
35		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
37	–	#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
38		#include "motd.h"
39		#include "numeric.h"
40	<	#include "s_conf.h"
41	<	#include "s_log.h"
42	<	#include "s_serv.h"
40	>	#include "conf.h"
41	>	#include "log.h"
42	>	#include "server.h"
43		#include "send.h"
46	–	#include "supported.h"
47	–	#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"
54	<	#include "msg.h"
48	>	#include "misc.h"
49	>	#include "parse.h"
50		#include "watch.h"
51	<
52	<	unsigned int MaxClientCount     = 1;
58	<	unsigned int MaxConnectionCount = 1;
59	<	struct Callback *entering_umode_cb = NULL;
60	<	struct Callback *umode_cb = NULL;
51	>	#include "isupport.h"
52	>	#include "tls.h"
53
54		static char umode_buffer[IRCD_BUFSIZE];
55
56	<	static void user_welcome(struct Client *);
57	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
66	<	static int check_xline(struct Client *);
67	<	static void introduce_client(struct Client *);
68	<	static const char *uid_get(void);
69	<
70	<	/* Used for building up the isupport string,
71	<	* used with init_isupport, add_isupport, delete_isupport
72	<	*/
73	<
74	<	struct Isupport
56	>	const struct user_modes *umode_map[256];
57	>	const struct user_modes  umode_tab[] =
58		{
59	<	dlink_node node;
60	<	char *name;
61	<	char *options;
62	<	int number;
63	<	};
64	<
65	<	static dlink_list support_list = { NULL, NULL, 0 };
66	<	MessageFile *isupportFile;
67	<
68	<	/* memory is cheap. map 0-255 to equivalent mode */
69	<	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 */
73	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
74	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
75	<	0,                  /* @ */
76	<	0,                  /* A */
77	<	0,                  /* B */
78	<	UMODE_CCONN_FULL,   /* C */
79	<	UMODE_DEAF,         /* D */
80	<	0,                  /* E */
81	<	0,                  /* F */
82	<	UMODE_SOFTCALLERID, /* G */
83	<	0,                  /* H */
84	<	0,                  /* I */
85	<	0,                  /* J */
86	<	0,                  /* K */
87	<	0,                  /* L */
105	<	0,                  /* M */
106	<	0,                  /* N */
107	<	0,                  /* O */
108	<	0,                  /* P */
109	<	0,                  /* Q */
110	<	0,                  /* R */
111	<	0,                  /* S */
112	<	0,                  /* T */
113	<	0,                  /* U */
114	<	0,                  /* V */
115	<	0,                  /* W */
116	<	0,                  /* X */
117	<	0,                  /* Y */
118	<	0,                  /* Z 0x5A */
119	<	0, 0, 0, 0, 0,      /* 0x5F   */
120	<	0,                  /* 0x60   */
121	<	UMODE_ADMIN,        /* a */
122	<	UMODE_BOTS,         /* b */
123	<	UMODE_CCONN,        /* c */
124	<	UMODE_DEBUG,        /* d */
125	<	0,                  /* e */
126	<	UMODE_FULL,         /* f */
127	<	UMODE_CALLERID,     /* g */
128	<	0,                  /* h */
129	<	UMODE_INVISIBLE,    /* i */
130	<	0,                  /* j */
131	<	UMODE_SKILL,        /* k */
132	<	UMODE_LOCOPS,       /* l */
133	<	0,                  /* m */
134	<	UMODE_NCHANGE,      /* n */
135	<	UMODE_OPER,         /* o */
136	<	0,                  /* p */
137	<	0,                  /* q */
138	<	UMODE_REJ,          /* r */
139	<	UMODE_SERVNOTICE,   /* s */
140	<	0,                  /* t */
141	<	UMODE_UNAUTH,       /* u */
142	<	0,                  /* v */
143	<	UMODE_WALLOP,       /* w */
144	<	UMODE_EXTERNAL,     /* x */
145	<	UMODE_SPY,          /* y */
146	<	UMODE_OPERWALL,     /* z      0x7A */
147	<	0,0,0,0,0,          /* 0x7B - 0x7F */
148	<
149	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
150	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
151	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
152	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
153	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
154	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
155	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
156	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
59	>	{ 'D', UMODE_DEAF         },
60	>	{ 'F', UMODE_FARCONNECT   },
61	>	{ 'G', UMODE_SOFTCALLERID },
62	>	{ 'H', UMODE_HIDDEN       },
63	>	{ 'R', UMODE_REGONLY      },
64	>	{ 'S', UMODE_SSL          },
65	>	{ 'W', UMODE_WEBIRC       },
66	>	{ 'a', UMODE_ADMIN        },
67	>	{ 'b', UMODE_BOTS         },
68	>	{ 'c', UMODE_CCONN        },
69	>	{ 'd', UMODE_DEBUG        },
70	>	{ 'e', UMODE_EXTERNAL     },
71	>	{ 'f', UMODE_FULL         },
72	>	{ 'g', UMODE_CALLERID     },
73	>	{ 'i', UMODE_INVISIBLE    },
74	>	{ 'j', UMODE_REJ          },
75	>	{ 'k', UMODE_SKILL        },
76	>	{ 'l', UMODE_LOCOPS       },
77	>	{ 'n', UMODE_NCHANGE      },
78	>	{ 'o', UMODE_OPER         },
79	>	{ 'p', UMODE_HIDECHANS    },
80	>	{ 'q', UMODE_HIDEIDLE     },
81	>	{ 'r', UMODE_REGISTERED   },
82	>	{ 's', UMODE_SERVNOTICE   },
83	>	{ 'u', UMODE_UNAUTH       },
84	>	{ 'w', UMODE_WALLOP       },
85	>	{ 'x', UMODE_HIDDENHOST   },
86	>	{ 'y', UMODE_SPY          },
87	>	{ '\0', 0 }
88		};
89
90		void
91	<	assemble_umode_buffer(void)
91	>	user_modes_init(void)
92		{
162	–	unsigned int idx = 0;
93		char *umode_buffer_ptr = umode_buffer;
94
95	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
96	<	if (user_modes[idx])
97	<	*umode_buffer_ptr++ = idx;
95	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
96	>	{
97	>	umode_map[tab->c] = tab;
98	>	*umode_buffer_ptr++ = tab->c;
99	>	}
100
101		*umode_buffer_ptr = '\0';
102		}
#	Line 176 | Line 108 | assemble_umode_buffer(void)
108		* side effects - display to client user counts etc.
109		*/
110		void
111	<	show_lusers(struct Client *source_p)
111	>	show_lusers(struct Client *source_p)
112		{
113	<	const char *from, *to;
113	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
114	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
115	>	Count.invisi, dlink_list_length(&global_server_list));
116	>	else
117	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
118	>	Count.invisi, 1);
119	>
120	>	if (Count.oper)
121	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
122	>
123	>	if (dlink_list_length(&unknown_list))
124	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
125
126	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
126	>	if (dlink_list_length(&channel_list))
127	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
128	>
129	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
130		{
131	<	from = me.id;
132	<	to = source_p->id;
131	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
132	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
133		}
134		else
135		{
136	<	from = me.name;
137	<	to = source_p->name;
136	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
137	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
138		}
139
140	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
141	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
142	<	from, to, (Count.total-Count.invisi),
143	<	Count.invisi, dlink_list_length(&global_serv_list));
144	<	else
145	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
146	<	(Count.total-Count.invisi), Count.invisi, 1);
140	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
141	>
142	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
143	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
144	>	Count.max_loc_cli, Count.totalrestartcount);
145	>
146	>	if (Count.local > Count.max_loc_cli)
147	>	Count.max_loc_cli = Count.local;
148	>
149	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
150	>	Count.max_loc_con = Count.local + Count.myserver;
151	>	}
152	>
153	>	/* report_and_set_user_flags()
154	>	*
155	>	* inputs       - pointer to source_p
156	>	*              - pointer to conf for this user
157	>	* output       - NONE
158	>	* side effects - Report to user any special flags
159	>	*                they are getting, and set them.
160	>	*/
161	>	static void
162	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
163	>	{
164	>	/* If this user is being spoofed, tell them so */
165	>	if (IsConfDoSpoofIp(conf))
166	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP");
167	>
168	>	/* If this user is in the exception class, set it "E lined" */
169	>	if (IsConfExemptKline(conf))
170	>	{
171	>	AddFlag(source_p, FLAGS_EXEMPTKLINE);
172	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines");
173	>	}
174
175	<	if (Count.oper > 0)
176	<	sendto_one(source_p, form_str(RPL_LUSEROP),
177	<	from, to, Count.oper);
178	<
206	<	if (dlink_list_length(&unknown_list) > 0)
207	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
208	<	from, to, dlink_list_length(&unknown_list));
209	<
210	<	if (dlink_list_length(&global_channel_list) > 0)
211	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
212	<	from, to, dlink_list_length(&global_channel_list));
213	<
214	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
215	<	{
216	<	sendto_one(source_p, form_str(RPL_LUSERME),
217	<	from, to, Count.local, Count.myserver);
218	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.local, Count.max_loc,
220	<	Count.local, Count.max_loc);
175	>	if (IsConfExemptXline(conf))
176	>	{
177	>	AddFlag(source_p, FLAGS_EXEMPTXLINE);
178	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines");
179		}
180	+
181	+	if (IsConfExemptResv(conf))
182	+	{
183	+	AddFlag(source_p, FLAGS_EXEMPTRESV);
184	+	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs");
185	+	}
186	+
187	+	/* If this user is exempt from user limits set it "F lined" */
188	+	if (IsConfExemptLimits(conf))
189	+	{
190	+	AddFlag(source_p, FLAGS_NOLIMIT);
191	+	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits");
192	+	}
193	+
194	+	if (IsConfCanFlood(conf))
195	+	{
196	+	AddFlag(source_p, FLAGS_CANFLOOD);
197	+	sendto_one_notice(source_p, &me, ":*** You are exempt from flood protection");
198	+	}
199	+	}
200	+
201	+	/* introduce_client()
202	+	*
203	+	* inputs       - source_p
204	+	* output       - NONE
205	+	* side effects - This common function introduces a client to the rest
206	+	*                of the net, either from a local client connect or
207	+	*                from a remote connect.
208	+	*/
209	+	static void
210	+	introduce_client(struct Client *source_p)
211	+	{
212	+	dlink_node *node = NULL;
213	+	char ubuf[IRCD_BUFSIZE] = "";
214	+
215	+	if (MyConnect(source_p))
216	+	send_umode(source_p, source_p, 0, ubuf);
217		else
218	+	send_umode(NULL, source_p, 0, ubuf);
219	+
220	+	watch_check_hash(source_p, RPL_LOGON);
221	+
222	+	if (ubuf[0] == '\0')
223		{
224	<	sendto_one(source_p, form_str(RPL_LUSERME),
225	<	from, to, Count.total, 0);
226	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
227	<	from, to, Count.total, Count.max_tot,
228	<	Count.total, Count.max_tot);
229	<	}
230	<
231	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
232	<	from, to, Count.total, Count.max_tot,
233	<	Count.total, Count.max_tot);
234	<
235	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
236	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
237	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
224	>	ubuf[0] = '+';
225	>	ubuf[1] = '\0';
226	>	}
227	>
228	>	DLINK_FOREACH(node, local_server_list.head)
229	>	{
230	>	struct Client *server = node->data;
231	>
232	>	if (server == source_p->from)
233	>	continue;
234
235	<	if (Count.local > MaxClientCount)
236	<	MaxClientCount = Count.local;
235	>	sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
236	>	source_p->servptr->id,
237	>	source_p->name, source_p->hopcount+1,
238	>	source_p->tsinfo,
239	>	ubuf, source_p->username, source_p->host,
240	>	source_p->sockhost, source_p->id,
241	>	source_p->account,
242	>	source_p->info);
243
244	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
245	<	MaxConnectionCount = Count.local + Count.myserver;
244	>	if (!EmptyString(source_p->certfp))
245	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
246	>	}
247		}
248
249	<	/* show_isupport()
249	>	/* user_welcome()
250		*
251	<	* inputs       - pointer to client
251	>	* inputs       - client pointer to client to welcome
252		* output       - NONE
253	<	* side effects - display to client what we support (for them)
253	>	* side effects -
254		*/
255	<	void
256	<	show_isupport(struct Client *source_p)
255	>	static void
256	>	user_welcome(struct Client *source_p)
257		{
258	<	send_message_file(source_p, isupportFile);
258	>	static const char built_date[] = __DATE__ " at " __TIME__;
259	>
260	>	if (HasFlag(source_p, FLAGS_SSL))
261	>	{
262	>	AddUMode(source_p, UMODE_SSL);
263	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
264	>	tls_get_cipher(&source_p->connection->fd.ssl));
265	>	}
266	>
267	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
268	>	source_p->name);
269	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
270	>	listener_get_name(source_p->connection->listener), ircd_version);
271	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
272	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
273	>
274	>	isupport_show(source_p);
275	>	show_lusers(source_p);
276	>	motd_signon(source_p);
277		}
278
279	<	/*
280	<	** register_local_user
281	<	**      This function is called when both NICK and USER messages
282	<	**      have been accepted for the client, in whatever order. Only
283	<	**      after this, is the USER message propagated.
284	<	**
285	<	**      NICK's must be propagated at once when received, although
286	<	**      it would be better to delay them too until full info is
287	<	**      available. Doing it is not so simple though, would have
288	<	**      to implement the following:
289	<	**
290	<	**      (actually it has been implemented already for a while) -orabidoo
291	<	**
292	<	**      1) user telnets in and gives only "NICK foobar" and waits
293	<	**      2) another user far away logs in normally with the nick
294	<	**         "foobar" (quite legal, as this server didn't propagate
295	<	**         it).
296	<	**      3) now this server gets nick "foobar" from outside, but
297	<	**         has alread the same defined locally. Current server
298	<	**         would just issue "KILL foobar" to clean out dups. But,
299	<	**         this is not fair. It should actually request another
300	<	**         nick from local user or kill him/her...
301	<	*/
279	>	/* check_xline()
280	>	*
281	>	* inputs       - pointer to client to test
282	>	* outupt       - 1 if exiting 0 if ok
283	>	* side effects -
284	>	*/
285	>	static int
286	>	check_xline(struct Client *source_p)
287	>	{
288	>	struct MaskItem *conf = NULL;
289	>
290	>	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
291	>	return 0;
292	>
293	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
294	>	{
295	>	++conf->count;
296	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
297	>	"X-line Rejecting [%s] [%s], user %s [%s]",
298	>	source_p->info, conf->reason,
299	>	get_client_name(source_p, HIDE_IP),
300	>	source_p->sockhost);
301	>
302	>	++ServerStats.is_ref;
303	>	exit_client(source_p, "Bad user info");
304	>	return 1;
305	>	}
306	>
307	>	return 0;
308	>	}
309	>
310	>	/*! \brief This function is called when both NICK and USER messages
311	>	*      have been accepted for the client, in whatever order. Only
312	>	*      after this, is the UID message propagated.
313	>	* \param source_p Pointer to given client to introduce
314	>	*/
315		void
316		register_local_user(struct Client *source_p)
317		{
318		const char *id = NULL;
319	<	const struct AccessItem *aconf = NULL;
286	<	dlink_node *ptr = NULL;
287	<	dlink_node *m = NULL;
319	>	const struct MaskItem *conf = NULL;
320
289	–	assert(source_p != NULL);
321		assert(source_p == source_p->from);
322		assert(MyConnect(source_p));
323	<	assert(!source_p->localClient->registration);
324	<
294	<	ClearCap(source_p, CAP_TS6);
323	>	assert(IsUnknown(source_p));
324	>	assert(!source_p->connection->registration);
325
326	<	if (ConfigFileEntry.ping_cookie)
326	>	if (ConfigGeneral.ping_cookie)
327		{
328	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
328	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
329		{
330		do
331	<	source_p->localClient->random_ping = genrand_int32();
332	<	while (!source_p->localClient->random_ping);
331	>	source_p->connection->random_ping = genrand_int32();
332	>	while (!source_p->connection->random_ping);
333
334	<	sendto_one(source_p, "PING :%u",
335	<	source_p->localClient->random_ping);
306	<	SetPingSent(source_p);
334	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
335	>	AddFlag(source_p, FLAGS_PINGSENT);
336		return;
337		}
338
339	<	if (!HasPingCookie(source_p))
339	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
340		return;
341		}
342
343	<	source_p->localClient->last = CurrentTime;
343	>	source_p->connection->last_privmsg = CurrentTime;
344		/* Straight up the maximum rate of flooding... */
345	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
345	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
346
347	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
347	>	if (!check_client(source_p))
348		return;
349
350	<	if (valid_hostname(source_p->host) == 0)
350	>	if (!valid_hostname(source_p->host))
351		{
352	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
353	<	"character in your hostname", me.name, source_p->name);
354	<	strlcpy(source_p->host, source_p->sockhost,
326	<	sizeof(source_p->host));
352	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
353	>	"character in your hostname");
354	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
355		}
356
357	<	ptr   = source_p->localClient->confs.head;
330	<	aconf = map_to_conf(ptr->data);
357	>	conf = source_p->connection->confs.head->data;
358
359	<	if (!IsGotId(source_p))
359	>	if (!HasFlag(source_p, FLAGS_GOTID))
360		{
361	<	char username[USERLEN + 1];
335	<	const char *p = username;
361	>	char username[USERLEN + 1] = "";
362		unsigned int i = 0;
363
364	<	if (IsNeedIdentd(aconf))
364	>	if (IsNeedIdentd(conf))
365		{
366		++ServerStats.is_ref;
367	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
368	<	"identd to use this server", me.name, source_p->name);
369	<	exit_client(source_p, &me, "Install identd");
367	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
368	>	"identd to use this server");
369	>	exit_client(source_p, "Install identd");
370		return;
371		}
372
373		strlcpy(username, source_p->username, sizeof(username));
374
375	<	if (!IsNoTilde(aconf))
375	>	if (!IsNoTilde(conf))
376		source_p->username[i++] = '~';
377
378	<	for (; *p && i < USERLEN; ++p)
379	<	if (*p != '[')
354	<	source_p->username[i++] = *p;
378	>	for (const char *p = username; *p && i < USERLEN; ++p)
379	>	source_p->username[i++] = *p;
380
381		source_p->username[i] = '\0';
382		}
383
384	<	/* password check */
385	<	if (!EmptyString(aconf->passwd))
384	>	/* Password check */
385	>	if (!EmptyString(conf->passwd))
386		{
387	<	const char *pass = source_p->localClient->passwd;
363	<
364	<	if (!match_conf_password(pass, aconf))
387	>	if (!match_conf_password(source_p->connection->password, conf))
388		{
389		++ServerStats.is_ref;
390	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
391	<	me.name, source_p->name);
392	<	exit_client(source_p, &me, "Bad Password");
390	>
391	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
392	>	exit_client(source_p, "Bad Password");
393		return;
394		}
395		}
396
397	<	/* don't free source_p->localClient->passwd here - it can be required
398	<	* by masked /stats I if there are auth{} blocks with need_password = no;
397	>	/*
398	>	* Don't free source_p->connection->password here - it can be required
399	>	* by masked /stats I if there are auth {} blocks with need_password = no;
400		* --adx
401		*/
402
403	<	/* report if user has &^>= etc. and set flags as needed in source_p */
404	<	report_and_set_user_flags(source_p, aconf);
403	>	/*
404	>	* Report if user has &^>= etc. and set flags as needed in source_p
405	>	*/
406	>	report_and_set_user_flags(source_p, conf);
407
408		if (IsDead(source_p))
409		return;
410
411	<	/* Limit clients -
411	>	/*
412	>	* Limit clients -
413		* We want to be able to have servers and F-line clients
414		* connect, so save room for "buffer" connections.
415		* Smaller servers may want to decrease this, and it should
416		* probably be just a percentage of the MAXCLIENTS...
417		*   -Taner
418		*/
419	<	/* Except "F:" clients */
420	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
394	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
419	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
420	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
421		{
422	<	sendto_realops_flags(UMODE_FULL, L_ALL,
422	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
423		"Too many clients, rejecting %s[%s].",
424		source_p->name, source_p->host);
425		++ServerStats.is_ref;
426	<	exit_client(source_p, &me, "Sorry, server is full - try later");
426	>	exit_client(source_p, "Sorry, server is full - try later");
427		return;
428		}
429
430	<	/* valid user name check */
405	<	if (valid_username(source_p->username) == 0)
430	>	if (!valid_username(source_p->username, 1))
431		{
432	<	char tmpstr2[IRCD_BUFSIZE];
432	>	char buf[IRCD_BUFSIZE] = "";
433
434	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
434	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
435	>	"Invalid username: %s (%s@%s)",
436		source_p->name, source_p->username, source_p->host);
437		++ServerStats.is_ref;
438	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
439	<	source_p->username);
414	<	exit_client(source_p, &me, tmpstr2);
438	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
439	>	exit_client(source_p, buf);
440		return;
441		}
442
443		if (check_xline(source_p))
444		return;
445
446	<	while (hash_find_id((id = uid_get())) != NULL)
446	>	while (hash_find_id((id = uid_get())))
447		;
448
449		strlcpy(source_p->id, id, sizeof(source_p->id));
450		hash_add_id(source_p);
451
452	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
453	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
452	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
453	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
454		source_p->name, source_p->username, source_p->host,
455	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
456	<	"255.255.255.255" : source_p->sockhost,
457	<	get_client_class(source_p),
433	<	source_p->info);
434	<
435	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
436	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
437	<	source_p->name, source_p->username, source_p->host,
438	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
439	<	"255.255.255.255" : source_p->sockhost,
440	<	get_client_class(source_p),
441	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
442	<	"<hidden>" : source_p->localClient->client_host,
443	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
444	<	"<hidden>" : source_p->localClient->client_server,
445	<	source_p->info);
446	<
455	>	source_p->sockhost,
456	>	get_client_class(&source_p->connection->confs),
457	>	source_p->info, source_p->id);
458
459	<	if (ConfigFileEntry.invisible_on_connect)
459	>	if (ConfigGeneral.invisible_on_connect)
460		{
461	<	source_p->umodes |= UMODE_INVISIBLE;
461	>	AddUMode(source_p, UMODE_INVISIBLE);
462		++Count.invisi;
463		}
464
465	<	if ((++Count.local) > Count.max_loc)
465	>	if (++Count.local > Count.max_loc)
466		{
467		Count.max_loc = Count.local;
468
469		if (!(Count.max_loc % 10))
470	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
470	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
471	>	"New maximum local client connections: %u",
472		Count.max_loc);
473		}
474
463	–	/* Increment our total user count here */
475		if (++Count.total > Count.max_tot)
476		Count.max_tot = Count.total;
477		++Count.totalrestartcount;
#	Line 468 | Line 479 | register_local_user(struct Client *sourc
479		assert(source_p->servptr == &me);
480		SetClient(source_p);
481		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
482	<
472	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
482	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
483
484		assert(dlinkFind(&unknown_list, source_p));
485
486	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
487	<	{
478	<	free_dlink_node(m);
479	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
480	<	}
486	>	dlink_move_node(&source_p->connection->lclient_node,
487	>	&unknown_list, &local_client_list);
488
489		user_welcome(source_p);
490	<	add_user_host(source_p->username, source_p->host, 0);
491	<	SetUserHost(source_p);
490	>	userhost_add(source_p->username, source_p->host, 0);
491	>	AddFlag(source_p, FLAGS_USERHOST);
492
493		introduce_client(source_p);
494		}
#	Line 492 | Line 499 | register_local_user(struct Client *sourc
499		*              - username to register as
500		*              - host name to register as
501		*              - server name
495	–	*              - realname (gecos)
502		* output       - NONE
503		* side effects - This function is called when a remote client
504		*                is introduced by a server.
505		*/
506		void
507	<	register_remote_user(struct Client *source_p,
502	<	const char *username, const char *host, const char *server,
503	<	const char *realname)
507	>	register_remote_user(struct Client *source_p)
508		{
509	<	struct Client *target_p = NULL;
506	<
507	<	assert(source_p != NULL);
508	<	assert(source_p->username != username);
509	<
510	<	strlcpy(source_p->host, host, sizeof(source_p->host));
511	<	strlcpy(source_p->username, username, sizeof(source_p->username));
512	<
513	<	/*
514	<	* coming from another server, take the servers word for it
515	<	*/
516	<	source_p->servptr = find_server(server);
517	<
518	<	/* Super GhostDetect:
519	<	* If we can't find the server the user is supposed to be on,
520	<	* then simply blow the user away.        -Taner
521	<	*/
522	<	if (source_p->servptr == NULL)
523	<	{
524	<	sendto_realops_flags(UMODE_ALL, L_ALL,
525	<	"No server %s for user %s[%s@%s] from %s",
526	<	server, source_p->name, source_p->username,
527	<	source_p->host, source_p->from->name);
528	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
529	<
530	<	SetKilled(source_p);
531	<	exit_client(source_p, &me, "Ghosted Client");
532	<	return;
533	<	}
509	>	const struct Client *target_p = NULL;
510
511		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
512		{
513	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
513	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
514		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
515		source_p->from->name, source_p->name, source_p->username,
516		source_p->host, source_p->servptr->name,
517		target_p->name, target_p->from->name);
518	<	kill_client(source_p->from, source_p,
519	<	"%s (NICK from wrong direction (%s != %s))",
520	<	me.name, source_p->servptr->name, target_p->from->name);
521	<	SetKilled(source_p);
522	<	exit_client(source_p, &me, "USER server wrong direction");
518	>	sendto_one(source_p->from,
519	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
520	>	me.id, source_p->id, me.name, source_p->servptr->name,
521	>	target_p->from->name);
522	>
523	>	AddFlag(source_p, FLAGS_KILLED);
524	>	exit_client(source_p, "UID server wrong direction");
525		return;
526		}
527
528	<	/* Increment our total user count here */
528	>	/*
529	>	* If the nick has been introduced by a services server,
530	>	* make it a service as well.
531	>	*/
532	>	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
533	>	AddFlag(source_p, FLAGS_SERVICE);
534	>
535		if (++Count.total > Count.max_tot)
536		Count.max_tot = Count.total;
537
538		SetClient(source_p);
539		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
540	<	add_user_host(source_p->username, source_p->host, 1);
541	<	SetUserHost(source_p);
540	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
541	>	userhost_add(source_p->username, source_p->host, 1);
542	>	AddFlag(source_p, FLAGS_USERHOST);
543	>
544	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
545	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
546	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
547	>	source_p->servptr->name,
548	>	source_p->name, source_p->username, source_p->host,
549	>	source_p->sockhost, source_p->info, source_p->id);
550
551		introduce_client(source_p);
552		}
553
562	–	/* introduce_client()
563	–	*
564	–	* inputs       - source_p
565	–	* output       - NONE
566	–	* side effects - This common function introduces a client to the rest
567	–	*                of the net, either from a local client connect or
568	–	*                from a remote connect.
569	–	*/
570	–	static void
571	–	introduce_client(struct Client *source_p)
572	–	{
573	–	dlink_node *server_node = NULL;
574	–	static char ubuf[12];
575	–
576	–	if (MyClient(source_p))
577	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
578	–	else
579	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
580	–
581	–	watch_check_hash(source_p, RPL_LOGON);
582	–
583	–	if (*ubuf == '\0')
584	–	{
585	–	ubuf[0] = '+';
586	–	ubuf[1] = '\0';
587	–	}
588	–
589	–	DLINK_FOREACH(server_node, serv_list.head)
590	–	{
591	–	struct Client *server = server_node->data;
592	–
593	–	if (server == source_p->from)
594	–	continue;
595	–
596	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
597	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
598	–	source_p->servptr->id,
599	–	source_p->name, source_p->hopcount+1,
600	–	(unsigned long)source_p->tsinfo,
601	–	ubuf, source_p->username, source_p->host,
602	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
603	–	"0" : source_p->sockhost, source_p->id, source_p->info);
604	–	else
605	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
606	–	source_p->name, source_p->hopcount+1,
607	–	(unsigned long)source_p->tsinfo,
608	–	ubuf, source_p->username, source_p->host,
609	–	source_p->servptr->name, source_p->info);
610	–	}
611	–	}
612	–
554		/* valid_hostname()
555		*
556		* Inputs       - pointer to hostname
#	Line 624 | Line 565 | valid_hostname(const char *hostname)
565		{
566		const char *p = hostname;
567
568	<	assert(p != NULL);
568	>	assert(p);
569
570	<	if (*p == '.' || *p == ':')
570	>	if (EmptyString(p) || *p == '.' || *p == ':')
571		return 0;
572
573		for (; *p; ++p)
574		if (!IsHostChar(*p))
575		return 0;
576
577	<	return 1;
577	>	return p - hostname <= HOSTLEN;
578		}
579
580		/* valid_username()
#	Line 648 | Line 589 | valid_hostname(const char *hostname)
589		* style of username
590		*/
591		int
592	<	valid_username(const char *username)
592	>	valid_username(const char *username, const int local)
593		{
653	–	int dots      = 0;
594		const char *p = username;
595
596	<	assert(p != NULL);
596	>	assert(p);
597
598		if (*p == '~')
599		++p;
600
601	<	/* reject usernames that don't start with an alphanum
601	>	/*
602	>	* Reject usernames that don't start with an alphanum
603		* i.e. reject jokers who have '-@somehost' or '.@somehost'
604		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
605		*/
606		if (!IsAlNum(*p))
607		return 0;
608
609	<	while (*++p)
609	>	if (local)
610		{
611	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
611	>	unsigned int dots = 0;
612	>
613	>	while (*++p)
614		{
615	<	if (++dots > ConfigFileEntry.dots_in_ident)
616	<	return 0;
617	<	if (!IsUserChar(*(p + 1)))
615	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
616	>	{
617	>	if (++dots > ConfigGeneral.dots_in_ident)
618	>	return 0;
619	>	if (!IsUserChar(*(p + 1)))
620	>	return 0;
621	>	}
622	>	else if (!IsUserChar(*p))
623		return 0;
624		}
677	–	else if (!IsUserChar(*p))
678	–	return 0;
679	–	}
680	–
681	–	return 1;
682	–	}
683	–
684	–	/* report_and_set_user_flags()
685	–	*
686	–	* inputs       - pointer to source_p
687	–	*              - pointer to aconf for this user
688	–	* output       - NONE
689	–	* side effects - Report to user any special flags
690	–	*                they are getting, and set them.
691	–	*/
692	–	static void
693	–	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
694	–	{
695	–	/* If this user is being spoofed, tell them so */
696	–	if (IsConfDoSpoofIp(aconf))
697	–	{
698	–	sendto_one(source_p,
699	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
700	–	me.name, source_p->name);
701	–	}
702	–
703	–	/* If this user is in the exception class, Set it "E lined" */
704	–	if (IsConfExemptKline(aconf))
705	–	{
706	–	SetExemptKline(source_p);
707	–	sendto_one(source_p,
708	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
709	–	me.name, source_p->name);
710	–	}
711	–
712	–	/* The else here is to make sure that G line exempt users
713	–	* do not get noticed twice.
714	–	*/
715	–	else if (IsConfExemptGline(aconf))
716	–	{
717	–	SetExemptGline(source_p);
718	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
719	–	me.name, source_p->name);
720	–	}
721	–
722	–	if (IsConfExemptResv(aconf))
723	–	{
724	–	SetExemptResv(source_p);
725	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
726	–	me.name, source_p->name);
727	–	}
728	–
729	–	/* If this user is exempt from user limits set it "F lined" */
730	–	if (IsConfExemptLimits(aconf))
731	–	{
732	–	SetExemptLimits(source_p);
733	–	sendto_one(source_p,
734	–	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
735	–	me.name,source_p->name);
736	–	}
737	–
738	–	/* If this user is exempt from idle time outs */
739	–	if (IsConfIdlelined(aconf))
740	–	{
741	–	SetIdlelined(source_p);
742	–	sendto_one(source_p,
743	–	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
744	–	me.name, source_p->name);
625		}
626	<
747	<	if (IsConfCanFlood(aconf))
626	>	else
627		{
628	<	SetCanFlood(source_p);
629	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
630	<	"protection, aren't you fearsome.",
752	<	me.name, source_p->name);
628	>	while (*++p)
629	>	if (!IsUserChar(*p))
630	>	return 0;
631		}
754	–	}
632
633	<	/* change_simple_umode()
757	<	*
758	<	* this callback can be hooked to allow special handling of
759	<	* certain usermodes
760	<	*/
761	<	static void *
762	<	change_simple_umode(va_list args)
763	<	{
764	<	struct Client *client_p;
765	<	struct Client *source_p;
766	<	int what;
767	<	unsigned int flag;
768	<
769	<	client_p = va_arg(args, struct Client *);
770	<	source_p = va_arg(args, struct Client *);
771	<	what = va_arg(args, int);
772	<	flag = va_arg(args, unsigned int);
773	<
774	<	if (what == MODE_ADD)
775	<	source_p->umodes |= flag;
776	<	else
777	<	source_p->umodes &= ~flag;
778	<
779	<	return NULL;
633	>	return p - username <= USERLEN;
634		}
635
636	<	/* set_user_mode()
636	>	/* clean_nick_name()
637		*
638	<	* added 15/10/91 By Darren Reed.
639	<	* parv[0] - sender
640	<	* parv[1] - username to change mode for
641	<	* parv[2] - modes to change
638	>	* input        - nickname
639	>	*              - whether it's a local nick (1) or remote (0)
640	>	* output       - none
641	>	* side effects - walks through the nickname, returning 0 if erroneous
642		*/
643	<	void
644	<	set_user_mode(struct Client *client_p, struct Client *source_p,
791	<	int parc, char *parv[])
643	>	int
644	>	valid_nickname(const char *nickname, const int local)
645		{
646	<	unsigned int flag, setflags;
794	<	char **p, *m, buf[IRCD_BUFSIZE];
795	<	struct Client *target_p;
796	<	int what = MODE_ADD, badflag = 0, i;
797	<
798	<	assert(!(parc < 2));
799	<
800	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
801	<	{
802	<	if (MyConnect(source_p))
803	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
804	<	me.name, source_p->name, parv[1]);
805	<	return;
806	<	}
807	<
808	<	if (IsServer(source_p))
809	<	{
810	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
811	<	parv[1], source_p->name);
812	<	return;
813	<	}
814	<
815	<	if (source_p != target_p)
816	<	{
817	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
818	<	me.name, source_p->name);
819	<	return;
820	<	}
821	<
822	<	if (parc < 3)
823	<	{
824	<	m = buf;
825	<	*m++ = '+';
826	<
827	<	for (i = 0; i < 128; i++)
828	<	if (source_p->umodes & user_modes[i])
829	<	*m++ = (char)i;
830	<	*m = '\0';
831	<
832	<	sendto_one(source_p, form_str(RPL_UMODEIS),
833	<	me.name, source_p->name, buf);
834	<	return;
835	<	}
836	<
837	<	execute_callback(entering_umode_cb, client_p, source_p);
646	>	const char *p = nickname;
647
648	<	/* find flags already set for user */
840	<	setflags = source_p->umodes;
841	<
842	<	/* parse mode change string(s) */
843	<	for (p = &parv[2]; p && *p; p++)
844	<	{
845	<	for (m = *p; *m; m++)
846	<	{
847	<	switch (*m)
848	<	{
849	<	case '+':
850	<	what = MODE_ADD;
851	<	break;
852	<	case '-':
853	<	what = MODE_DEL;
854	<	break;
855	<	case 'o':
856	<	if (what == MODE_ADD)
857	<	{
858	<	if (IsServer(client_p) && !IsOper(source_p))
859	<	{
860	<	++Count.oper;
861	<	SetOper(source_p);
862	<	}
863	<	}
864	<	else
865	<	{
866	<	/* Only decrement the oper counts if an oper to begin with
867	<	* found by Pat Szuta, Perly , perly@xnet.com
868	<	*/
869	<	if (!IsOper(source_p))
870	<	break;
871	<
872	<	ClearOper(source_p);
873	<	Count.oper--;
874	<
875	<	if (MyConnect(source_p))
876	<	{
877	<	dlink_node *dm;
878	<
879	<	detach_conf(source_p, OPER_TYPE);
880	<	ClearOperFlags(source_p);
881	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
882	<
883	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
884	<	free_dlink_node(dm);
885	<	}
886	<	}
887	<
888	<	break;
889	<
890	<	/* we may not get these,
891	<	* but they shouldnt be in default
892	<	*/
893	<	case ' ' :
894	<	case '\n':
895	<	case '\r':
896	<	case '\t':
897	<	break;
898	<
899	<	default:
900	<	if ((flag = user_modes[(unsigned char)*m]))
901	<	{
902	<	if (MyConnect(source_p) && !IsOper(source_p) &&
903	<	(ConfigFileEntry.oper_only_umodes & flag))
904	<	{
905	<	badflag = 1;
906	<	}
907	<	else
908	<	execute_callback(umode_cb, client_p, source_p, what, flag);
909	<	}
910	<	else
911	<	{
912	<	if (MyConnect(source_p))
913	<	badflag = 1;
914	<	}
915	<
916	<	break;
917	<	}
918	<	}
919	<	}
920	<
921	<	if (badflag)
922	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
923	<	me.name, source_p->name);
924	<
925	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
926	<	{
927	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
928	<	me.name, source_p->name);
929	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
930	<	}
931	<
932	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
933	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
934	<	{
935	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
936	<	me.name, source_p->name);
937	<	source_p->umodes &= ~UMODE_ADMIN;
938	<	}
939	<
940	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
941	<	++Count.invisi;
942	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
943	<	--Count.invisi;
648	>	assert(p);
649
650		/*
651	<	* compare new flags with old flags and send string which
947	<	* will cause servers to update correctly.
651	>	* Nicks can't start with a digit or - or be 0 length.
652		*/
653	<	send_umode_out(client_p, source_p, setflags);
653	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
654	>	return 0;
655	>
656	>	for (; *p; ++p)
657	>	if (!IsNickChar(*p))
658	>	return 0;
659	>
660	>	return p - nickname <= NICKLEN;
661		}
662
663		/* send_umode()
#	Line 956 | Line 667 | set_user_mode(struct Client *client_p, s
667		* inputs       - client_p
668		*              - source_p
669		*              - int old
959	–	*              - sendmask mask of modes to send
670		*              - suplied umode_buf
671		* output       - NONE
672		*/
673		void
674		send_umode(struct Client *client_p, struct Client *source_p,
675	<	unsigned int old, unsigned int sendmask, char *umode_buf)
675	>	unsigned int old, char *umode_buf)
676		{
677		char *m = umode_buf;
678		int what = 0;
969	–	unsigned int i;
970	–	unsigned int flag;
679
680		/*
681	<	* build a string in umode_buf to represent the change in the user's
681	>	* Build a string in umode_buf to represent the change in the user's
682		* mode between the new (source_p->umodes) and 'old'.
683		*/
684	<	for (i = 0; i < 128; i++)
684	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
685		{
686	<	flag = user_modes[i];
979	<	if (!flag)
980	<	continue;
981	<
982	<	if (MyClient(source_p) && !(flag & sendmask))
983	<	continue;
984	<
985	<	if ((flag & old) && !(source_p->umodes & flag))
686	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
687		{
688		if (what == MODE_DEL)
689	<	*m++ = (char)i;
689	>	*m++ = tab->c;
690		else
691		{
692		what = MODE_DEL;
693		*m++ = '-';
694	<	*m++ = (char)i;
694	>	*m++ = tab->c;
695		}
696		}
697	<	else if (!(flag & old) && (source_p->umodes & flag))
697	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
698		{
699		if (what == MODE_ADD)
700	<	*m++ = (char)i;
700	>	*m++ = tab->c;
701		else
702		{
703		what = MODE_ADD;
704		*m++ = '+';
705	<	*m++ = (char)i;
705	>	*m++ = tab->c;
706		}
707		}
708		}
#	Line 1010 | Line 711 | send_umode(struct Client *client_p, stru
711
712		if (*umode_buf && client_p)
713		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
714	<	source_p->name, source_p->username,
715	<	source_p->host, source_p->name, umode_buf);
714	>	client_p->name, client_p->username,
715	>	client_p->host, client_p->name, umode_buf);
716		}
717
718		/* send_umode_out()
#	Line 1021 | Line 722 | send_umode(struct Client *client_p, stru
722		* side effects - Only send ubuf out to servers that know about this client
723		*/
724		void
725	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1025	<	unsigned int old)
725	>	send_umode_out(struct Client *source_p, unsigned int old)
726		{
727	<	char buf[IRCD_BUFSIZE] = { '\0' };
1028	<	dlink_node *ptr = NULL;
727	>	char buf[IRCD_BUFSIZE] = "";
728
729	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1031	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
729	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
730
731		if (buf[0])
732	<	{
733	<	DLINK_FOREACH(ptr, serv_list.head)
1036	<	{
1037	<	struct Client *target_p = ptr->data;
1038	<
1039	<	if ((target_p != client_p) && (target_p != source_p))
1040	<	sendto_one(target_p, ":%s MODE %s :%s",
1041	<	ID_or_name(source_p, target_p),
1042	<	ID_or_name(source_p, target_p), buf);
1043	<	}
1044	<	}
1045	<
1046	<	if (client_p && MyClient(client_p))
1047	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
732	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
733	>	source_p->id, source_p->id, buf);
734		}
735
1050	–	/* user_welcome()
1051	–	*
1052	–	* inputs       - client pointer to client to welcome
1053	–	* output       - NONE
1054	–	* side effects -
1055	–	*/
1056	–	static void
1057	–	user_welcome(struct Client *source_p)
1058	–	{
1059	–	#if defined(__TIME__) && defined(__DATE__)
1060	–	static const char built_date[] = __DATE__ " at " __TIME__;
1061	–	#else
1062	–	static const char built_date[] = "unknown";
1063	–	#endif
1064	–
1065	–	#ifdef HAVE_LIBCRYPTO
1066	–	if (source_p->localClient->fd.ssl != NULL)
1067	–	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1068	–	me.name, source_p->name,
1069	–	ssl_get_cipher(source_p->localClient->fd.ssl));
1070	–	#endif
1071	–
1072	–	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1073	–	ServerInfo.network_name, source_p->name);
1074	–	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1075	–	get_listener_name(source_p->localClient->listener), ircd_version);
1076	–	sendto_one(source_p, form_str(RPL_CREATED),
1077	–	me.name, source_p->name, built_date);
1078	–	sendto_one(source_p, form_str(RPL_MYINFO),
1079	–	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1080	–	show_isupport(source_p);
1081	–
1082	–	if (source_p->id[0] != '\0')
1083	–	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1084	–	source_p->name, source_p->id);
1085	–
1086	–	show_lusers(source_p);
1087	–
1088	–	if (ConfigFileEntry.short_motd)
1089	–	{
1090	–	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1091	–	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1092	–	sendto_one(source_p,
1093	–	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1094	–	"read it", me.name, source_p->name);
1095	–	sendto_one(source_p, form_str(RPL_MOTDSTART),
1096	–	me.name, source_p->name, me.name);
1097	–	sendto_one(source_p, form_str(RPL_MOTD),
1098	–	me.name, source_p->name,
1099	–	"*** This is the short motd ***");
1100	–	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1101	–	me.name, source_p->name);
1102	–	}
1103	–	else
1104	–	send_message_file(source_p, &ConfigFileEntry.motd);
1105	–	}
1106	–
1107	–	/* check_xline()
1108	–	*
1109	–	* inputs       - pointer to client to test
1110	–	* outupt       - 1 if exiting 0 if ok
1111	–	* side effects -
1112	–	*/
1113	–	static int
1114	–	check_xline(struct Client *source_p)
1115	–	{
1116	–	struct ConfItem *conf = NULL;
1117	–	const char *reason = NULL;
1118	–
1119	–	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1120	–	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1121	–	{
1122	–	struct MatchItem *reg = map_to_conf(conf);
1123	–
1124	–	++reg->count;
1125	–
1126	–	if (reg->reason != NULL)
1127	–	reason = reg->reason;
1128	–	else
1129	–	reason = "No Reason";
1130	–
1131	–	sendto_realops_flags(UMODE_REJ, L_ALL,
1132	–	"X-line Rejecting [%s] [%s], user %s [%s]",
1133	–	source_p->info, reason,
1134	–	get_client_name(source_p, HIDE_IP),
1135	–	source_p->sockhost);
1136	–
1137	–	++ServerStats.is_ref;
1138	–	if (REJECT_HOLD_TIME > 0)
1139	–	{
1140	–	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1141	–	me.name, source_p->name);
1142	–	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1143	–	SetCaptured(source_p);
1144	–	}
1145	–	else
1146	–	exit_client(source_p, &me, "Bad user info");
1147	–	return 1;
1148	–	}
1149	–
1150	–	return 0;
1151	–	}
1152	–
1153	–	/* oper_up()
1154	–	*
1155	–	* inputs       - pointer to given client to oper
1156	–	* output       - NONE
1157	–	* side effects - Blindly opers up given source_p, using aconf info
1158	–	*                all checks on passwords have already been done.
1159	–	*                This could also be used by rsa oper routines.
1160	–	*/
736		void
737	<	oper_up(struct Client *source_p)
737	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
738		{
739	<	unsigned int old = source_p->umodes;
1165	<	const char *operprivs = "";
1166	<	const struct AccessItem *oconf = NULL;
1167	<
1168	<	assert(source_p->localClient->confs.head);
1169	<	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1170	<
1171	<	++Count.oper;
1172	<	SetOper(source_p);
1173	<
1174	<	if (oconf->modes)
1175	<	source_p->umodes |= oconf->modes;
1176	<	else if (ConfigFileEntry.oper_umodes)
1177	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1178	<	else
1179	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1180	<	UMODE_WALLOP|UMODE_LOCOPS);
1181	<
1182	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1183	<	++Count.invisi;
1184	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1185	<	--Count.invisi;
1186	<
1187	<	assert(dlinkFind(&oper_list, source_p) == NULL);
1188	<	dlinkAdd(source_p, make_dlink_node(), &oper_list);
1189	<
1190	<	operprivs = oper_privs_as_string(oconf->port);
1191	<
1192	<	SetOFlag(source_p, oconf->port);
1193	<
1194	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1195	<	source_p->umodes |= UMODE_ADMIN;
1196	<	if (!IsOperN(source_p))
1197	<	source_p->umodes &= ~UMODE_NCHANGE;
1198	<
1199	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1200	<	source_p->name, source_p->username, source_p->host);
1201	<	send_umode_out(source_p, source_p, old);
1202	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1203	<	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1204	<	me.name, source_p->name, operprivs);
1205	<	send_message_file(source_p, &ConfigFileEntry.opermotd);
1206	<	}
1207	<
1208	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1209	<
1210	<	int
1211	<	valid_sid(const char *sid)
1212	<	{
1213	<	if (strlen(sid) == IRC_MAXSID)
1214	<	if (IsDigit(*sid))
1215	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1216	<	return 1;
1217	<
1218	<	return 0;
1219	<	}
1220	<
1221	<	/*
1222	<	* init_uid()
1223	<	*
1224	<	* inputs       - NONE
1225	<	* output       - NONE
1226	<	* side effects - new_uid is filled in with server id portion (sid)
1227	<	*                (first 3 bytes) or defaulted to 'A'.
1228	<	*                Rest is filled in with 'A'
1229	<	*/
1230	<	void
1231	<	init_uid(void)
1232	<	{
1233	<	int i;
1234	<
1235	<	memset(new_uid, 0, sizeof(new_uid));
739	>	dlink_node *node = NULL;
740
741	<	if (!EmptyString(ServerInfo.sid))
742	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1239	<
1240	<	for (i = 0; i < IRC_MAXSID; ++i)
1241	<	if (new_uid[i] == '\0')
1242	<	new_uid[i] = 'A';
1243	<
1244	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1245	<	/* Yes nenolod, I have known it was off by one ever since I wrote it
1246	<	* But *JUST* for you, though, it really doesn't look as *pretty*
1247	<	* -Dianora
1248	<	*/
1249	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1250	<
1251	<	entering_umode_cb = register_callback("entering_umode", NULL);
1252	<	umode_cb = register_callback("changing_umode", change_simple_umode);
1253	<	}
741	>	if (!strcmp(target_p->host, hostname))
742	>	return;
743
744	<	/*
1256	<	* add_one_to_uid
1257	<	*
1258	<	* inputs       - index number into new_uid
1259	<	* output       - NONE
1260	<	* side effects - new_uid is incremented by one
1261	<	*                note this is a recursive function
1262	<	*/
1263	<	static void
1264	<	add_one_to_uid(int i)
1265	<	{
1266	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
744	>	switch (what)
745		{
746	<	if (new_uid[i] == 'Z')
747	<	new_uid[i] = '0';
748	<	else if (new_uid[i] == '9')
749	<	{
750	<	new_uid[i] = 'A';
751	<	add_one_to_uid(i-1);
752	<	}
1275	<	else
1276	<	++new_uid[i];
1277	<	}
1278	<	else
1279	<	{
1280	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1281	<	if (new_uid[i] == 'Z')
1282	<	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1283	<	else
1284	<	++new_uid[i];
746	>	case MODE_ADD:
747	>	AddUMode(target_p, UMODE_HIDDENHOST);
748	>	break;
749	>	case MODE_DEL:
750	>	DelUMode(target_p, UMODE_HIDDENHOST);
751	>	break;
752	>	default: return;
753		}
1286	–	}
754
755	<	/*
756	<	* uid_get
757	<	*
1291	<	* inputs       - struct Client *
1292	<	* output       - new UID is returned to caller
1293	<	* side effects - new_uid is incremented by one.
1294	<	*/
1295	<	static const char *
1296	<	uid_get(void)
1297	<	{
1298	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1299	<	return new_uid;
1300	<	}
755	>	if (ConfigGeneral.cycle_on_host_change)
756	>	sendto_common_channels_local(target_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
757	>	target_p->name, target_p->username, target_p->host);
758
759	<	/*
760	<	* init_isupport()
761	<	*
1305	<	* input        - NONE
1306	<	* output       - NONE
1307	<	* side effects - Must be called before isupport is enabled
1308	<	*/
1309	<	void
1310	<	init_isupport(void)
1311	<	{
1312	<	isupportFile = init_MessageLine();
759	>	sendto_common_channels_local(target_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
760	>	target_p->name, target_p->username,
761	>	target_p->host, target_p->username, hostname);
762
763	<	add_isupport("CALLERID", NULL, -1);
764	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1316	<	add_isupport("DEAF", "D", -1);
1317	<	add_isupport("KICKLEN", NULL, KICKLEN);
1318	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
1319	<	add_isupport("NICKLEN", NULL, NICKLEN-1);
1320	<	#ifdef HALFOPS
1321	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1322	<	add_isupport("STATUSMSG", "@%+", -1);
1323	<	#else
1324	<	add_isupport("PREFIX", "(ov)@+", -1);
1325	<	add_isupport("STATUSMSG", "@+", -1);
1326	<	#endif
1327	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1328	<	}
763	>	if (HasFlag(target_p, FLAGS_USERHOST))
764	>	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
765
766	<	/*
1331	<	* add_isupport()
1332	<	*
1333	<	* input        - name of supported function
1334	<	*              - options if any
1335	<	*              - number if any
1336	<	* output       - NONE
1337	<	* side effects - Each supported item must call this when activated
1338	<	*/
1339	<	void
1340	<	add_isupport(const char *name, const char *options, int n)
1341	<	{
1342	<	dlink_node *ptr;
1343	<	struct Isupport *support;
766	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
767
768	<	DLINK_FOREACH(ptr, support_list.head)
769	<	{
1347	<	support = ptr->data;
1348	<	if (irccmp(support->name, name) == 0)
1349	<	{
1350	<	MyFree(support->name);
1351	<	MyFree(support->options);
1352	<	break;
1353	<	}
1354	<	}
768	>	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
769	>	AddFlag(target_p, FLAGS_USERHOST);
770
771	<	if (ptr == NULL)
771	>	if (MyConnect(target_p))
772		{
773	<	support = MyMalloc(sizeof(*support));
774	<	dlinkAddTail(support, &support->node, &support_list);
773	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
774	>	clear_ban_cache_client(target_p);
775		}
776
777	<	DupString(support->name, name);
778	<	if (options != NULL)
1364	<	DupString(support->options, options);
1365	<	support->number = n;
1366	<
1367	<	rebuild_isupport_message_line();
1368	<	}
1369	<
1370	<	/*
1371	<	* delete_isupport()
1372	<	*
1373	<	* input        - name of supported function
1374	<	* output       - NONE
1375	<	* side effects - Each supported item must call this when deactivated
1376	<	*/
1377	<	void
1378	<	delete_isupport(const char *name)
1379	<	{
1380	<	dlink_node *ptr;
1381	<	struct Isupport *support;
777	>	if (!ConfigGeneral.cycle_on_host_change)
778	>	return;
779
780	<	DLINK_FOREACH(ptr, support_list.head)
780	>	DLINK_FOREACH(node, target_p->channel.head)
781		{
782	<	support = ptr->data;
783	<	if (irccmp(support->name, name) == 0)
782	>	char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
783	>	char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
784	>	char *p = modebuf;
785	>	int len = 0;
786	>	const struct Membership *member = node->data;
787	>
788	>	if (has_member_flags(member, CHFL_CHANOP))
789		{
790	<	dlinkDelete(ptr, &support_list);
791	<	MyFree(support->name);
1390	<	MyFree(support->options);
1391	<	MyFree(support);
1392	<	break;
790	>	*p++ = 'o';
791	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
792		}
1394	–	}
1395	–
1396	–	rebuild_isupport_message_line();
1397	–	}
1398	–
1399	–	/*
1400	–	* rebuild_isupport_message_line
1401	–	*
1402	–	* input        - NONE
1403	–	* output       - NONE
1404	–	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1405	–	*/
1406	–	void
1407	–	rebuild_isupport_message_line(void)
1408	–	{
1409	–	char isupportbuffer[IRCD_BUFSIZE];
1410	–	char *p = isupportbuffer;
1411	–	dlink_node *ptr = NULL;
1412	–	int n = 0;
1413	–	int tokens = 0;
1414	–	size_t len = 0;
1415	–	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1416	–
1417	–	destroy_MessageLine(isupportFile);
1418	–
1419	–	DLINK_FOREACH(ptr, support_list.head)
1420	–	{
1421	–	struct Isupport *support = ptr->data;
793
794	<	p += (n = ircsprintf(p, "%s", support->name));
1424	<	len += n;
1425	<
1426	<	if (support->options != NULL)
794	>	if (has_member_flags(member, CHFL_HALFOP))
795		{
796	<	p += (n = ircsprintf(p, "=%s", support->options));
797	<	len += n;
796	>	*p++ = 'h';
797	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
798		}
799
800	<	if (support->number > 0)
800	>	if (has_member_flags(member, CHFL_VOICE))
801		{
802	<	p += (n = ircsprintf(p, "=%d", support->number));
803	<	len += n;
802	>	*p++ = 'v';
803	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
804		}
805
1438	–	*p++ = ' ';
1439	–	len++;
806		*p = '\0';
807
808	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
809	<	{ /* arbritrary for now */
810	<	if (*--p == ' ')
811	<	*p = '\0';
812	<
813	<	addto_MessageLine(isupportFile, isupportbuffer);
814	<	p = isupportbuffer;
815	<	len = 0;
816	<	n = tokens = 0;
817	<	}
818	<	}
819	<
820	<	if (len != 0)
821	<	{
822	<	if (*--p == ' ')
823	<	*p = '\0';
824	<	addto_MessageLine(isupportFile, isupportbuffer);
825	<	}
808	>	sendto_channel_local(target_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
809	>	target_p->name, target_p->username,
810	>	target_p->host, member->chptr->name,
811	>	target_p->account, target_p->info);
812	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
813	>	target_p->name, target_p->username,
814	>	target_p->host, member->chptr->name);
815	>
816	>	if (nickbuf[0])
817	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
818	>	target_p->servptr->name, member->chptr->name,
819	>	modebuf, nickbuf);
820	>	}
821	>
822	>	if (target_p->away[0])
823	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
824	>	":%s!%s@%s AWAY :%s",
825	>	target_p->name, target_p->username,
826	>	target_p->host, target_p->away);
827		}

Diff Legend

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