ViewVC Help

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

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

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

Diff Legend

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