ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_user.c (file contents), Revision 889 by michael, Thu Nov 1 12:59:05 2007 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2289 by michael, Wed Jun 19 10:32:20 2013 UTC

#	Line 23 | Line 23
23		*/
24
25		#include "stdinc.h"
26	<	#include "tools.h"
26	>	#include "list.h"
27		#include "s_user.h"
28		#include "s_misc.h"
29		#include "channel.h"
30		#include "channel_mode.h"
31		#include "client.h"
32	–	#include "common.h"
32		#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
35		#include "s_bsd.h"
38	–	#include "irc_getnameinfo.h"
36		#include "ircd.h"
40	–	#include "list.h"
37		#include "listener.h"
38		#include "motd.h"
39		#include "numeric.h"
40	<	#include "s_conf.h"
41	<	#include "s_log.h"
40	>	#include "conf.h"
41	>	#include "log.h"
42		#include "s_serv.h"
47	–	#include "s_stats.h"
43		#include "send.h"
44		#include "supported.h"
45		#include "whowas.h"
46		#include "memory.h"
47		#include "packet.h"
48	+	#include "rng_mt.h"
49		#include "userhost.h"
50		#include "hook.h"
51		#include "s_misc.h"
52	<	#include "msg.h"
57	<	#include "pcre.h"
52	>	#include "parse.h"
53		#include "watch.h"
54
60	–	int MaxClientCount     = 1;
61	–	int MaxConnectionCount = 1;
62	–	struct Callback *entering_umode_cb = NULL;
63	–	struct Callback *umode_cb = NULL;
64	–	struct Callback *uid_get_cb = NULL;
65	–
55		static char umode_buffer[IRCD_BUFSIZE];
56
57		static void user_welcome(struct Client *);
58	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
58	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
59		static int check_xline(struct Client *);
60	<	static void introduce_client(struct Client *, struct Client *);
61	<	static void *uid_get(va_list);
60	>	static void introduce_client(struct Client *);
61	>	static const char *uid_get(void);
62
63		/* Used for building up the isupport string,
64		* used with init_isupport, add_isupport, delete_isupport
#	Line 83 | Line 72 | struct Isupport
72		int number;
73		};
74
75	<	static dlink_list support_list = { NULL, NULL, 0 };
76	<	MessageFile *isupportFile;
75	>	static dlink_list support_list;
76	>	static dlink_list support_list_lines;
77
78		/* memory is cheap. map 0-255 to equivalent mode */
79	<	unsigned int user_modes[256] =
79	>	const unsigned int user_modes[256] =
80		{
81		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
82		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 96 | Line 85 | unsigned int user_modes[256] =
85		0,                  /* @ */
86		0,                  /* A */
87		0,                  /* B */
88	<	UMODE_CCONN_FULL,   /* C */
88	>	0,                  /* C */
89		UMODE_DEAF,         /* D */
90		0,                  /* E */
91	<	0,                  /* F */
91	>	UMODE_FARCONNECT,   /* F */
92		UMODE_SOFTCALLERID, /* G */
93	<	0,                  /* H */
93	>	UMODE_HIDDEN,       /* H */
94		0,                  /* I */
95		0,                  /* J */
96		0,                  /* K */
#	Line 111 | Line 100 | unsigned int user_modes[256] =
100		0,                  /* O */
101		0,                  /* P */
102		0,                  /* Q */
103	<	0,                  /* R */
104	<	0,                  /* S */
103	>	UMODE_REGONLY,      /* R */
104	>	UMODE_SSL,          /* S */
105		0,                  /* T */
106		0,                  /* U */
107		0,                  /* V */
#	Line 126 | Line 115 | unsigned int user_modes[256] =
115		UMODE_BOTS,         /* b */
116		UMODE_CCONN,        /* c */
117		UMODE_DEBUG,        /* d */
118	<	0,                  /* e */
118	>	UMODE_EXTERNAL,     /* e */
119		UMODE_FULL,         /* f */
120		UMODE_CALLERID,     /* g */
121		0,                  /* h */
122		UMODE_INVISIBLE,    /* i */
123	<	0,                  /* j */
123	>	UMODE_REJ,          /* j */
124		UMODE_SKILL,        /* k */
125		UMODE_LOCOPS,       /* l */
126		0,                  /* m */
#	Line 139 | Line 128 | unsigned int user_modes[256] =
128		UMODE_OPER,         /* o */
129		0,                  /* p */
130		0,                  /* q */
131	<	UMODE_REJ,          /* r */
131	>	UMODE_REGISTERED,   /* r */
132		UMODE_SERVNOTICE,   /* s */
133		0,                  /* t */
134		UMODE_UNAUTH,       /* u */
135		0,                  /* v */
136		UMODE_WALLOP,       /* w */
137	<	UMODE_EXTERNAL,     /* x */
137	>	UMODE_HIDDENHOST,   /* x */
138		UMODE_SPY,          /* y */
139		UMODE_OPERWALL,     /* z      0x7A */
140		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 166 | Line 155 | assemble_umode_buffer(void)
155		unsigned int idx = 0;
156		char *umode_buffer_ptr = umode_buffer;
157
158	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
158	>	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
159		if (user_modes[idx])
160		*umode_buffer_ptr++ = idx;
161
#	Line 195 | Line 184 | show_lusers(struct Client *source_p)
184		to = source_p->name;
185		}
186
187	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
187	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
188		sendto_one(source_p, form_str(RPL_LUSERCLIENT),
189		from, to, (Count.total-Count.invisi),
190		Count.invisi, dlink_list_length(&global_serv_list));
#	Line 215 | Line 204 | show_lusers(struct Client *source_p)
204		sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
205		from, to, dlink_list_length(&global_channel_list));
206
207	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
207	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
208		{
209		sendto_one(source_p, form_str(RPL_LUSERME),
210		from, to, Count.local, Count.myserver);
211		sendto_one(source_p, form_str(RPL_LOCALUSERS),
212	<	from, to, Count.local, Count.max_loc,
224	<	Count.local, Count.max_loc);
212	>	from, to, Count.local, Count.max_loc);
213		}
214		else
215		{
216		sendto_one(source_p, form_str(RPL_LUSERME),
217		from, to, Count.total, 0);
218		sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.total, Count.max_tot,
232	<	Count.total, Count.max_tot);
219	>	from, to, Count.total, Count.max_tot);
220		}
221
222		sendto_one(source_p, form_str(RPL_GLOBALUSERS),
223	<	from, to, Count.total, Count.max_tot,
237	<	Count.total, Count.max_tot);
223	>	from, to, Count.total, Count.max_tot);
224
225	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
225	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
226		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
227	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
227	>	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
228
229	<	if (Count.local > MaxClientCount)
230	<	MaxClientCount = Count.local;
229	>	if (Count.local > Count.max_loc_cli)
230	>	Count.max_loc_cli = Count.local;
231
232	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
233	<	MaxConnectionCount = Count.local + Count.myserver;
232	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
233	>	Count.max_loc_con = Count.local + Count.myserver;
234		}
235
236		/* show_isupport()
#	Line 256 | Line 242 | show_lusers(struct Client *source_p)
242		void
243		show_isupport(struct Client *source_p)
244		{
245	<	send_message_file(source_p, isupportFile);
245	>	const dlink_node *ptr = NULL;
246	>
247	>	DLINK_FOREACH(ptr, support_list_lines.head)
248	>	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
249	>	source_p->name, ptr->data);
250		}
251
252		/*
#	Line 283 | Line 273 | show_isupport(struct Client *source_p)
273		**         nick from local user or kill him/her...
274		*/
275		void
276	<	register_local_user(struct Client *client_p, struct Client *source_p,
287	<	const char *nick, const char *username)
276	>	register_local_user(struct Client *source_p)
277		{
278	<	const struct AccessItem *aconf = NULL;
279	<	char ipaddr[HOSTIPLEN];
291	<	dlink_node *ptr = NULL;
292	<	dlink_node *m = NULL;
278	>	const char *id = NULL;
279	>	const struct MaskItem *conf = NULL;
280
281		assert(source_p != NULL);
282	+	assert(source_p == source_p->from);
283		assert(MyConnect(source_p));
296	–	assert(source_p->username != username);
284		assert(!source_p->localClient->registration);
285
286	<	ClearCap(client_p, CAP_TS6);
286	>	ClearCap(source_p, CAP_TS6);
287
288		if (ConfigFileEntry.ping_cookie)
289		{
290	<	if (!IsPingSent(source_p) &&
304	<	source_p->localClient->random_ping == 0)
290	>	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
291		{
292	<	source_p->localClient->random_ping = (unsigned long)rand();
293	<	sendto_one(source_p, "PING :%lu",
292	>	do
293	>	source_p->localClient->random_ping = genrand_int32();
294	>	while (!source_p->localClient->random_ping);
295	>
296	>	sendto_one(source_p, "PING :%u",
297		source_p->localClient->random_ping);
298		SetPingSent(source_p);
299		return;
#	Line 314 | Line 303 | register_local_user(struct Client *clien
303		return;
304		}
305
306	<	source_p->localClient->last = CurrentTime;
306	>	source_p->localClient->last_privmsg = CurrentTime;
307		/* Straight up the maximum rate of flooding... */
308		source_p->localClient->allow_read = MAX_FLOOD_BURST;
309
310	<	if (!execute_callback(client_check_cb, source_p, username))
310	>	if (!check_client(source_p))
311		return;
312
313		if (valid_hostname(source_p->host) == 0)
#	Line 329 | Line 318 | register_local_user(struct Client *clien
318		sizeof(source_p->host));
319		}
320
321	<	ptr   = source_p->localClient->confs.head;
333	<	aconf = map_to_conf(ptr->data);
321	>	conf = source_p->localClient->confs.head->data;
322
323		if (!IsGotId(source_p))
324		{
325	<	const char *p = NULL;
325	>	char username[USERLEN + 1];
326	>	const char *p = username;
327		unsigned int i = 0;
328
329	<	if (IsNeedIdentd(aconf))
329	>	if (IsNeedIdentd(conf))
330		{
331	<	ServerStats->is_ref++;
331	>	++ServerStats.is_ref;
332		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
333		"identd to use this server", me.name, source_p->name);
334		exit_client(source_p, &me, "Install identd");
335		return;
336		}
337
338	<	p = username;
338	>	strlcpy(username, source_p->username, sizeof(username));
339
340	<	if (!IsNoTilde(aconf))
340	>	if (!IsNoTilde(conf))
341		source_p->username[i++] = '~';
342
343	<	while (*p && i < USERLEN)
355	<	{
343	>	for (; *p && i < USERLEN; ++p)
344		if (*p != '[')
345		source_p->username[i++] = *p;
358	–	p++;
359	–	}
346
347		source_p->username[i] = '\0';
348		}
349
350		/* password check */
351	<	if (!EmptyString(aconf->passwd))
351	>	if (!EmptyString(conf->passwd))
352		{
353		const char *pass = source_p->localClient->passwd;
354
355	<	if (!match_conf_password(pass, aconf))
355	>	if (!match_conf_password(pass, conf))
356		{
357	<	ServerStats->is_ref++;
357	>	++ServerStats.is_ref;
358		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
359		me.name, source_p->name);
360		exit_client(source_p, &me, "Bad Password");
#	Line 382 | Line 368 | register_local_user(struct Client *clien
368		*/
369
370		/* report if user has &^>= etc. and set flags as needed in source_p */
371	<	report_and_set_user_flags(source_p, aconf);
371	>	report_and_set_user_flags(source_p, conf);
372	>
373	>	if (IsDead(source_p))
374	>	return;
375
376		/* Limit clients -
377		* We want to be able to have servers and F-line clients
#	Line 395 | Line 384 | register_local_user(struct Client *clien
384		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
386		{
387	<	sendto_realops_flags(UMODE_FULL, L_ALL,
387	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
388		"Too many clients, rejecting %s[%s].",
389	<	nick, source_p->host);
390	<	ServerStats->is_ref++;
389	>	source_p->name, source_p->host);
390	>	++ServerStats.is_ref;
391		exit_client(source_p, &me, "Sorry, server is full - try later");
392		return;
393		}
394
395		/* valid user name check */
396	<	if (valid_username(source_p->username) == 0)
396	>	if (valid_username(source_p->username, 1) == 0)
397		{
398		char tmpstr2[IRCD_BUFSIZE];
399
400	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
401	<	nick, source_p->username, source_p->host);
402	<	ServerStats->is_ref++;
403	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
400	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
401	>	"Invalid username: %s (%s@%s)",
402	>	source_p->name, source_p->username, source_p->host);
403	>	++ServerStats.is_ref;
404	>	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
405	>	source_p->username);
406		exit_client(source_p, &me, tmpstr2);
407		return;
408		}
409
419	–	assert(source_p == client_p);
420	–
410		if (check_xline(source_p))
411		return;
412
413	<	if (IsDead(client_p))
414	<	return;
426	<
427	<	if (me.id[0])
428	<	{
429	<	const char *id = execute_callback(uid_get_cb, source_p);
430	<
431	<	while (hash_find_id(id) != NULL)
432	<	id = uid_get(NULL);
433	<
434	<	strlcpy(source_p->id, id, sizeof(source_p->id));
435	<	hash_add_id(source_p);
436	<	}
413	>	while (hash_find_id((id = uid_get())) != NULL)
414	>	;
415
416	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
417	<	source_p->localClient->ip.ss_len, ipaddr,
440	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
416	>	strlcpy(source_p->id, id, sizeof(source_p->id));
417	>	hash_add_id(source_p);
418
419	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
420	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
421	<	nick, source_p->username, source_p->host,
419	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
420	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
421	>	source_p->name, source_p->username, source_p->host,
422		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
423	<	"255.255.255.255" : ipaddr, get_client_class(source_p),
424	<	source_p->info);
425	<
449	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
450	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
451	<	nick, source_p->username, source_p->host,
452	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
453	<	"255.255.255.255" : ipaddr,
454	<	get_client_class(source_p),
455	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
456	<	"<hidden>" : source_p->client_host,
457	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
458	<	"<hidden>" : source_p->client_server,
459	<	source_p->info);
460	<
461	<
462	<	/* If they have died in send_* don't do anything. */
463	<	if (IsDead(source_p))
464	<	return;
423	>	"255.255.255.255" : source_p->sockhost,
424	>	get_client_class(&source_p->localClient->confs),
425	>	source_p->info, source_p->id);
426
427		if (ConfigFileEntry.invisible_on_connect)
428		{
429	<	source_p->umodes |= UMODE_INVISIBLE;
430	<	Count.invisi++;
429	>	AddUMode(source_p, UMODE_INVISIBLE);
430	>	++Count.invisi;
431		}
432
433		if ((++Count.local) > Count.max_loc)
#	Line 474 | Line 435 | register_local_user(struct Client *clien
435		Count.max_loc = Count.local;
436
437		if (!(Count.max_loc % 10))
438	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
438	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
439	>	"New Max Local Clients: %d",
440		Count.max_loc);
441		}
442
481	–	SetClient(source_p);
482	–
483	–	source_p->servptr = &me;
484	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
485	–
443		/* Increment our total user count here */
444		if (++Count.total > Count.max_tot)
445		Count.max_tot = Count.total;
446	<	Count.totalrestartcount++;
446	>	++Count.totalrestartcount;
447	>
448	>	assert(source_p->servptr == &me);
449	>	SetClient(source_p);
450	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
451
452		source_p->localClient->allow_read = MAX_FLOOD_BURST;
453
454	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
455	<	{
456	<	free_dlink_node(m);
457	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
497	<	}
498	<	else assert(0);
454	>	assert(dlinkFind(&unknown_list, source_p));
455	>
456	>	dlink_move_node(&source_p->localClient->lclient_node,
457	>	&unknown_list, &local_client_list);
458
459		user_welcome(source_p);
460		add_user_host(source_p->username, source_p->host, 0);
461		SetUserHost(source_p);
462
463	<	introduce_client(client_p, source_p);
463	>	introduce_client(source_p);
464		}
465
466		/* register_remote_user()
467		*
468	<	* inputs       - client_p directly connected client
510	<	*              - source_p remote or directly connected client
468	>	* inputs       - source_p remote or directly connected client
469		*              - username to register as
470		*              - host name to register as
471		*              - server name
#	Line 517 | Line 475 | register_local_user(struct Client *clien
475		*                is introduced by a server.
476		*/
477		void
478	<	register_remote_user(struct Client *client_p, struct Client *source_p,
478	>	register_remote_user(struct Client *source_p,
479		const char *username, const char *host, const char *server,
480		const char *realname)
481		{
#	Line 527 | Line 485 | register_remote_user(struct Client *clie
485		assert(source_p->username != username);
486
487		strlcpy(source_p->host, host, sizeof(source_p->host));
530	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
488		strlcpy(source_p->username, username, sizeof(source_p->username));
489
490		/*
491		* coming from another server, take the servers word for it
492		*/
493	<	source_p->servptr = find_server(server);
493	>	source_p->servptr = hash_find_server(server);
494
495	<	/* Super GhostDetect:
495	>	/*
496	>	* Super GhostDetect:
497		* If we can't find the server the user is supposed to be on,
498		* then simply blow the user away.        -Taner
499		*/
500		if (source_p->servptr == NULL)
501		{
502	<	sendto_realops_flags(UMODE_ALL, L_ALL,
502	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
503		"No server %s for user %s[%s@%s] from %s",
504		server, source_p->name, source_p->username,
505		source_p->host, source_p->from->name);
506	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
506	>	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
507
508	<	SetKilled(source_p);
508	>	AddFlag(source_p, FLAGS_KILLED);
509		exit_client(source_p, &me, "Ghosted Client");
510		return;
511		}
512
513		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
514		{
515	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
515	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
516		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
517	<	client_p->name, source_p->name, source_p->username,
517	>	source_p->from->name, source_p->name, source_p->username,
518		source_p->host, source_p->servptr->name,
519		target_p->name, target_p->from->name);
520	<	kill_client(client_p, source_p,
520	>	kill_client(source_p->from, source_p,
521		"%s (NICK from wrong direction (%s != %s))",
522		me.name, source_p->servptr->name, target_p->from->name);
523	<	SetKilled(source_p);
523	>	AddFlag(source_p, FLAGS_KILLED);
524		exit_client(source_p, &me, "USER server wrong direction");
525		return;
526		}
527
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		/* Increment our total user count here */
536		if (++Count.total > Count.max_tot)
537		Count.max_tot = Count.total;
#	Line 576 | Line 541 | register_remote_user(struct Client *clie
541		add_user_host(source_p->username, source_p->host, 1);
542		SetUserHost(source_p);
543
544	<	introduce_client(client_p, source_p);
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>",
547	>	source_p->servptr->name,
548	>	source_p->name, source_p->username, source_p->host,
549	>	source_p->info, source_p->id);
550	>
551	>	introduce_client(source_p);
552		}
553
554		/* introduce_client()
555		*
556	<	* inputs       - client_p
585	<	*              - source_p
556	>	* inputs       - source_p
557		* output       - NONE
558		* side effects - This common function introduces a client to the rest
559		*                of the net, either from a local client connect or
560		*                from a remote connect.
561		*/
562		static void
563	<	introduce_client(struct Client *client_p, struct Client *source_p)
563	>	introduce_client(struct Client *source_p)
564		{
565		dlink_node *server_node = NULL;
566		static char ubuf[12];
#	Line 611 | Line 582 | introduce_client(struct Client *client_p
582		{
583		struct Client *server = server_node->data;
584
585	<	if (server == client_p)
585	>	if (server == source_p->from)
586		continue;
587
588	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
589	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
590	<	source_p->servptr->id,
591	<	source_p->name, source_p->hopcount+1,
592	<	(unsigned long)source_p->tsinfo,
593	<	ubuf, source_p->username, source_p->host,
594	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
595	<	"0" : source_p->sockhost, source_p->id, source_p->info);
588	>	if (IsCapable(server, CAP_SVS))
589	>	{
590	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
591	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
592	>	source_p->servptr->id,
593	>	source_p->name, source_p->hopcount+1,
594	>	(unsigned long)source_p->tsinfo,
595	>	ubuf, source_p->username, source_p->host,
596	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
597	>	"0" : source_p->sockhost, source_p->id,
598	>	source_p->svid,
599	>	source_p->info);
600	>	else
601	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
602	>	source_p->name, source_p->hopcount+1,
603	>	(unsigned long)source_p->tsinfo,
604	>	ubuf, source_p->username, source_p->host,
605	>	source_p->servptr->name, source_p->svid,
606	>	source_p->info);
607	>
608	>	}
609		else
610	<	sendto_one(server, "NICK %s %d %lu %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->info);
610	>	{
611	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
612	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
613	>	source_p->servptr->id,
614	>	source_p->name, source_p->hopcount+1,
615	>	(unsigned long)source_p->tsinfo,
616	>	ubuf, source_p->username, source_p->host,
617	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
618	>	"0" : source_p->sockhost, source_p->id, source_p->info);
619	>	else
620	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
621	>	source_p->name, source_p->hopcount+1,
622	>	(unsigned long)source_p->tsinfo,
623	>	ubuf, source_p->username, source_p->host,
624	>	source_p->servptr->name, source_p->info);
625	>	}
626	>
627	>	if (!EmptyString(source_p->certfp))
628	>	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
629		}
630		}
631
#	Line 647 | Line 645 | valid_hostname(const char *hostname)
645
646		assert(p != NULL);
647
648	<	if ('.' == *p || ':' == *p)
648	>	if (*p == '.' || *p == ':')
649		return 0;
650
651	<	while (*p)
654	<	{
651	>	for (; *p; ++p)
652		if (!IsHostChar(*p))
653		return 0;
657	–	p++;
658	–	}
654
655	<	return 1;
655	>	return p - hostname <= HOSTLEN;
656		}
657
658		/* valid_username()
#	Line 672 | Line 667 | valid_hostname(const char *hostname)
667		* style of username
668		*/
669		int
670	<	valid_username(const char *username)
670	>	valid_username(const char *username, const int local)
671		{
672		int dots      = 0;
673		const char *p = username;
674
675		assert(p != NULL);
676
677	<	if ('~' == *p)
677	>	if (*p == '~')
678		++p;
679
680	<	/* reject usernames that don't start with an alphanum
680	>	/*
681	>	* Reject usernames that don't start with an alphanum
682		* i.e. reject jokers who have '-@somehost' or '.@somehost'
683		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
684		*/
685		if (!IsAlNum(*p))
686		return 0;
687
688	<	while (*++p)
688	>	if (local)
689		{
690	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
690	>	while (*++p)
691		{
692	<	dots++;
693	<
694	<	if (dots > ConfigFileEntry.dots_in_ident)
695	<	return 0;
696	<	if (!IsUserChar(p[1]))
692	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
693	>	{
694	>	if (++dots > ConfigFileEntry.dots_in_ident)
695	>	return 0;
696	>	if (!IsUserChar(*(p + 1)))
697	>	return 0;
698	>	}
699	>	else if (!IsUserChar(*p))
700		return 0;
701		}
702	<	else if (!IsUserChar(*p))
703	<	return 0;
702	>	}
703	>	else
704	>	{
705	>	while (*++p)
706	>	if (!IsUserChar(*p))
707	>	return 0;
708		}
709
710	<	return 1;
710	>	return  p - username <= USERLEN;;
711	>	}
712	>
713	>	/* clean_nick_name()
714	>	*
715	>	* input        - nickname
716	>	*              - whether it's a local nick (1) or remote (0)
717	>	* output       - none
718	>	* side effects - walks through the nickname, returning 0 if erroneous
719	>	*/
720	>	int
721	>	valid_nickname(const char *nickname, const int local)
722	>	{
723	>	const char *p = nickname;
724	>	assert(nickname && *nickname);
725	>
726	>	/* nicks can't start with a digit or - or be 0 length */
727	>	/* This closer duplicates behaviour of hybrid-6 */
728	>	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
729	>	return 0;
730	>
731	>	for (; *p; ++p)
732	>	if (!IsNickChar(*p))
733	>	return 0;
734	>
735	>	return p - nickname <= NICKLEN;
736		}
737
738		/* report_and_set_user_flags()
739		*
740		* inputs       - pointer to source_p
741	<	*              - pointer to aconf for this user
741	>	*              - pointer to conf for this user
742		* output       - NONE
743		* side effects - Report to user any special flags
744		*                they are getting, and set them.
745		*/
746		static void
747	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
747	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
748		{
749		/* If this user is being spoofed, tell them so */
750	<	if (IsConfDoSpoofIp(aconf))
723	<	{
750	>	if (IsConfDoSpoofIp(conf))
751		sendto_one(source_p,
752	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
752	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
753		me.name, source_p->name);
727	–	}
754
755		/* If this user is in the exception class, Set it "E lined" */
756	<	if (IsConfExemptKline(aconf))
756	>	if (IsConfExemptKline(conf))
757		{
758		SetExemptKline(source_p);
759		sendto_one(source_p,
760	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
760	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
761		me.name, source_p->name);
762		}
763
764		/* The else here is to make sure that G line exempt users
765		* do not get noticed twice.
766		*/
767	<	else if (IsConfExemptGline(aconf))
767	>	else if (IsConfExemptGline(conf))
768		{
769		SetExemptGline(source_p);
770	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
770	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
771		me.name, source_p->name);
772		}
773
774	<	if (IsConfExemptResv(aconf))
774	>	if (IsConfExemptResv(conf))
775		{
776		SetExemptResv(source_p);
777	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
777	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
778		me.name, source_p->name);
779		}
780
781		/* If this user is exempt from user limits set it "F lined" */
782	<	if (IsConfExemptLimits(aconf))
782	>	if (IsConfExemptLimits(conf))
783		{
784		SetExemptLimits(source_p);
785		sendto_one(source_p,
786	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
786	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
787		me.name,source_p->name);
788		}
789
790	<	/* If this user is exempt from idle time outs */
765	<	if (IsConfIdlelined(aconf))
766	<	{
767	<	SetIdlelined(source_p);
768	<	sendto_one(source_p,
769	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
770	<	me.name, source_p->name);
771	<	}
772	<
773	<	if (IsConfCanFlood(aconf))
790	>	if (IsConfCanFlood(conf))
791		{
792		SetCanFlood(source_p);
793		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 779 | Line 796 | report_and_set_user_flags(struct Client
796		}
797		}
798
782	–	/* do_local_user()
783	–	*
784	–	* inputs       -
785	–	* output       - NONE
786	–	* side effects -
787	–	*/
788	–	void
789	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
790	–	const char *username, const char *host, const char *server,
791	–	const char *realname)
792	–	{
793	–	assert(source_p != NULL);
794	–	assert(source_p->username != username);
795	–
796	–	if (source_p == NULL)
797	–	return;
798	–
799	–	if (!IsUnknown(source_p))
800	–	{
801	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
802	–	me.name, nick);
803	–	return;
804	–	}
805	–
806	–	source_p->localClient->registration &= ~REG_NEED_USER;
807	–
808	–	/*
809	–	* don't take the clients word for it, ever
810	–	*/
811	–	source_p->servptr = &me;
812	–
813	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
814	–
815	–	/* stash for later */
816	–	strlcpy(source_p->client_host, host, sizeof(source_p->client_host));
817	–	strlcpy(source_p->client_server, server, sizeof(source_p->client_server));
818	–
819	–	if (!IsGotId(source_p))
820	–	{
821	–	/* save the username in the client
822	–	* If you move this you'll break ping cookies..you've been warned
823	–	*/
824	–	strlcpy(source_p->username, username, sizeof(source_p->username));
825	–	}
826	–
827	–	if (!source_p->localClient->registration)
828	–	/* NICK already received, now I have USER... */
829	–	register_local_user(client_p, source_p, source_p->name, username);
830	–	}
831	–
832	–	/* change_simple_umode()
833	–	*
834	–	* this callback can be hooked to allow special handling of
835	–	* certain usermodes
836	–	*/
837	–	static void *
838	–	change_simple_umode(va_list args)
839	–	{
840	–	struct Client *client_p;
841	–	struct Client *source_p;
842	–	int what;
843	–	unsigned int flag;
844	–
845	–	client_p = va_arg(args, struct Client *);
846	–	source_p = va_arg(args, struct Client *);
847	–	what = va_arg(args, int);
848	–	flag = va_arg(args, unsigned int);
849	–
850	–	if (what == MODE_ADD)
851	–	source_p->umodes |= flag;
852	–	else
853	–	source_p->umodes &= ~flag;
854	–
855	–	return NULL;
856	–	}
857	–
799		/* set_user_mode()
800		*
801		* added 15/10/91 By Darren Reed.
#	Line 864 | Line 805 | change_simple_umode(va_list args)
805		*/
806		void
807		set_user_mode(struct Client *client_p, struct Client *source_p,
808	<	int parc, char *parv[])
808	>	const int parc, char *parv[])
809		{
810		unsigned int flag, setflags;
811		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 881 | Line 822 | set_user_mode(struct Client *client_p, s
822		return;
823		}
824
825	<	if (IsServer(source_p))
885	<	{
886	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
887	<	parv[1], source_p->name);
888	<	return;
889	<	}
890	<
891	<	if (source_p != target_p || target_p->from != source_p->from)
825	>	if (source_p != target_p)
826		{
827		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
828		me.name, source_p->name);
#	Line 901 | Line 835 | set_user_mode(struct Client *client_p, s
835		*m++ = '+';
836
837		for (i = 0; i < 128; i++)
838	<	if (source_p->umodes & user_modes[i])
838	>	if (HasUMode(source_p, user_modes[i]))
839		*m++ = (char)i;
840		*m = '\0';
841
#	Line 910 | Line 844 | set_user_mode(struct Client *client_p, s
844		return;
845		}
846
913	–	execute_callback(entering_umode_cb, client_p, source_p);
914	–
847		/* find flags already set for user */
848		setflags = source_p->umodes;
849
#	Line 931 | Line 863 | set_user_mode(struct Client *client_p, s
863		case 'o':
864		if (what == MODE_ADD)
865		{
866	<	if (IsServer(client_p) && !IsOper(source_p))
866	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
867		{
868		++Count.oper;
869		SetOper(source_p);
#	Line 942 | Line 874 | set_user_mode(struct Client *client_p, s
874		/* Only decrement the oper counts if an oper to begin with
875		* found by Pat Szuta, Perly , perly@xnet.com
876		*/
877	<	if (!IsOper(source_p))
877	>	if (!HasUMode(source_p, UMODE_OPER))
878		break;
879
880		ClearOper(source_p);
949	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
881		Count.oper--;
882
883		if (MyConnect(source_p))
884		{
885		dlink_node *dm;
886
887	<	detach_conf(source_p, OPER_TYPE);
888	<	ClearOperFlags(source_p);
887	>	detach_conf(source_p, CONF_OPER);
888	>	ClrOFlag(source_p);
889	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
890
891		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
892		free_dlink_node(dm);
#	Line 963 | Line 895 | set_user_mode(struct Client *client_p, s
895
896		break;
897
898	<	/* we may not get these,
899	<	* but they shouldnt be in default
900	<	*/
969	<	case ' ' :
970	<	case '\n':
971	<	case '\r':
972	<	case '\t':
898	>	case 'S':  /* Only servers may set +S in a burst */
899	>	case 'r':  /* Only services may set +r */
900	>	case 'x':  /* Only services may set +x */
901		break;
902
903		default:
904		if ((flag = user_modes[(unsigned char)*m]))
905		{
906	<	if (MyConnect(source_p) && !IsOper(source_p) &&
906	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
907		(ConfigFileEntry.oper_only_umodes & flag))
980	–	{
908		badflag = 1;
982	–	}
909		else
910	<	execute_callback(umode_cb, client_p, source_p, what, flag);
910	>	{
911	>	if (what == MODE_ADD)
912	>	AddUMode(source_p, flag);
913	>	else
914	>	DelUMode(source_p, flag);
915	>	}
916		}
917		else
918		{
#	Line 998 | Line 929 | set_user_mode(struct Client *client_p, s
929		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
930		me.name, source_p->name);
931
932	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
933	<	{
1003	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1004	<	me.name, source_p->name);
1005	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1006	<	}
1007	<
1008	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
1009	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
932	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
933	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
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;
937	>	DelUMode(source_p, UMODE_ADMIN);
938		}
939
940	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
940	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
941		++Count.invisi;
942	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
942	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
943		--Count.invisi;
944
945		/*
#	Line 1040 | Line 964 | void
964		send_umode(struct Client *client_p, struct Client *source_p,
965		unsigned int old, unsigned int sendmask, char *umode_buf)
966		{
967	+	char *m = umode_buf;
968		int what = 0;
969		unsigned int i;
970		unsigned int flag;
1046	–	char *m = umode_buf;
971
972		/*
973		* build a string in umode_buf to represent the change in the user's
#	Line 1058 | Line 982 | send_umode(struct Client *client_p, stru
982		if (MyClient(source_p) && !(flag & sendmask))
983		continue;
984
985	<	if ((flag & old) && !(source_p->umodes & flag))
985	>	if ((flag & old) && !HasUMode(source_p, flag))
986		{
987		if (what == MODE_DEL)
988		*m++ = (char)i;
#	Line 1069 | Line 993 | send_umode(struct Client *client_p, stru
993		*m++ = (char)i;
994		}
995		}
996	<	else if (!(flag & old) && (source_p->umodes & flag))
996	>	else if (!(flag & old) && HasUMode(source_p, flag))
997		{
998		if (what == MODE_ADD)
999		*m++ = (char)i;
#	Line 1103 | Line 1027 | send_umode_out(struct Client *client_p,
1027		char buf[IRCD_BUFSIZE] = { '\0' };
1028		dlink_node *ptr = NULL;
1029
1030	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1107	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1030	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1031
1032		if (buf[0])
1033		{
#	Line 1123 | Line 1046 | send_umode_out(struct Client *client_p,
1046		send_umode(client_p, source_p, old, 0xffffffff, buf);
1047		}
1048
1049	+	void
1050	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1051	+	{
1052	+	dlink_node *ptr = NULL;
1053	+
1054	+	if (!strcmp(target_p->host, hostname))
1055	+	return;
1056	+
1057	+	switch (what)
1058	+	{
1059	+	case MODE_ADD:
1060	+	AddUMode(target_p, UMODE_HIDDENHOST);
1061	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1062	+	break;
1063	+	case MODE_DEL:
1064	+	DelUMode(target_p, UMODE_HIDDENHOST);
1065	+
1066	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1067	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1068	+	break;
1069	+	default: return;
1070	+	}
1071	+
1072	+	if (ConfigFileEntry.cycle_on_host_change)
1073	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1074	+	target_p->name, target_p->username, target_p->host);
1075	+
1076	+	if (IsUserHostIp(target_p))
1077	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1078	+
1079	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1080	+
1081	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1082	+	SetUserHost(target_p);
1083	+
1084	+	if (MyClient(target_p))
1085	+	{
1086	+	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1087	+	target_p->name, target_p->host);
1088	+	clear_ban_cache_client(target_p);
1089	+	}
1090	+
1091	+	if (!ConfigFileEntry.cycle_on_host_change)
1092	+	return;
1093	+
1094	+	DLINK_FOREACH(ptr, target_p->channel.head)
1095	+	{
1096	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1097	+	char *p = modebuf;
1098	+	int len = 0;
1099	+	const struct Membership *ms = ptr->data;
1100	+
1101	+	if (has_member_flags(ms, CHFL_CHANOP))
1102	+	{
1103	+	*p++ = 'o';
1104	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1105	+	}
1106	+
1107	+	if (has_member_flags(ms, CHFL_HALFOP))
1108	+	{
1109	+	*p++ = 'h';
1110	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1111	+	}
1112	+
1113	+	if (has_member_flags(ms, CHFL_VOICE))
1114	+	{
1115	+	*p++ = 'v';
1116	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1117	+	}
1118	+
1119	+	*p = '\0';
1120	+
1121	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1122	+	target_p->name, target_p->username, target_p->host,
1123	+	ms->chptr->chname);
1124	+	if (nickbuf[0])
1125	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1126	+	target_p->servptr->name, ms->chptr->chname,
1127	+	modebuf, nickbuf);
1128	+
1129	+	}
1130	+
1131	+	if (target_p->away[0])
1132	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1133	+	":%s!%s@%s AWAY :%s",
1134	+	target_p->name, target_p->username,
1135	+	target_p->host, target_p->away);
1136	+	}
1137	+
1138		/* user_welcome()
1139		*
1140		* inputs       - client pointer to client to welcome
#	Line 1139 | Line 1151 | user_welcome(struct Client *source_p)
1151		#endif
1152
1153		#ifdef HAVE_LIBCRYPTO
1154	<	if (source_p->localClient->fd.ssl != NULL)
1154	>	if (HasFlag(source_p, FLAGS_SSL))
1155	>	{
1156	>	AddUMode(source_p, UMODE_SSL);
1157		sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1158		me.name, source_p->name,
1159		ssl_get_cipher(source_p->localClient->fd.ssl));
1160	+	}
1161		#endif
1162
1163		sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
#	Line 1160 | Line 1175 | user_welcome(struct Client *source_p)
1175		source_p->name, source_p->id);
1176
1177		show_lusers(source_p);
1178	<
1164	<	if (ConfigFileEntry.short_motd)
1165	<	{
1166	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1167	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1168	<	sendto_one(source_p,
1169	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1170	<	"read it", source_p->name);
1171	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1172	<	me.name, source_p->name, me.name);
1173	<	sendto_one(source_p, form_str(RPL_MOTD),
1174	<	me.name, source_p->name,
1175	<	"*** This is the short motd ***");
1176	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1177	<	me.name, source_p->name);
1178	<	}
1179	<	else
1180	<	send_message_file(source_p, &ConfigFileEntry.motd);
1178	>	motd_signon(source_p);
1179		}
1180
1181		/* check_xline()
#	Line 1189 | Line 1187 | user_welcome(struct Client *source_p)
1187		static int
1188		check_xline(struct Client *source_p)
1189		{
1190	<	struct ConfItem *conf = NULL;
1190	>	struct MaskItem *conf = NULL;
1191		const char *reason = NULL;
1192
1193	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1196	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1193	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1194		{
1195	<	struct MatchItem *reg = map_to_conf(conf);
1199	<
1200	<	++reg->count;
1195	>	++conf->count;
1196
1197	<	if (reg->reason != NULL)
1198	<	reason = reg->reason;
1197	>	if (conf->reason != NULL)
1198	>	reason = conf->reason;
1199		else
1200		reason = "No Reason";
1201
1202	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1202	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1203		"X-line Rejecting [%s] [%s], user %s [%s]",
1204		source_p->info, reason,
1205		get_client_name(source_p, HIDE_IP),
1206		source_p->sockhost);
1207
1208	<	ServerStats->is_ref++;
1209	<	if (REJECT_HOLD_TIME > 0)
1215	<	{
1216	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1217	<	me.name, source_p->name);
1218	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1219	<	SetCaptured(source_p);
1220	<	}
1221	<	else
1222	<	exit_client(source_p, &me, "Bad user info");
1208	>	++ServerStats.is_ref;
1209	>	exit_client(source_p, &me, "Bad user info");
1210		return 1;
1211		}
1212
#	Line 1230 | Line 1217 | check_xline(struct Client *source_p)
1217		*
1218		* inputs       - pointer to given client to oper
1219		* output       - NONE
1220	<	* side effects - Blindly opers up given source_p, using aconf info
1220	>	* side effects - Blindly opers up given source_p, using conf info
1221		*                all checks on passwords have already been done.
1222		*                This could also be used by rsa oper routines.
1223		*/
1224		void
1225		oper_up(struct Client *source_p)
1226		{
1227	<	unsigned int old = source_p->umodes;
1228	<	const char *operprivs = "";
1242	<	const struct AccessItem *oconf = NULL;
1227	>	const unsigned int old = source_p->umodes;
1228	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1229
1230		assert(source_p->localClient->confs.head);
1245	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1231
1232		++Count.oper;
1233		SetOper(source_p);
1234
1235	<	if (oconf->modes)
1236	<	source_p->umodes |= oconf->modes;
1235	>	if (conf->modes)
1236	>	AddUMode(source_p, conf->modes);
1237		else if (ConfigFileEntry.oper_umodes)
1238	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1254	<	else
1255	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1256	<	UMODE_WALLOP|UMODE_LOCOPS);
1238	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1239
1240	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1240	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1241		++Count.invisi;
1242	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1242	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1243		--Count.invisi;
1244
1245		assert(dlinkFind(&oper_list, source_p) == NULL);
1246		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1247
1248	<	operprivs = oper_privs_as_string(oconf->port);
1267	<
1268	<	SetOFlag(source_p, oconf->port);
1248	>	AddOFlag(source_p, conf->port);
1249
1250	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1251	<	source_p->umodes |= UMODE_ADMIN;
1272	<	if (!IsOperN(source_p))
1273	<	source_p->umodes &= ~UMODE_NCHANGE;
1250	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1251	>	AddUMode(source_p, UMODE_ADMIN);
1252
1253	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1254	<	source_p->name, source_p->username, source_p->host);
1253	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1254	>	get_oper_name(source_p));
1255		send_umode_out(source_p, source_p, old);
1256		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1279	–	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1280	–	me.name, source_p->name, operprivs);
1281	–	send_message_file(source_p, &ConfigFileEntry.opermotd);
1257		}
1258
1259		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1286 | Line 1261 | static char new_uid[TOTALSIDUID + 1];
1261		int
1262		valid_sid(const char *sid)
1263		{
1289	–
1264		if (strlen(sid) == IRC_MAXSID)
1265		if (IsDigit(*sid))
1266		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1307 | Line 1281 | valid_sid(const char *sid)
1281		void
1282		init_uid(void)
1283		{
1284	<	int i;
1284	>	unsigned int i;
1285
1286		memset(new_uid, 0, sizeof(new_uid));
1287
1288	<	if (ServerInfo.sid != NULL)
1315	<	{
1288	>	if (!EmptyString(ServerInfo.sid))
1289		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1317	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1318	–
1319	–	hash_add_id(&me);
1320	–	}
1290
1291	<	for (i = 0; i < IRC_MAXSID; i++)
1291	>	for (i = 0; i < IRC_MAXSID; ++i)
1292		if (new_uid[i] == '\0')
1293		new_uid[i] = 'A';
1294
#	Line 1329 | Line 1298 | init_uid(void)
1298		* -Dianora
1299		*/
1300		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1332	–
1333	–	entering_umode_cb = register_callback("entering_umode", NULL);
1334	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1335	–	uid_get_cb = register_callback("uid_get", uid_get);
1301		}
1302
1303		/*
#	Line 1375 | Line 1340 | add_one_to_uid(int i)
1340		* output       - new UID is returned to caller
1341		* side effects - new_uid is incremented by one.
1342		*/
1343	<	static void *
1344	<	uid_get(va_list args)
1343	>	static const char *
1344	>	uid_get(void)
1345		{
1346		add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1347		return new_uid;
#	Line 1392 | Line 1357 | uid_get(va_list args)
1357		void
1358		init_isupport(void)
1359		{
1395	–	isupportFile = init_MessageLine();
1396	–
1360		add_isupport("CALLERID", NULL, -1);
1361		add_isupport("CASEMAPPING", CASEMAP, -1);
1362		add_isupport("DEAF", "D", -1);
1363		add_isupport("KICKLEN", NULL, KICKLEN);
1364		add_isupport("MODES", NULL, MAXMODEPARAMS);
1402	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1365		#ifdef HALFOPS
1366		add_isupport("PREFIX", "(ohv)@%+", -1);
1367		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1407 | Line 1369 | init_isupport(void)
1369		add_isupport("PREFIX", "(ov)@+", -1);
1370		add_isupport("STATUSMSG", "@+", -1);
1371		#endif
1372	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1372	>	add_isupport("EXCEPTS", "e", -1);
1373	>	add_isupport("INVEX", "I", -1);
1374		}
1375
1376		/*
#	Line 1442 | Line 1405 | add_isupport(const char *name, const cha
1405		dlinkAddTail(support, &support->node, &support_list);
1406		}
1407
1408	<	DupString(support->name, name);
1408	>	support->name = xstrdup(name);
1409		if (options != NULL)
1410	<	DupString(support->options, options);
1410	>	support->options = xstrdup(options);
1411		support->number = n;
1412
1413		rebuild_isupport_message_line();
#	Line 1491 | Line 1454 | rebuild_isupport_message_line(void)
1454		{
1455		char isupportbuffer[IRCD_BUFSIZE];
1456		char *p = isupportbuffer;
1457	<	dlink_node *ptr = NULL;
1457	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1458		int n = 0;
1459		int tokens = 0;
1460		size_t len = 0;
1461		size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1462
1463	<	destroy_MessageLine(isupportFile);
1463	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1464	>	{
1465	>	dlinkDelete(ptr, &support_list_lines);
1466	>	MyFree(ptr->data);
1467	>	free_dlink_node(ptr);
1468	>	}
1469
1470		DLINK_FOREACH(ptr, support_list.head)
1471		{
1472		struct Isupport *support = ptr->data;
1473
1474	<	p += (n = ircsprintf(p, "%s", support->name));
1474	>	p += (n = sprintf(p, "%s", support->name));
1475		len += n;
1476
1477		if (support->options != NULL)
1478		{
1479	<	p += (n = ircsprintf(p, "=%s", support->options));
1479	>	p += (n = sprintf(p, "=%s", support->options));
1480		len += n;
1481		}
1482
1483		if (support->number > 0)
1484		{
1485	<	p += (n = ircsprintf(p, "=%d", support->number));
1485	>	p += (n = sprintf(p, "=%d", support->number));
1486		len += n;
1487		}
1488
#	Line 1527 | Line 1495 | rebuild_isupport_message_line(void)
1495		if (*--p == ' ')
1496		*p = '\0';
1497
1498	<	addto_MessageLine(isupportFile, isupportbuffer);
1498	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1499		p = isupportbuffer;
1500		len = 0;
1501		n = tokens = 0;
#	Line 1538 | Line 1506 | rebuild_isupport_message_line(void)
1506		{
1507		if (*--p == ' ')
1508		*p = '\0';
1509	<	addto_MessageLine(isupportFile, isupportbuffer);
1509	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1510		}
1511		}

Diff Legend

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