ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_user.c (file contents), Revision 882 by michael, Sun Oct 28 11:58:39 2007 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2143 by michael, Thu May 30 01:12:38 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;
55
56		static char umode_buffer[IRCD_BUFSIZE];
57
58		static void user_welcome(struct Client *);
59	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
59	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
60		static int check_xline(struct Client *);
61	<	static void introduce_client(struct Client *, struct Client *);
62	<	static void *uid_get(va_list);
61	>	static void introduce_client(struct Client *);
62	>	static const char *uid_get(void);
63
64		/* Used for building up the isupport string,
65		* used with init_isupport, add_isupport, delete_isupport
#	Line 87 | Line 77 | static dlink_list support_list = { NULL,
77		MessageFile *isupportFile;
78
79		/* memory is cheap. map 0-255 to equivalent mode */
80	<	unsigned int user_modes[256] =
80	>	const unsigned int user_modes[256] =
81		{
82		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
83		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 99 | Line 89 | unsigned int user_modes[256] =
89		UMODE_CCONN_FULL,   /* C */
90		UMODE_DEAF,         /* D */
91		0,                  /* E */
92	<	0,                  /* F */
92	>	UMODE_FARCONNECT,   /* F */
93		UMODE_SOFTCALLERID, /* G */
94	<	0,                  /* H */
94	>	UMODE_HIDDEN,       /* H */
95		0,                  /* I */
96		0,                  /* J */
97		0,                  /* K */
#	Line 111 | Line 101 | unsigned int user_modes[256] =
101		0,                  /* O */
102		0,                  /* P */
103		0,                  /* Q */
104	<	0,                  /* R */
104	>	UMODE_REGONLY,      /* R */
105		0,                  /* S */
106		0,                  /* T */
107		0,                  /* U */
#	Line 126 | Line 116 | unsigned int user_modes[256] =
116		UMODE_BOTS,         /* b */
117		UMODE_CCONN,        /* c */
118		UMODE_DEBUG,        /* d */
119	<	0,                  /* e */
119	>	UMODE_EXTERNAL,     /* e */
120		UMODE_FULL,         /* f */
121		UMODE_CALLERID,     /* g */
122		0,                  /* h */
123		UMODE_INVISIBLE,    /* i */
124	<	0,                  /* j */
124	>	UMODE_REJ,          /* j */
125		UMODE_SKILL,        /* k */
126		UMODE_LOCOPS,       /* l */
127		0,                  /* m */
#	Line 139 | Line 129 | unsigned int user_modes[256] =
129		UMODE_OPER,         /* o */
130		0,                  /* p */
131		0,                  /* q */
132	<	UMODE_REJ,          /* r */
132	>	UMODE_REGISTERED,   /* r */
133		UMODE_SERVNOTICE,   /* s */
134		0,                  /* t */
135		UMODE_UNAUTH,       /* u */
136		0,                  /* v */
137		UMODE_WALLOP,       /* w */
138	<	UMODE_EXTERNAL,     /* x */
138	>	UMODE_HIDDENHOST,   /* x */
139		UMODE_SPY,          /* y */
140		UMODE_OPERWALL,     /* z      0x7A */
141		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 166 | Line 156 | assemble_umode_buffer(void)
156		unsigned int idx = 0;
157		char *umode_buffer_ptr = umode_buffer;
158
159	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
159	>	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
160		if (user_modes[idx])
161		*umode_buffer_ptr++ = idx;
162
#	Line 195 | Line 185 | show_lusers(struct Client *source_p)
185		to = source_p->name;
186		}
187
188	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
188	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
189		sendto_one(source_p, form_str(RPL_LUSERCLIENT),
190		from, to, (Count.total-Count.invisi),
191		Count.invisi, dlink_list_length(&global_serv_list));
#	Line 215 | Line 205 | show_lusers(struct Client *source_p)
205		sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
206		from, to, dlink_list_length(&global_channel_list));
207
208	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
208	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
209		{
210		sendto_one(source_p, form_str(RPL_LUSERME),
211		from, to, Count.local, Count.myserver);
212		sendto_one(source_p, form_str(RPL_LOCALUSERS),
213	<	from, to, Count.local, Count.max_loc,
224	<	Count.local, Count.max_loc);
213	>	from, to, Count.local, Count.max_loc);
214		}
215		else
216		{
217		sendto_one(source_p, form_str(RPL_LUSERME),
218		from, to, Count.total, 0);
219		sendto_one(source_p, form_str(RPL_LOCALUSERS),
220	<	from, to, Count.total, Count.max_tot,
232	<	Count.total, Count.max_tot);
220	>	from, to, Count.total, Count.max_tot);
221		}
222
223		sendto_one(source_p, form_str(RPL_GLOBALUSERS),
224	<	from, to, Count.total, Count.max_tot,
237	<	Count.total, Count.max_tot);
224	>	from, to, Count.total, Count.max_tot);
225
226	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
226	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
227		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
228	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
228	>	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
229
230	<	if (Count.local > MaxClientCount)
231	<	MaxClientCount = Count.local;
230	>	if (Count.local > Count.max_loc_cli)
231	>	Count.max_loc_cli = Count.local;
232
233	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
234	<	MaxConnectionCount = Count.local + Count.myserver;
233	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
234	>	Count.max_loc_con = Count.local + Count.myserver;
235		}
236
237		/* show_isupport()
#	Line 283 | Line 270 | show_isupport(struct Client *source_p)
270		**         nick from local user or kill him/her...
271		*/
272		void
273	<	register_local_user(struct Client *client_p, struct Client *source_p,
287	<	const char *nick, const char *username)
273	>	register_local_user(struct Client *source_p)
274		{
275	<	const struct AccessItem *aconf = NULL;
276	<	char ipaddr[HOSTIPLEN];
291	<	dlink_node *ptr = NULL;
292	<	dlink_node *m = NULL;
275	>	const char *id = NULL;
276	>	const struct MaskItem *conf = NULL;
277
278		assert(source_p != NULL);
279	+	assert(source_p == source_p->from);
280		assert(MyConnect(source_p));
296	–	assert(source_p->username != username);
281		assert(!source_p->localClient->registration);
282
283	<	ClearCap(client_p, CAP_TS6);
283	>	ClearCap(source_p, CAP_TS6);
284
285		if (ConfigFileEntry.ping_cookie)
286		{
287	<	if (!IsPingSent(source_p) &&
304	<	source_p->localClient->random_ping == 0)
287	>	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
288		{
289	<	source_p->localClient->random_ping = (unsigned long)rand();
290	<	sendto_one(source_p, "PING :%lu",
289	>	do
290	>	source_p->localClient->random_ping = genrand_int32();
291	>	while (!source_p->localClient->random_ping);
292	>
293	>	sendto_one(source_p, "PING :%u",
294		source_p->localClient->random_ping);
295		SetPingSent(source_p);
296		return;
#	Line 314 | Line 300 | register_local_user(struct Client *clien
300		return;
301		}
302
303	<	source_p->localClient->last = CurrentTime;
303	>	source_p->localClient->last_privmsg = CurrentTime;
304		/* Straight up the maximum rate of flooding... */
305		source_p->localClient->allow_read = MAX_FLOOD_BURST;
306
307	<	if (!execute_callback(client_check_cb, source_p, username))
307	>	if (!check_client(source_p))
308		return;
309
310		if (valid_hostname(source_p->host) == 0)
#	Line 329 | Line 315 | register_local_user(struct Client *clien
315		sizeof(source_p->host));
316		}
317
318	<	ptr   = source_p->localClient->confs.head;
333	<	aconf = map_to_conf(ptr->data);
318	>	conf = source_p->localClient->confs.head->data;
319
320		if (!IsGotId(source_p))
321		{
322	<	const char *p = NULL;
322	>	char username[USERLEN + 1];
323	>	const char *p = username;
324		unsigned int i = 0;
325
326	<	if (IsNeedIdentd(aconf))
326	>	if (IsNeedIdentd(conf))
327		{
328	<	ServerStats->is_ref++;
328	>	++ServerStats.is_ref;
329		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
330		"identd to use this server", me.name, source_p->name);
331		exit_client(source_p, &me, "Install identd");
332		return;
333		}
334
335	<	p = username;
335	>	strlcpy(username, source_p->username, sizeof(username));
336
337	<	if (!IsNoTilde(aconf))
337	>	if (!IsNoTilde(conf))
338		source_p->username[i++] = '~';
339
340	<	while (*p && i < USERLEN)
355	<	{
340	>	for (; *p && i < USERLEN; ++p)
341		if (*p != '[')
342		source_p->username[i++] = *p;
358	–	p++;
359	–	}
343
344		source_p->username[i] = '\0';
345		}
346
347		/* password check */
348	<	if (!EmptyString(aconf->passwd))
348	>	if (!EmptyString(conf->passwd))
349		{
350		const char *pass = source_p->localClient->passwd;
351
352	<	if (!match_conf_password(pass, aconf))
352	>	if (!match_conf_password(pass, conf))
353		{
354	<	ServerStats->is_ref++;
354	>	++ServerStats.is_ref;
355		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
356		me.name, source_p->name);
357		exit_client(source_p, &me, "Bad Password");
#	Line 382 | Line 365 | register_local_user(struct Client *clien
365		*/
366
367		/* report if user has &^>= etc. and set flags as needed in source_p */
368	<	report_and_set_user_flags(source_p, aconf);
368	>	report_and_set_user_flags(source_p, conf);
369	>
370	>	if (IsDead(source_p))
371	>	return;
372
373		/* Limit clients -
374		* We want to be able to have servers and F-line clients
#	Line 395 | Line 381 | register_local_user(struct Client *clien
381		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
382		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
383		{
384	<	sendto_realops_flags(UMODE_FULL, L_ALL,
384	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
385		"Too many clients, rejecting %s[%s].",
386	<	nick, source_p->host);
387	<	ServerStats->is_ref++;
386	>	source_p->name, source_p->host);
387	>	++ServerStats.is_ref;
388		exit_client(source_p, &me, "Sorry, server is full - try later");
389		return;
390		}
391
392		/* valid user name check */
393	<	if (valid_username(source_p->username) == 0)
393	>	if (valid_username(source_p->username, 1) == 0)
394		{
395		char tmpstr2[IRCD_BUFSIZE];
396
397	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
398	<	nick, source_p->username, source_p->host);
399	<	ServerStats->is_ref++;
400	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
397	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
398	>	"Invalid username: %s (%s@%s)",
399	>	source_p->name, source_p->username, source_p->host);
400	>	++ServerStats.is_ref;
401	>	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
402	>	source_p->username);
403		exit_client(source_p, &me, tmpstr2);
404		return;
405		}
406
419	–	assert(source_p == client_p);
420	–
407		if (check_xline(source_p))
408		return;
409
410	<	if (IsDead(client_p))
411	<	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);
410	>	while (hash_find_id((id = uid_get())) != NULL)
411	>	;
412
413	<	strlcpy(source_p->id, id, sizeof(source_p->id));
414	<	hash_add_id(source_p);
436	<	}
437	<
438	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
439	<	source_p->localClient->ip.ss_len, ipaddr,
440	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
413	>	strlcpy(source_p->id, id, sizeof(source_p->id));
414	>	hash_add_id(source_p);
415
416	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
417	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
418	<	nick, source_p->username, source_p->host,
416	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
417	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
418	>	source_p->name, source_p->username, source_p->host,
419		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
420	<	"255.255.255.255" : ipaddr, get_client_class(source_p),
421	<	source_p->info);
420	>	"255.255.255.255" : source_p->sockhost,
421	>	get_client_class(&source_p->localClient->confs),
422	>	source_p->info, source_p->id);
423
424	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
424	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
425		"CLICONN %s %s %s %s %s %s %s 0 %s",
426	<	nick, source_p->username, source_p->host,
426	>	source_p->name, source_p->username, source_p->host,
427		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
428	<	"255.255.255.255" : ipaddr,
429	<	get_client_class(source_p),
428	>	"255.255.255.255" : source_p->sockhost,
429	>	get_client_class(&source_p->localClient->confs),
430		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	<	"<hidden>" : source_p->client_host,
431	>	"<hidden>" : source_p->localClient->client_host,
432		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
433	<	"<hidden>" : source_p->client_server,
433	>	"<hidden>" : source_p->localClient->client_server,
434		source_p->info);
435
436
462	–	/* If they have died in send_* don't do anything. */
463	–	if (IsDead(source_p))
464	–	return;
465	–
437		if (ConfigFileEntry.invisible_on_connect)
438		{
439	<	source_p->umodes |= UMODE_INVISIBLE;
440	<	Count.invisi++;
439	>	AddUMode(source_p, UMODE_INVISIBLE);
440	>	++Count.invisi;
441		}
442
443		if ((++Count.local) > Count.max_loc)
#	Line 474 | Line 445 | register_local_user(struct Client *clien
445		Count.max_loc = Count.local;
446
447		if (!(Count.max_loc % 10))
448	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
448	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
449	>	"New Max Local Clients: %d",
450		Count.max_loc);
451		}
452
481	–	SetClient(source_p);
482	–
483	–	source_p->servptr = &me;
484	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
485	–
453		/* Increment our total user count here */
454		if (++Count.total > Count.max_tot)
455		Count.max_tot = Count.total;
456	<	Count.totalrestartcount++;
456	>	++Count.totalrestartcount;
457	>
458	>	assert(source_p->servptr == &me);
459	>	SetClient(source_p);
460	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
461
462		source_p->localClient->allow_read = MAX_FLOOD_BURST;
463
464	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
465	<	{
466	<	free_dlink_node(m);
467	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
497	<	}
498	<	else assert(0);
464	>	assert(dlinkFind(&unknown_list, source_p));
465	>
466	>	dlink_move_node(&source_p->localClient->lclient_node,
467	>	&unknown_list, &local_client_list);
468
469		user_welcome(source_p);
470		add_user_host(source_p->username, source_p->host, 0);
471		SetUserHost(source_p);
472
473	<	introduce_client(client_p, source_p);
473	>	introduce_client(source_p);
474		}
475
476		/* register_remote_user()
477		*
478	<	* inputs       - client_p directly connected client
510	<	*              - source_p remote or directly connected client
478	>	* inputs       - source_p remote or directly connected client
479		*              - username to register as
480		*              - host name to register as
481		*              - server name
#	Line 517 | Line 485 | register_local_user(struct Client *clien
485		*                is introduced by a server.
486		*/
487		void
488	<	register_remote_user(struct Client *client_p, struct Client *source_p,
488	>	register_remote_user(struct Client *source_p,
489		const char *username, const char *host, const char *server,
490		const char *realname)
491		{
#	Line 527 | Line 495 | register_remote_user(struct Client *clie
495		assert(source_p->username != username);
496
497		strlcpy(source_p->host, host, sizeof(source_p->host));
530	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
498		strlcpy(source_p->username, username, sizeof(source_p->username));
499
500		/*
501		* coming from another server, take the servers word for it
502		*/
503	<	source_p->servptr = find_server(server);
503	>	source_p->servptr = hash_find_server(server);
504
505	<	/* Super GhostDetect:
505	>	/*
506	>	* Super GhostDetect:
507		* If we can't find the server the user is supposed to be on,
508		* then simply blow the user away.        -Taner
509		*/
510		if (source_p->servptr == NULL)
511		{
512	<	sendto_realops_flags(UMODE_ALL, L_ALL,
512	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
513		"No server %s for user %s[%s@%s] from %s",
514		server, source_p->name, source_p->username,
515		source_p->host, source_p->from->name);
516	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
516	>	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
517
518	<	SetKilled(source_p);
518	>	AddFlag(source_p, FLAGS_KILLED);
519		exit_client(source_p, &me, "Ghosted Client");
520		return;
521		}
522
523		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
524		{
525	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
525	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
526		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
527	<	client_p->name, source_p->name, source_p->username,
527	>	source_p->from->name, source_p->name, source_p->username,
528		source_p->host, source_p->servptr->name,
529		target_p->name, target_p->from->name);
530	<	kill_client(client_p, source_p,
530	>	kill_client(source_p->from, source_p,
531		"%s (NICK from wrong direction (%s != %s))",
532		me.name, source_p->servptr->name, target_p->from->name);
533	<	SetKilled(source_p);
533	>	AddFlag(source_p, FLAGS_KILLED);
534		exit_client(source_p, &me, "USER server wrong direction");
535		return;
536		}
537
538	+	/*
539	+	* If the nick has been introduced by a services server,
540	+	* make it a service as well.
541	+	*/
542	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
543	+	AddFlag(source_p, FLAGS_SERVICE);
544	+
545		/* Increment our total user count here */
546		if (++Count.total > Count.max_tot)
547		Count.max_tot = Count.total;
548
574	–	++source_p->from->serv->dep_users;
575	–
549		SetClient(source_p);
550	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
550	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
551		add_user_host(source_p->username, source_p->host, 1);
552		SetUserHost(source_p);
553
554	<	introduce_client(client_p, source_p);
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>",
557	>	source_p->servptr->name,
558	>	source_p->name, source_p->username, source_p->host,
559	>	source_p->info, source_p->id);
560	>
561	>	introduce_client(source_p);
562		}
563
564		/* introduce_client()
565		*
566	<	* inputs       - client_p
587	<	*              - source_p
566	>	* inputs       - source_p
567		* output       - NONE
568		* side effects - This common function introduces a client to the rest
569		*                of the net, either from a local client connect or
570		*                from a remote connect.
571		*/
572		static void
573	<	introduce_client(struct Client *client_p, struct Client *source_p)
573	>	introduce_client(struct Client *source_p)
574		{
575		dlink_node *server_node = NULL;
576		static char ubuf[12];
#	Line 609 | Line 588 | introduce_client(struct Client *client_p
588		ubuf[1] = '\0';
589		}
590
591	<	/* arghhh one could try not introducing new nicks to ll leafs
613	<	* but then you have to introduce them "on the fly" in SJOIN
614	<	* not fun.
615	<	* Its not going to cost much more bandwidth to simply let new
616	<	* nicks just ride on through.
617	<	*/
618	<
619	<	/* We now introduce nicks "on the fly" in SJOIN anyway --
620	<	* you _need_ to if you aren't going to burst everyone initially.
621	<	*
622	<	* Only send to non CAP_LL servers, unless we're a lazylink leaf,
623	<	* in that case just send it to the uplink.
624	<	* -davidt
625	<	* rewritten to cope with SIDs .. eww eww eww --is
626	<	*/
627	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL) &&
628	<	client_p != uplink)
591	>	DLINK_FOREACH(server_node, serv_list.head)
592		{
593	<	if (IsCapable(uplink, CAP_TS6) && HasID(source_p))
593	>	struct Client *server = server_node->data;
594	>
595	>	if (server == source_p->from)
596	>	continue;
597	>
598	>	if (IsCapable(server, CAP_SVS))
599		{
600	<	sendto_one(uplink, ":%s UID %s %d %lu %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, source_p->info);
600	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
601	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
602	>	source_p->servptr->id,
603	>	source_p->name, source_p->hopcount+1,
604	>	(unsigned long)source_p->tsinfo,
605	>	ubuf, source_p->username, source_p->host,
606	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
607	>	"0" : source_p->sockhost, source_p->id,
608	>	source_p->svid,
609	>	source_p->info);
610	>	else
611	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
612	>	source_p->name, source_p->hopcount+1,
613	>	(unsigned long)source_p->tsinfo,
614	>	ubuf, source_p->username, source_p->host,
615	>	source_p->servptr->name, source_p->svid,
616	>	source_p->info);
617	>
618		}
619		else
620		{
642	–	sendto_one(uplink, "NICK %s %d %lu %s %s %s %s :%s",
643	–	source_p->name, source_p->hopcount+1,
644	–	(unsigned long)source_p->tsinfo,
645	–	ubuf, source_p->username, source_p->host,
646	–	source_p->servptr->name, source_p->info);
647	–	}
648	–	}
649	–	else
650	–	{
651	–	DLINK_FOREACH(server_node, serv_list.head)
652	–	{
653	–	struct Client *server = server_node->data;
654	–
655	–	if (IsCapable(server, CAP_LL) || server == client_p)
656	–	continue;
657	–
621		if (IsCapable(server, CAP_TS6) && HasID(source_p))
622		sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
623		source_p->servptr->id,
#	Line 689 | Line 652 | valid_hostname(const char *hostname)
652
653		assert(p != NULL);
654
655	<	if ('.' == *p || ':' == *p)
655	>	if (*p == '.' || *p == ':')
656		return 0;
657
658	<	while (*p)
696	<	{
658	>	for (; *p; ++p)
659		if (!IsHostChar(*p))
660		return 0;
699	–	p++;
700	–	}
661
662	<	return 1;
662	>	return p - hostname <= HOSTLEN;
663		}
664
665		/* valid_username()
#	Line 714 | Line 674 | valid_hostname(const char *hostname)
674		* style of username
675		*/
676		int
677	<	valid_username(const char *username)
677	>	valid_username(const char *username, const int local)
678		{
679		int dots      = 0;
680		const char *p = username;
681
682		assert(p != NULL);
683
684	<	if ('~' == *p)
684	>	if (*p == '~')
685		++p;
686
687	<	/* reject usernames that don't start with an alphanum
687	>	/*
688	>	* Reject usernames that don't start with an alphanum
689		* i.e. reject jokers who have '-@somehost' or '.@somehost'
690		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
691		*/
692		if (!IsAlNum(*p))
693		return 0;
694
695	<	while (*++p)
695	>	if (local)
696		{
697	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
697	>	while (*++p)
698		{
699	<	dots++;
700	<
701	<	if (dots > ConfigFileEntry.dots_in_ident)
702	<	return 0;
703	<	if (!IsUserChar(p[1]))
699	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
700	>	{
701	>	if (++dots > ConfigFileEntry.dots_in_ident)
702	>	return 0;
703	>	if (!IsUserChar(*(p + 1)))
704	>	return 0;
705	>	}
706	>	else if (!IsUserChar(*p))
707		return 0;
708		}
745	–	else if (!IsUserChar(*p))
746	–	return 0;
709		}
710	+	else
711	+	{
712	+	while (*++p)
713	+	if (!IsUserChar(*p))
714	+	return 0;
715	+	}
716	+
717	+	return  p - username <= USERLEN;;
718	+	}
719	+
720	+	/* clean_nick_name()
721	+	*
722	+	* input        - nickname
723	+	*              - whether it's a local nick (1) or remote (0)
724	+	* output       - none
725	+	* side effects - walks through the nickname, returning 0 if erroneous
726	+	*/
727	+	int
728	+	valid_nickname(const char *nickname, const int local)
729	+	{
730	+	const char *p = nickname;
731	+	assert(nickname && *nickname);
732	+
733	+	/* nicks can't start with a digit or - or be 0 length */
734	+	/* This closer duplicates behaviour of hybrid-6 */
735	+	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
736	+	return 0;
737	+
738	+	for (; *p; ++p)
739	+	if (!IsNickChar(*p))
740	+	return 0;
741
742	<	return 1;
742	>	return p - nickname <= NICKLEN;
743		}
744
745		/* report_and_set_user_flags()
746		*
747		* inputs       - pointer to source_p
748	<	*              - pointer to aconf for this user
748	>	*              - pointer to conf for this user
749		* output       - NONE
750		* side effects - Report to user any special flags
751		*                they are getting, and set them.
752		*/
753		static void
754	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
754	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
755		{
756		/* If this user is being spoofed, tell them so */
757	<	if (IsConfDoSpoofIp(aconf))
765	<	{
757	>	if (IsConfDoSpoofIp(conf))
758		sendto_one(source_p,
759	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
759	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
760		me.name, source_p->name);
769	–	}
761
762		/* If this user is in the exception class, Set it "E lined" */
763	<	if (IsConfExemptKline(aconf))
763	>	if (IsConfExemptKline(conf))
764		{
765		SetExemptKline(source_p);
766		sendto_one(source_p,
767	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
767	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
768		me.name, source_p->name);
769		}
770
771		/* The else here is to make sure that G line exempt users
772		* do not get noticed twice.
773		*/
774	<	else if (IsConfExemptGline(aconf))
774	>	else if (IsConfExemptGline(conf))
775		{
776		SetExemptGline(source_p);
777	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
777	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
778		me.name, source_p->name);
779		}
780
781	<	if (IsConfExemptResv(aconf))
781	>	if (IsConfExemptResv(conf))
782		{
783		SetExemptResv(source_p);
784	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
784	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
785		me.name, source_p->name);
786		}
787
788		/* If this user is exempt from user limits set it "F lined" */
789	<	if (IsConfExemptLimits(aconf))
789	>	if (IsConfExemptLimits(conf))
790		{
791		SetExemptLimits(source_p);
792		sendto_one(source_p,
793	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
793	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
794		me.name,source_p->name);
795		}
796
797	<	/* If this user is exempt from idle time outs */
807	<	if (IsConfIdlelined(aconf))
808	<	{
809	<	SetIdlelined(source_p);
810	<	sendto_one(source_p,
811	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
812	<	me.name, source_p->name);
813	<	}
814	<
815	<	if (IsConfCanFlood(aconf))
797	>	if (IsConfCanFlood(conf))
798		{
799		SetCanFlood(source_p);
800		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 821 | Line 803 | report_and_set_user_flags(struct Client
803		}
804		}
805
824	–	/* do_local_user()
825	–	*
826	–	* inputs       -
827	–	* output       - NONE
828	–	* side effects -
829	–	*/
830	–	void
831	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
832	–	const char *username, const char *host, const char *server,
833	–	const char *realname)
834	–	{
835	–	assert(source_p != NULL);
836	–	assert(source_p->username != username);
837	–
838	–	if (source_p == NULL)
839	–	return;
840	–
841	–	if (!IsUnknown(source_p))
842	–	{
843	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
844	–	me.name, nick);
845	–	return;
846	–	}
847	–
848	–	source_p->localClient->registration &= ~REG_NEED_USER;
849	–
850	–	/*
851	–	* don't take the clients word for it, ever
852	–	*/
853	–	source_p->servptr = &me;
854	–
855	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
856	–
857	–	/* stash for later */
858	–	strlcpy(source_p->client_host, host, sizeof(source_p->client_host));
859	–	strlcpy(source_p->client_server, server, sizeof(source_p->client_server));
860	–
861	–	if (!IsGotId(source_p))
862	–	{
863	–	/* save the username in the client
864	–	* If you move this you'll break ping cookies..you've been warned
865	–	*/
866	–	strlcpy(source_p->username, username, sizeof(source_p->username));
867	–	}
868	–
869	–	if (!source_p->localClient->registration)
870	–	/* NICK already received, now I have USER... */
871	–	register_local_user(client_p, source_p, source_p->name, username);
872	–	}
873	–
874	–	/* change_simple_umode()
875	–	*
876	–	* this callback can be hooked to allow special handling of
877	–	* certain usermodes
878	–	*/
879	–	static void *
880	–	change_simple_umode(va_list args)
881	–	{
882	–	struct Client *client_p;
883	–	struct Client *source_p;
884	–	int what;
885	–	unsigned int flag;
886	–
887	–	client_p = va_arg(args, struct Client *);
888	–	source_p = va_arg(args, struct Client *);
889	–	what = va_arg(args, int);
890	–	flag = va_arg(args, unsigned int);
891	–
892	–	if (what == MODE_ADD)
893	–	source_p->umodes |= flag;
894	–	else
895	–	source_p->umodes &= ~flag;
896	–
897	–	return NULL;
898	–	}
899	–
806		/* set_user_mode()
807		*
808		* added 15/10/91 By Darren Reed.
#	Line 906 | Line 812 | change_simple_umode(va_list args)
812		*/
813		void
814		set_user_mode(struct Client *client_p, struct Client *source_p,
815	<	int parc, char *parv[])
815	>	const int parc, char *parv[])
816		{
817		unsigned int flag, setflags;
818		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 923 | Line 829 | set_user_mode(struct Client *client_p, s
829		return;
830		}
831
832	<	if (IsServer(source_p))
927	<	{
928	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
929	<	parv[1], source_p->name);
930	<	return;
931	<	}
932	<
933	<	if (source_p != target_p || target_p->from != source_p->from)
832	>	if (source_p != target_p)
833		{
834		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
835		me.name, source_p->name);
#	Line 943 | Line 842 | set_user_mode(struct Client *client_p, s
842		*m++ = '+';
843
844		for (i = 0; i < 128; i++)
845	<	if (source_p->umodes & user_modes[i])
845	>	if (HasUMode(source_p, user_modes[i]))
846		*m++ = (char)i;
847		*m = '\0';
848
#	Line 952 | Line 851 | set_user_mode(struct Client *client_p, s
851		return;
852		}
853
955	–	execute_callback(entering_umode_cb, client_p, source_p);
956	–
854		/* find flags already set for user */
855		setflags = source_p->umodes;
856
#	Line 973 | Line 870 | set_user_mode(struct Client *client_p, s
870		case 'o':
871		if (what == MODE_ADD)
872		{
873	<	if (IsServer(client_p) && !IsOper(source_p))
873	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
874		{
875		++Count.oper;
876		SetOper(source_p);
#	Line 984 | Line 881 | set_user_mode(struct Client *client_p, s
881		/* Only decrement the oper counts if an oper to begin with
882		* found by Pat Szuta, Perly , perly@xnet.com
883		*/
884	<	if (!IsOper(source_p))
884	>	if (!HasUMode(source_p, UMODE_OPER))
885		break;
886
887		ClearOper(source_p);
991	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
888		Count.oper--;
889
890		if (MyConnect(source_p))
891		{
892		dlink_node *dm;
893
894	<	detach_conf(source_p, OPER_TYPE);
895	<	ClearOperFlags(source_p);
894	>	detach_conf(source_p, CONF_OPER);
895	>	ClrOFlag(source_p);
896	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
897
898		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
899		free_dlink_node(dm);
#	Line 1005 | Line 902 | set_user_mode(struct Client *client_p, s
902
903		break;
904
905	<	/* we may not get these,
906	<	* but they shouldnt be in default
1010	<	*/
1011	<	case ' ' :
1012	<	case '\n':
1013	<	case '\r':
1014	<	case '\t':
905	>	case 'r':  /* Only services may set +r */
906	>	case 'x':  /* Only services may set +x */
907		break;
908
909		default:
910		if ((flag = user_modes[(unsigned char)*m]))
911		{
912	<	if (MyConnect(source_p) && !IsOper(source_p) &&
912	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
913		(ConfigFileEntry.oper_only_umodes & flag))
1022	–	{
914		badflag = 1;
1024	–	}
915		else
916	<	execute_callback(umode_cb, client_p, source_p, what, flag);
916	>	{
917	>	if (what == MODE_ADD)
918	>	AddUMode(source_p, flag);
919	>	else
920	>	DelUMode(source_p, flag);
921	>	}
922		}
923		else
924		{
#	Line 1040 | Line 935 | set_user_mode(struct Client *client_p, s
935		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
936		me.name, source_p->name);
937
938	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
938	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
939	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
940		{
941		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
942		me.name, source_p->name);
943	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
943	>	DelUMode(source_p, UMODE_ADMIN);
944		}
945
946	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
1051	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
1052	<	{
1053	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1054	<	me.name, source_p->name);
1055	<	source_p->umodes &= ~UMODE_ADMIN;
1056	<	}
1057	<
1058	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
946	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
947		++Count.invisi;
948	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
948	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
949		--Count.invisi;
950
951		/*
#	Line 1082 | Line 970 | void
970		send_umode(struct Client *client_p, struct Client *source_p,
971		unsigned int old, unsigned int sendmask, char *umode_buf)
972		{
973	+	char *m = umode_buf;
974		int what = 0;
975		unsigned int i;
976		unsigned int flag;
1088	–	char *m = umode_buf;
977
978		/*
979		* build a string in umode_buf to represent the change in the user's
#	Line 1100 | Line 988 | send_umode(struct Client *client_p, stru
988		if (MyClient(source_p) && !(flag & sendmask))
989		continue;
990
991	<	if ((flag & old) && !(source_p->umodes & flag))
991	>	if ((flag & old) && !HasUMode(source_p, flag))
992		{
993		if (what == MODE_DEL)
994		*m++ = (char)i;
#	Line 1111 | Line 999 | send_umode(struct Client *client_p, stru
999		*m++ = (char)i;
1000		}
1001		}
1002	<	else if (!(flag & old) && (source_p->umodes & flag))
1002	>	else if (!(flag & old) && HasUMode(source_p, flag))
1003		{
1004		if (what == MODE_ADD)
1005		*m++ = (char)i;
#	Line 1145 | Line 1033 | send_umode_out(struct Client *client_p,
1033		char buf[IRCD_BUFSIZE] = { '\0' };
1034		dlink_node *ptr = NULL;
1035
1036	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1149	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1036	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1037
1038		if (buf[0])
1039		{
#	Line 1155 | Line 1042 | send_umode_out(struct Client *client_p,
1042		struct Client *target_p = ptr->data;
1043
1044		if ((target_p != client_p) && (target_p != source_p))
1045	<	{
1046	<	if ((!(ServerInfo.hub && IsCapable(target_p, CAP_LL))) ||
1047	<	(target_p->localClient->serverMask &
1161	<	source_p->lazyLinkClientExists))
1162	<	sendto_one(target_p, ":%s MODE %s :%s",
1163	<	ID_or_name(source_p, target_p),
1164	<	ID_or_name(source_p, target_p), buf);
1165	<	}
1045	>	sendto_one(target_p, ":%s MODE %s :%s",
1046	>	ID_or_name(source_p, target_p),
1047	>	ID_or_name(source_p, target_p), buf);
1048		}
1049		}
1050
#	Line 1170 | Line 1052 | send_umode_out(struct Client *client_p,
1052		send_umode(client_p, source_p, old, 0xffffffff, buf);
1053		}
1054
1055	+	void
1056	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1057	+	{
1058	+	dlink_node *ptr = NULL;
1059	+
1060	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1061	+	target_p->name, target_p->username, target_p->host);
1062	+
1063	+	if (IsUserHostIp(target_p))
1064	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1065	+
1066	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1067	+
1068	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1069	+	SetUserHost(target_p);
1070	+
1071	+	switch (what)
1072	+	{
1073	+	case MODE_ADD:
1074	+	AddUMode(target_p, UMODE_HIDDENHOST);
1075	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1076	+	break;
1077	+	case MODE_DEL:
1078	+	DelUMode(target_p, UMODE_HIDDENHOST);
1079	+
1080	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1081	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1082	+	break;
1083	+	default: break;
1084	+	}
1085	+
1086	+	if (MyClient(target_p))
1087	+	{
1088	+	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1089	+	target_p->name, target_p->username,
1090	+	target_p->host);
1091	+	clear_ban_cache_client(target_p);
1092	+	}
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	+	*p++ = 'o';
1103	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1104	+	}
1105	+
1106	+	if (has_member_flags(ms, CHFL_HALFOP)) {
1107	+	*p++ = 'h';
1108	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1109	+	}
1110	+
1111	+	if (has_member_flags(ms, CHFL_VOICE)) {
1112	+	*p++ = 'v';
1113	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1114	+	}
1115	+
1116	+	*p = '\0';
1117	+
1118	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1119	+	target_p->name, target_p->username, target_p->host,
1120	+	ms->chptr->chname);
1121	+	if (nickbuf[0])
1122	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1123	+	target_p->servptr->name, ms->chptr->chname,
1124	+	modebuf, nickbuf);
1125	+
1126	+	}
1127	+
1128	+	if (target_p->away[0])
1129	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1130	+	":%s!%s@%s AWAY :%s",
1131	+	target_p->name, target_p->username,
1132	+	target_p->host, target_p->away);
1133	+	}
1134	+
1135		/* user_welcome()
1136		*
1137		* inputs       - client pointer to client to welcome
#	Line 1210 | Line 1172 | user_welcome(struct Client *source_p)
1172
1173		if (ConfigFileEntry.short_motd)
1174		{
1175	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1176	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1175	>	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1176	>	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1177		sendto_one(source_p,
1178	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1179	<	"read it", source_p->name);
1178	>	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1179	>	"read it", me.name, source_p->name);
1180		sendto_one(source_p, form_str(RPL_MOTDSTART),
1181		me.name, source_p->name, me.name);
1182		sendto_one(source_p, form_str(RPL_MOTD),
#	Line 1236 | Line 1198 | user_welcome(struct Client *source_p)
1198		static int
1199		check_xline(struct Client *source_p)
1200		{
1201	<	struct ConfItem *conf = NULL;
1201	>	struct MaskItem *conf = NULL;
1202		const char *reason = NULL;
1203
1204	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1243	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1204	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1205		{
1206	<	struct MatchItem *reg = map_to_conf(conf);
1246	<
1247	<	++reg->count;
1206	>	++conf->count;
1207
1208	<	if (reg->reason != NULL)
1209	<	reason = reg->reason;
1208	>	if (conf->reason != NULL)
1209	>	reason = conf->reason;
1210		else
1211		reason = "No Reason";
1212
1213	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1213	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1214		"X-line Rejecting [%s] [%s], user %s [%s]",
1215		source_p->info, reason,
1216		get_client_name(source_p, HIDE_IP),
1217		source_p->sockhost);
1218
1219	<	ServerStats->is_ref++;
1220	<	if (REJECT_HOLD_TIME > 0)
1262	<	{
1263	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1264	<	me.name, source_p->name);
1265	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1266	<	SetCaptured(source_p);
1267	<	}
1268	<	else
1269	<	exit_client(source_p, &me, "Bad user info");
1219	>	++ServerStats.is_ref;
1220	>	exit_client(source_p, &me, "Bad user info");
1221		return 1;
1222		}
1223
#	Line 1277 | Line 1228 | check_xline(struct Client *source_p)
1228		*
1229		* inputs       - pointer to given client to oper
1230		* output       - NONE
1231	<	* side effects - Blindly opers up given source_p, using aconf info
1231	>	* side effects - Blindly opers up given source_p, using conf info
1232		*                all checks on passwords have already been done.
1233		*                This could also be used by rsa oper routines.
1234		*/
1235		void
1236		oper_up(struct Client *source_p)
1237		{
1238	<	unsigned int old = source_p->umodes;
1239	<	const char *operprivs = "";
1289	<	const struct AccessItem *oconf = NULL;
1238	>	const unsigned int old = source_p->umodes;
1239	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1240
1241		assert(source_p->localClient->confs.head);
1292	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1242
1243		++Count.oper;
1244		SetOper(source_p);
1245
1246	<	if (oconf->modes)
1247	<	source_p->umodes |= oconf->modes;
1246	>	if (conf->modes)
1247	>	AddUMode(source_p, conf->modes);
1248		else if (ConfigFileEntry.oper_umodes)
1249	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1301	<	else
1302	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1303	<	UMODE_WALLOP|UMODE_LOCOPS);
1249	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1250
1251	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1251	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1252		++Count.invisi;
1253	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1253	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1254		--Count.invisi;
1255
1256		assert(dlinkFind(&oper_list, source_p) == NULL);
1257		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1258
1259	<	operprivs = oper_privs_as_string(oconf->port);
1314	<
1315	<	SetOFlag(source_p, oconf->port);
1259	>	AddOFlag(source_p, conf->port);
1260
1261	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1262	<	source_p->umodes |= UMODE_ADMIN;
1319	<	if (!IsOperN(source_p))
1320	<	source_p->umodes &= ~UMODE_NCHANGE;
1261	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1262	>	AddUMode(source_p, UMODE_ADMIN);
1263
1264	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1265	<	source_p->name, source_p->username, source_p->host);
1264	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1265	>	get_oper_name(source_p));
1266		send_umode_out(source_p, source_p, old);
1267		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1326	–	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1327	–	me.name, source_p->name, operprivs);
1328	–	send_message_file(source_p, &ConfigFileEntry.opermotd);
1268		}
1269
1270		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1333 | Line 1272 | static char new_uid[TOTALSIDUID + 1];
1272		int
1273		valid_sid(const char *sid)
1274		{
1336	–
1275		if (strlen(sid) == IRC_MAXSID)
1276		if (IsDigit(*sid))
1277		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1354 | Line 1292 | valid_sid(const char *sid)
1292		void
1293		init_uid(void)
1294		{
1295	<	int i;
1295	>	unsigned int i;
1296
1297		memset(new_uid, 0, sizeof(new_uid));
1298
1299	<	if (ServerInfo.sid != NULL)
1362	<	{
1299	>	if (!EmptyString(ServerInfo.sid))
1300		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1364	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1301
1302	<	hash_add_id(&me);
1367	<	}
1368	<
1369	<	for (i = 0; i < IRC_MAXSID; i++)
1302	>	for (i = 0; i < IRC_MAXSID; ++i)
1303		if (new_uid[i] == '\0')
1304		new_uid[i] = 'A';
1305
#	Line 1376 | Line 1309 | init_uid(void)
1309		* -Dianora
1310		*/
1311		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1379	–
1380	–	entering_umode_cb = register_callback("entering_umode", NULL);
1381	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1382	–	uid_get_cb = register_callback("uid_get", uid_get);
1312		}
1313
1314		/*
#	Line 1422 | Line 1351 | add_one_to_uid(int i)
1351		* output       - new UID is returned to caller
1352		* side effects - new_uid is incremented by one.
1353		*/
1354	<	static void *
1355	<	uid_get(va_list args)
1354	>	static const char *
1355	>	uid_get(void)
1356		{
1357		add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1358		return new_uid;
#	Line 1446 | Line 1375 | init_isupport(void)
1375		add_isupport("DEAF", "D", -1);
1376		add_isupport("KICKLEN", NULL, KICKLEN);
1377		add_isupport("MODES", NULL, MAXMODEPARAMS);
1449	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1378		#ifdef HALFOPS
1379		add_isupport("PREFIX", "(ohv)@%+", -1);
1380		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1454 | Line 1382 | init_isupport(void)
1382		add_isupport("PREFIX", "(ov)@+", -1);
1383		add_isupport("STATUSMSG", "@+", -1);
1384		#endif
1457	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1385		}
1386
1387		/*
#	Line 1489 | Line 1416 | add_isupport(const char *name, const cha
1416		dlinkAddTail(support, &support->node, &support_list);
1417		}
1418
1419	<	DupString(support->name, name);
1419	>	support->name = xstrdup(name);
1420		if (options != NULL)
1421	<	DupString(support->options, options);
1421	>	support->options = xstrdup(options);
1422		support->number = n;
1423
1424		rebuild_isupport_message_line();
#	Line 1550 | Line 1477 | rebuild_isupport_message_line(void)
1477		{
1478		struct Isupport *support = ptr->data;
1479
1480	<	p += (n = ircsprintf(p, "%s", support->name));
1480	>	p += (n = sprintf(p, "%s", support->name));
1481		len += n;
1482
1483		if (support->options != NULL)
1484		{
1485	<	p += (n = ircsprintf(p, "=%s", support->options));
1485	>	p += (n = sprintf(p, "=%s", support->options));
1486		len += n;
1487		}
1488
1489		if (support->number > 0)
1490		{
1491	<	p += (n = ircsprintf(p, "=%d", support->number));
1491	>	p += (n = sprintf(p, "=%d", support->number));
1492		len += n;
1493		}
1494

Diff Legend

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