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 885 by michael, Wed Oct 31 18:09:24 2007 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2159 by michael, Sun Jun 2 18:22:01 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 99 | Line 88 | unsigned int user_modes[256] =
88		UMODE_CCONN_FULL,   /* 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 */
103	>	UMODE_REGONLY,      /* R */
104		0,                  /* S */
105		0,                  /* T */
106		0,                  /* U */
#	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);
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	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
427	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
428		"CLICONN %s %s %s %s %s %s %s 0 %s",
429	<	nick, source_p->username, source_p->host,
429	>	source_p->name, source_p->username, source_p->host,
430		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	<	"255.255.255.255" : ipaddr,
432	<	get_client_class(source_p),
431	>	"255.255.255.255" : source_p->sockhost,
432	>	get_client_class(&source_p->localClient->confs),
433		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434	<	"<hidden>" : source_p->client_host,
434	>	"<hidden>" : source_p->localClient->client_host,
435		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436	<	"<hidden>" : source_p->client_server,
436	>	"<hidden>" : source_p->localClient->client_server,
437		source_p->info);
438
439
462	–	/* If they have died in send_* don't do anything. */
463	–	if (IsDead(source_p))
464	–	return;
465	–
440		if (ConfigFileEntry.invisible_on_connect)
441		{
442	<	source_p->umodes |= UMODE_INVISIBLE;
443	<	Count.invisi++;
442	>	AddUMode(source_p, UMODE_INVISIBLE);
443	>	++Count.invisi;
444		}
445
446		if ((++Count.local) > Count.max_loc)
#	Line 474 | Line 448 | register_local_user(struct Client *clien
448		Count.max_loc = Count.local;
449
450		if (!(Count.max_loc % 10))
451	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
451	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
452	>	"New Max Local Clients: %d",
453		Count.max_loc);
454		}
455
481	–	SetClient(source_p);
482	–
483	–	source_p->servptr = &me;
484	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
485	–
456		/* Increment our total user count here */
457		if (++Count.total > Count.max_tot)
458		Count.max_tot = Count.total;
459	<	Count.totalrestartcount++;
459	>	++Count.totalrestartcount;
460	>
461	>	assert(source_p->servptr == &me);
462	>	SetClient(source_p);
463	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
464
465		source_p->localClient->allow_read = MAX_FLOOD_BURST;
466
467	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
468	<	{
469	<	free_dlink_node(m);
470	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
497	<	}
498	<	else assert(0);
467	>	assert(dlinkFind(&unknown_list, source_p));
468	>
469	>	dlink_move_node(&source_p->localClient->lclient_node,
470	>	&unknown_list, &local_client_list);
471
472		user_welcome(source_p);
473		add_user_host(source_p->username, source_p->host, 0);
474		SetUserHost(source_p);
475
476	<	introduce_client(client_p, source_p);
476	>	introduce_client(source_p);
477		}
478
479		/* register_remote_user()
480		*
481	<	* inputs       - client_p directly connected client
510	<	*              - source_p remote or directly connected client
481	>	* inputs       - source_p remote or directly connected client
482		*              - username to register as
483		*              - host name to register as
484		*              - server name
#	Line 517 | Line 488 | register_local_user(struct Client *clien
488		*                is introduced by a server.
489		*/
490		void
491	<	register_remote_user(struct Client *client_p, struct Client *source_p,
491	>	register_remote_user(struct Client *source_p,
492		const char *username, const char *host, const char *server,
493		const char *realname)
494		{
#	Line 527 | Line 498 | register_remote_user(struct Client *clie
498		assert(source_p->username != username);
499
500		strlcpy(source_p->host, host, sizeof(source_p->host));
530	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
501		strlcpy(source_p->username, username, sizeof(source_p->username));
502
503		/*
504		* coming from another server, take the servers word for it
505		*/
506	<	source_p->servptr = find_server(server);
506	>	source_p->servptr = hash_find_server(server);
507
508	<	/* Super GhostDetect:
508	>	/*
509	>	* Super GhostDetect:
510		* If we can't find the server the user is supposed to be on,
511		* then simply blow the user away.        -Taner
512		*/
513		if (source_p->servptr == NULL)
514		{
515	<	sendto_realops_flags(UMODE_ALL, L_ALL,
515	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
516		"No server %s for user %s[%s@%s] from %s",
517		server, source_p->name, source_p->username,
518		source_p->host, source_p->from->name);
519	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
519	>	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
520
521	<	SetKilled(source_p);
521	>	AddFlag(source_p, FLAGS_KILLED);
522		exit_client(source_p, &me, "Ghosted Client");
523		return;
524		}
525
526		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
527		{
528	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
528	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
529		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
530	<	client_p->name, source_p->name, source_p->username,
530	>	source_p->from->name, source_p->name, source_p->username,
531		source_p->host, source_p->servptr->name,
532		target_p->name, target_p->from->name);
533	<	kill_client(client_p, source_p,
533	>	kill_client(source_p->from, source_p,
534		"%s (NICK from wrong direction (%s != %s))",
535		me.name, source_p->servptr->name, target_p->from->name);
536	<	SetKilled(source_p);
536	>	AddFlag(source_p, FLAGS_KILLED);
537		exit_client(source_p, &me, "USER server wrong direction");
538		return;
539		}
540
541	+	/*
542	+	* If the nick has been introduced by a services server,
543	+	* make it a service as well.
544	+	*/
545	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
546	+	AddFlag(source_p, FLAGS_SERVICE);
547	+
548		/* Increment our total user count here */
549		if (++Count.total > Count.max_tot)
550		Count.max_tot = Count.total;
551
574	–	++source_p->from->serv->dep_users;
575	–
552		SetClient(source_p);
553	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
553	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
554		add_user_host(source_p->username, source_p->host, 1);
555		SetUserHost(source_p);
556
557	<	introduce_client(client_p, source_p);
557	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
558	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
559	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
560	>	source_p->servptr->name,
561	>	source_p->name, source_p->username, source_p->host,
562	>	source_p->info, source_p->id);
563	>
564	>	introduce_client(source_p);
565		}
566
567		/* introduce_client()
568		*
569	<	* inputs       - client_p
587	<	*              - source_p
569	>	* inputs       - source_p
570		* output       - NONE
571		* side effects - This common function introduces a client to the rest
572		*                of the net, either from a local client connect or
573		*                from a remote connect.
574		*/
575		static void
576	<	introduce_client(struct Client *client_p, struct Client *source_p)
576	>	introduce_client(struct Client *source_p)
577		{
578		dlink_node *server_node = NULL;
579		static char ubuf[12];
#	Line 613 | Line 595 | introduce_client(struct Client *client_p
595		{
596		struct Client *server = server_node->data;
597
598	<	if (server == client_p)
598	>	if (server == source_p->from)
599		continue;
600
601	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
602	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
603	<	source_p->servptr->id,
604	<	source_p->name, source_p->hopcount+1,
605	<	(unsigned long)source_p->tsinfo,
606	<	ubuf, source_p->username, source_p->host,
607	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
608	<	"0" : source_p->sockhost, source_p->id, source_p->info);
601	>	if (IsCapable(server, CAP_SVS))
602	>	{
603	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
604	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
605	>	source_p->servptr->id,
606	>	source_p->name, source_p->hopcount+1,
607	>	(unsigned long)source_p->tsinfo,
608	>	ubuf, source_p->username, source_p->host,
609	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
610	>	"0" : source_p->sockhost, source_p->id,
611	>	source_p->svid,
612	>	source_p->info);
613	>	else
614	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
615	>	source_p->name, source_p->hopcount+1,
616	>	(unsigned long)source_p->tsinfo,
617	>	ubuf, source_p->username, source_p->host,
618	>	source_p->servptr->name, source_p->svid,
619	>	source_p->info);
620	>
621	>	}
622		else
623	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
624	<	source_p->name, source_p->hopcount+1,
625	<	(unsigned long)source_p->tsinfo,
626	<	ubuf, source_p->username, source_p->host,
627	<	source_p->servptr->name, source_p->info);
623	>	{
624	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
625	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
626	>	source_p->servptr->id,
627	>	source_p->name, source_p->hopcount+1,
628	>	(unsigned long)source_p->tsinfo,
629	>	ubuf, source_p->username, source_p->host,
630	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
631	>	"0" : source_p->sockhost, source_p->id, source_p->info);
632	>	else
633	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
634	>	source_p->name, source_p->hopcount+1,
635	>	(unsigned long)source_p->tsinfo,
636	>	ubuf, source_p->username, source_p->host,
637	>	source_p->servptr->name, source_p->info);
638	>	}
639		}
640		}
641
#	Line 649 | Line 655 | valid_hostname(const char *hostname)
655
656		assert(p != NULL);
657
658	<	if ('.' == *p || ':' == *p)
658	>	if (*p == '.' || *p == ':')
659		return 0;
660
661	<	while (*p)
656	<	{
661	>	for (; *p; ++p)
662		if (!IsHostChar(*p))
663		return 0;
659	–	p++;
660	–	}
664
665	<	return 1;
665	>	return p - hostname <= HOSTLEN;
666		}
667
668		/* valid_username()
#	Line 674 | Line 677 | valid_hostname(const char *hostname)
677		* style of username
678		*/
679		int
680	<	valid_username(const char *username)
680	>	valid_username(const char *username, const int local)
681		{
682		int dots      = 0;
683		const char *p = username;
684
685		assert(p != NULL);
686
687	<	if ('~' == *p)
687	>	if (*p == '~')
688		++p;
689
690	<	/* reject usernames that don't start with an alphanum
690	>	/*
691	>	* Reject usernames that don't start with an alphanum
692		* i.e. reject jokers who have '-@somehost' or '.@somehost'
693		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
694		*/
695		if (!IsAlNum(*p))
696		return 0;
697
698	<	while (*++p)
698	>	if (local)
699		{
700	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
700	>	while (*++p)
701		{
702	<	dots++;
703	<
704	<	if (dots > ConfigFileEntry.dots_in_ident)
705	<	return 0;
706	<	if (!IsUserChar(p[1]))
702	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
703	>	{
704	>	if (++dots > ConfigFileEntry.dots_in_ident)
705	>	return 0;
706	>	if (!IsUserChar(*(p + 1)))
707	>	return 0;
708	>	}
709	>	else if (!IsUserChar(*p))
710		return 0;
711		}
712	<	else if (!IsUserChar(*p))
713	<	return 0;
712	>	}
713	>	else
714	>	{
715	>	while (*++p)
716	>	if (!IsUserChar(*p))
717	>	return 0;
718		}
719
720	<	return 1;
720	>	return  p - username <= USERLEN;;
721	>	}
722	>
723	>	/* clean_nick_name()
724	>	*
725	>	* input        - nickname
726	>	*              - whether it's a local nick (1) or remote (0)
727	>	* output       - none
728	>	* side effects - walks through the nickname, returning 0 if erroneous
729	>	*/
730	>	int
731	>	valid_nickname(const char *nickname, const int local)
732	>	{
733	>	const char *p = nickname;
734	>	assert(nickname && *nickname);
735	>
736	>	/* nicks can't start with a digit or - or be 0 length */
737	>	/* This closer duplicates behaviour of hybrid-6 */
738	>	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
739	>	return 0;
740	>
741	>	for (; *p; ++p)
742	>	if (!IsNickChar(*p))
743	>	return 0;
744	>
745	>	return p - nickname <= NICKLEN;
746		}
747
748		/* report_and_set_user_flags()
749		*
750		* inputs       - pointer to source_p
751	<	*              - pointer to aconf for this user
751	>	*              - pointer to conf for this user
752		* output       - NONE
753		* side effects - Report to user any special flags
754		*                they are getting, and set them.
755		*/
756		static void
757	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
757	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
758		{
759		/* If this user is being spoofed, tell them so */
760	<	if (IsConfDoSpoofIp(aconf))
725	<	{
760	>	if (IsConfDoSpoofIp(conf))
761		sendto_one(source_p,
762	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
762	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
763		me.name, source_p->name);
729	–	}
764
765		/* If this user is in the exception class, Set it "E lined" */
766	<	if (IsConfExemptKline(aconf))
766	>	if (IsConfExemptKline(conf))
767		{
768		SetExemptKline(source_p);
769		sendto_one(source_p,
770	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
770	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
771		me.name, source_p->name);
772		}
773
774		/* The else here is to make sure that G line exempt users
775		* do not get noticed twice.
776		*/
777	<	else if (IsConfExemptGline(aconf))
777	>	else if (IsConfExemptGline(conf))
778		{
779		SetExemptGline(source_p);
780	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
780	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
781		me.name, source_p->name);
782		}
783
784	<	if (IsConfExemptResv(aconf))
784	>	if (IsConfExemptResv(conf))
785		{
786		SetExemptResv(source_p);
787	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
787	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
788		me.name, source_p->name);
789		}
790
791		/* If this user is exempt from user limits set it "F lined" */
792	<	if (IsConfExemptLimits(aconf))
792	>	if (IsConfExemptLimits(conf))
793		{
794		SetExemptLimits(source_p);
795		sendto_one(source_p,
796	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
796	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
797		me.name,source_p->name);
798		}
799
800	<	/* If this user is exempt from idle time outs */
767	<	if (IsConfIdlelined(aconf))
768	<	{
769	<	SetIdlelined(source_p);
770	<	sendto_one(source_p,
771	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
772	<	me.name, source_p->name);
773	<	}
774	<
775	<	if (IsConfCanFlood(aconf))
800	>	if (IsConfCanFlood(conf))
801		{
802		SetCanFlood(source_p);
803		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 781 | Line 806 | report_and_set_user_flags(struct Client
806		}
807		}
808
784	–	/* do_local_user()
785	–	*
786	–	* inputs       -
787	–	* output       - NONE
788	–	* side effects -
789	–	*/
790	–	void
791	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
792	–	const char *username, const char *host, const char *server,
793	–	const char *realname)
794	–	{
795	–	assert(source_p != NULL);
796	–	assert(source_p->username != username);
797	–
798	–	if (source_p == NULL)
799	–	return;
800	–
801	–	if (!IsUnknown(source_p))
802	–	{
803	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
804	–	me.name, nick);
805	–	return;
806	–	}
807	–
808	–	source_p->localClient->registration &= ~REG_NEED_USER;
809	–
810	–	/*
811	–	* don't take the clients word for it, ever
812	–	*/
813	–	source_p->servptr = &me;
814	–
815	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
816	–
817	–	/* stash for later */
818	–	strlcpy(source_p->client_host, host, sizeof(source_p->client_host));
819	–	strlcpy(source_p->client_server, server, sizeof(source_p->client_server));
820	–
821	–	if (!IsGotId(source_p))
822	–	{
823	–	/* save the username in the client
824	–	* If you move this you'll break ping cookies..you've been warned
825	–	*/
826	–	strlcpy(source_p->username, username, sizeof(source_p->username));
827	–	}
828	–
829	–	if (!source_p->localClient->registration)
830	–	/* NICK already received, now I have USER... */
831	–	register_local_user(client_p, source_p, source_p->name, username);
832	–	}
833	–
834	–	/* change_simple_umode()
835	–	*
836	–	* this callback can be hooked to allow special handling of
837	–	* certain usermodes
838	–	*/
839	–	static void *
840	–	change_simple_umode(va_list args)
841	–	{
842	–	struct Client *client_p;
843	–	struct Client *source_p;
844	–	int what;
845	–	unsigned int flag;
846	–
847	–	client_p = va_arg(args, struct Client *);
848	–	source_p = va_arg(args, struct Client *);
849	–	what = va_arg(args, int);
850	–	flag = va_arg(args, unsigned int);
851	–
852	–	if (what == MODE_ADD)
853	–	source_p->umodes |= flag;
854	–	else
855	–	source_p->umodes &= ~flag;
856	–
857	–	return NULL;
858	–	}
859	–
809		/* set_user_mode()
810		*
811		* added 15/10/91 By Darren Reed.
#	Line 866 | Line 815 | change_simple_umode(va_list args)
815		*/
816		void
817		set_user_mode(struct Client *client_p, struct Client *source_p,
818	<	int parc, char *parv[])
818	>	const int parc, char *parv[])
819		{
820		unsigned int flag, setflags;
821		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 883 | Line 832 | set_user_mode(struct Client *client_p, s
832		return;
833		}
834
835	<	if (IsServer(source_p))
887	<	{
888	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
889	<	parv[1], source_p->name);
890	<	return;
891	<	}
892	<
893	<	if (source_p != target_p || target_p->from != source_p->from)
835	>	if (source_p != target_p)
836		{
837		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
838		me.name, source_p->name);
#	Line 903 | Line 845 | set_user_mode(struct Client *client_p, s
845		*m++ = '+';
846
847		for (i = 0; i < 128; i++)
848	<	if (source_p->umodes & user_modes[i])
848	>	if (HasUMode(source_p, user_modes[i]))
849		*m++ = (char)i;
850		*m = '\0';
851
#	Line 912 | Line 854 | set_user_mode(struct Client *client_p, s
854		return;
855		}
856
915	–	execute_callback(entering_umode_cb, client_p, source_p);
916	–
857		/* find flags already set for user */
858		setflags = source_p->umodes;
859
#	Line 933 | Line 873 | set_user_mode(struct Client *client_p, s
873		case 'o':
874		if (what == MODE_ADD)
875		{
876	<	if (IsServer(client_p) && !IsOper(source_p))
876	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
877		{
878		++Count.oper;
879		SetOper(source_p);
#	Line 944 | Line 884 | set_user_mode(struct Client *client_p, s
884		/* Only decrement the oper counts if an oper to begin with
885		* found by Pat Szuta, Perly , perly@xnet.com
886		*/
887	<	if (!IsOper(source_p))
887	>	if (!HasUMode(source_p, UMODE_OPER))
888		break;
889
890		ClearOper(source_p);
951	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
891		Count.oper--;
892
893		if (MyConnect(source_p))
894		{
895		dlink_node *dm;
896
897	<	detach_conf(source_p, OPER_TYPE);
898	<	ClearOperFlags(source_p);
897	>	detach_conf(source_p, CONF_OPER);
898	>	ClrOFlag(source_p);
899	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
900
901		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
902		free_dlink_node(dm);
#	Line 965 | Line 905 | set_user_mode(struct Client *client_p, s
905
906		break;
907
908	<	/* we may not get these,
909	<	* but they shouldnt be in default
970	<	*/
971	<	case ' ' :
972	<	case '\n':
973	<	case '\r':
974	<	case '\t':
908	>	case 'r':  /* Only services may set +r */
909	>	case 'x':  /* Only services may set +x */
910		break;
911
912		default:
913		if ((flag = user_modes[(unsigned char)*m]))
914		{
915	<	if (MyConnect(source_p) && !IsOper(source_p) &&
915	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
916		(ConfigFileEntry.oper_only_umodes & flag))
982	–	{
917		badflag = 1;
984	–	}
918		else
919	<	execute_callback(umode_cb, client_p, source_p, what, flag);
919	>	{
920	>	if (what == MODE_ADD)
921	>	AddUMode(source_p, flag);
922	>	else
923	>	DelUMode(source_p, flag);
924	>	}
925		}
926		else
927		{
#	Line 1000 | Line 938 | set_user_mode(struct Client *client_p, s
938		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
939		me.name, source_p->name);
940
941	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
942	<	{
1005	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1006	<	me.name, source_p->name);
1007	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1008	<	}
1009	<
1010	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
1011	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
941	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
942	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
943		{
944		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
945		me.name, source_p->name);
946	<	source_p->umodes &= ~UMODE_ADMIN;
946	>	DelUMode(source_p, UMODE_ADMIN);
947		}
948
949	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
949	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
950		++Count.invisi;
951	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
951	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
952		--Count.invisi;
953
954		/*
#	Line 1042 | Line 973 | void
973		send_umode(struct Client *client_p, struct Client *source_p,
974		unsigned int old, unsigned int sendmask, char *umode_buf)
975		{
976	+	char *m = umode_buf;
977		int what = 0;
978		unsigned int i;
979		unsigned int flag;
1048	–	char *m = umode_buf;
980
981		/*
982		* build a string in umode_buf to represent the change in the user's
#	Line 1060 | Line 991 | send_umode(struct Client *client_p, stru
991		if (MyClient(source_p) && !(flag & sendmask))
992		continue;
993
994	<	if ((flag & old) && !(source_p->umodes & flag))
994	>	if ((flag & old) && !HasUMode(source_p, flag))
995		{
996		if (what == MODE_DEL)
997		*m++ = (char)i;
#	Line 1071 | Line 1002 | send_umode(struct Client *client_p, stru
1002		*m++ = (char)i;
1003		}
1004		}
1005	<	else if (!(flag & old) && (source_p->umodes & flag))
1005	>	else if (!(flag & old) && HasUMode(source_p, flag))
1006		{
1007		if (what == MODE_ADD)
1008		*m++ = (char)i;
#	Line 1105 | Line 1036 | send_umode_out(struct Client *client_p,
1036		char buf[IRCD_BUFSIZE] = { '\0' };
1037		dlink_node *ptr = NULL;
1038
1039	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1109	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1039	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1040
1041		if (buf[0])
1042		{
#	Line 1125 | Line 1055 | send_umode_out(struct Client *client_p,
1055		send_umode(client_p, source_p, old, 0xffffffff, buf);
1056		}
1057
1058	+	void
1059	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1060	+	{
1061	+	dlink_node *ptr = NULL;
1062	+
1063	+	if (!strcmp(target_p->host, hostname))
1064	+	return;
1065	+
1066	+	switch (what)
1067	+	{
1068	+	case MODE_ADD:
1069	+	AddUMode(target_p, UMODE_HIDDENHOST);
1070	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1071	+	break;
1072	+	case MODE_DEL:
1073	+	DelUMode(target_p, UMODE_HIDDENHOST);
1074	+
1075	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1076	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1077	+	break;
1078	+	default: return;
1079	+	}
1080	+
1081	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1082	+	target_p->name, target_p->username, target_p->host);
1083	+
1084	+	if (IsUserHostIp(target_p))
1085	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1086	+
1087	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1088	+
1089	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1090	+	SetUserHost(target_p);
1091	+
1092	+	if (MyClient(target_p))
1093	+	{
1094	+	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1095	+	target_p->name, target_p->host);
1096	+	clear_ban_cache_client(target_p);
1097	+	}
1098	+
1099	+	DLINK_FOREACH(ptr, target_p->channel.head)
1100	+	{
1101	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1102	+	char *p = modebuf;
1103	+	int len = 0;
1104	+	const struct Membership *ms = ptr->data;
1105	+
1106	+	if (has_member_flags(ms, CHFL_CHANOP)) {
1107	+	*p++ = 'o';
1108	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1109	+	}
1110	+
1111	+	if (has_member_flags(ms, CHFL_HALFOP)) {
1112	+	*p++ = 'h';
1113	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1114	+	}
1115	+
1116	+	if (has_member_flags(ms, CHFL_VOICE)) {
1117	+	*p++ = 'v';
1118	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1119	+	}
1120	+
1121	+	*p = '\0';
1122	+
1123	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1124	+	target_p->name, target_p->username, target_p->host,
1125	+	ms->chptr->chname);
1126	+	if (nickbuf[0])
1127	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1128	+	target_p->servptr->name, ms->chptr->chname,
1129	+	modebuf, nickbuf);
1130	+
1131	+	}
1132	+
1133	+	if (target_p->away[0])
1134	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1135	+	":%s!%s@%s AWAY :%s",
1136	+	target_p->name, target_p->username,
1137	+	target_p->host, target_p->away);
1138	+	}
1139	+
1140		/* user_welcome()
1141		*
1142		* inputs       - client pointer to client to welcome
#	Line 1162 | Line 1174 | user_welcome(struct Client *source_p)
1174		source_p->name, source_p->id);
1175
1176		show_lusers(source_p);
1177	<
1166	<	if (ConfigFileEntry.short_motd)
1167	<	{
1168	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1169	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1170	<	sendto_one(source_p,
1171	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1172	<	"read it", source_p->name);
1173	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1174	<	me.name, source_p->name, me.name);
1175	<	sendto_one(source_p, form_str(RPL_MOTD),
1176	<	me.name, source_p->name,
1177	<	"*** This is the short motd ***");
1178	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1179	<	me.name, source_p->name);
1180	<	}
1181	<	else
1182	<	send_message_file(source_p, &ConfigFileEntry.motd);
1177	>	motd_signon(source_p);
1178		}
1179
1180		/* check_xline()
#	Line 1191 | Line 1186 | user_welcome(struct Client *source_p)
1186		static int
1187		check_xline(struct Client *source_p)
1188		{
1189	<	struct ConfItem *conf = NULL;
1189	>	struct MaskItem *conf = NULL;
1190		const char *reason = NULL;
1191
1192	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1198	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1192	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1193		{
1194	<	struct MatchItem *reg = map_to_conf(conf);
1194	>	++conf->count;
1195
1196	<	++reg->count;
1197	<
1204	<	if (reg->reason != NULL)
1205	<	reason = reg->reason;
1196	>	if (conf->reason != NULL)
1197	>	reason = conf->reason;
1198		else
1199		reason = "No Reason";
1200
1201	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1201	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1202		"X-line Rejecting [%s] [%s], user %s [%s]",
1203		source_p->info, reason,
1204		get_client_name(source_p, HIDE_IP),
1205		source_p->sockhost);
1206
1207	<	ServerStats->is_ref++;
1208	<	if (REJECT_HOLD_TIME > 0)
1217	<	{
1218	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1219	<	me.name, source_p->name);
1220	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1221	<	SetCaptured(source_p);
1222	<	}
1223	<	else
1224	<	exit_client(source_p, &me, "Bad user info");
1207	>	++ServerStats.is_ref;
1208	>	exit_client(source_p, &me, "Bad user info");
1209		return 1;
1210		}
1211
#	Line 1232 | Line 1216 | check_xline(struct Client *source_p)
1216		*
1217		* inputs       - pointer to given client to oper
1218		* output       - NONE
1219	<	* side effects - Blindly opers up given source_p, using aconf info
1219	>	* side effects - Blindly opers up given source_p, using conf info
1220		*                all checks on passwords have already been done.
1221		*                This could also be used by rsa oper routines.
1222		*/
1223		void
1224		oper_up(struct Client *source_p)
1225		{
1226	<	unsigned int old = source_p->umodes;
1227	<	const char *operprivs = "";
1244	<	const struct AccessItem *oconf = NULL;
1226	>	const unsigned int old = source_p->umodes;
1227	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1228
1229		assert(source_p->localClient->confs.head);
1247	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1230
1231		++Count.oper;
1232		SetOper(source_p);
1233
1234	<	if (oconf->modes)
1235	<	source_p->umodes |= oconf->modes;
1234	>	if (conf->modes)
1235	>	AddUMode(source_p, conf->modes);
1236		else if (ConfigFileEntry.oper_umodes)
1237	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1256	<	else
1257	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1258	<	UMODE_WALLOP|UMODE_LOCOPS);
1237	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1238
1239	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1239	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1240		++Count.invisi;
1241	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1241	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1242		--Count.invisi;
1243
1244		assert(dlinkFind(&oper_list, source_p) == NULL);
1245		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1246
1247	<	operprivs = oper_privs_as_string(oconf->port);
1247	>	AddOFlag(source_p, conf->port);
1248
1249	<	SetOFlag(source_p, oconf->port);
1249	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1250	>	AddUMode(source_p, UMODE_ADMIN);
1251
1252	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1253	<	source_p->umodes |= UMODE_ADMIN;
1274	<	if (!IsOperN(source_p))
1275	<	source_p->umodes &= ~UMODE_NCHANGE;
1276	<
1277	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1278	<	source_p->name, source_p->username, source_p->host);
1252	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1253	>	get_oper_name(source_p));
1254		send_umode_out(source_p, source_p, old);
1255		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1281	–	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1282	–	me.name, source_p->name, operprivs);
1283	–	send_message_file(source_p, &ConfigFileEntry.opermotd);
1256		}
1257
1258		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1288 | Line 1260 | static char new_uid[TOTALSIDUID + 1];
1260		int
1261		valid_sid(const char *sid)
1262		{
1291	–
1263		if (strlen(sid) == IRC_MAXSID)
1264		if (IsDigit(*sid))
1265		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1309 | Line 1280 | valid_sid(const char *sid)
1280		void
1281		init_uid(void)
1282		{
1283	<	int i;
1283	>	unsigned int i;
1284
1285		memset(new_uid, 0, sizeof(new_uid));
1286
1287	<	if (ServerInfo.sid != NULL)
1317	<	{
1287	>	if (!EmptyString(ServerInfo.sid))
1288		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1319	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1320	–
1321	–	hash_add_id(&me);
1322	–	}
1289
1290	<	for (i = 0; i < IRC_MAXSID; i++)
1290	>	for (i = 0; i < IRC_MAXSID; ++i)
1291		if (new_uid[i] == '\0')
1292		new_uid[i] = 'A';
1293
#	Line 1331 | Line 1297 | init_uid(void)
1297		* -Dianora
1298		*/
1299		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1334	–
1335	–	entering_umode_cb = register_callback("entering_umode", NULL);
1336	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1337	–	uid_get_cb = register_callback("uid_get", uid_get);
1300		}
1301
1302		/*
#	Line 1377 | Line 1339 | add_one_to_uid(int i)
1339		* output       - new UID is returned to caller
1340		* side effects - new_uid is incremented by one.
1341		*/
1342	<	static void *
1343	<	uid_get(va_list args)
1342	>	static const char *
1343	>	uid_get(void)
1344		{
1345		add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1346		return new_uid;
#	Line 1394 | Line 1356 | uid_get(va_list args)
1356		void
1357		init_isupport(void)
1358		{
1397	–	isupportFile = init_MessageLine();
1398	–
1359		add_isupport("CALLERID", NULL, -1);
1360		add_isupport("CASEMAPPING", CASEMAP, -1);
1361		add_isupport("DEAF", "D", -1);
1362		add_isupport("KICKLEN", NULL, KICKLEN);
1363		add_isupport("MODES", NULL, MAXMODEPARAMS);
1404	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1364		#ifdef HALFOPS
1365		add_isupport("PREFIX", "(ohv)@%+", -1);
1366		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1409 | Line 1368 | init_isupport(void)
1368		add_isupport("PREFIX", "(ov)@+", -1);
1369		add_isupport("STATUSMSG", "@+", -1);
1370		#endif
1412	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1371		}
1372
1373		/*
#	Line 1444 | Line 1402 | add_isupport(const char *name, const cha
1402		dlinkAddTail(support, &support->node, &support_list);
1403		}
1404
1405	<	DupString(support->name, name);
1405	>	support->name = xstrdup(name);
1406		if (options != NULL)
1407	<	DupString(support->options, options);
1407	>	support->options = xstrdup(options);
1408		support->number = n;
1409
1410		rebuild_isupport_message_line();
#	Line 1493 | Line 1451 | rebuild_isupport_message_line(void)
1451		{
1452		char isupportbuffer[IRCD_BUFSIZE];
1453		char *p = isupportbuffer;
1454	<	dlink_node *ptr = NULL;
1454	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1455		int n = 0;
1456		int tokens = 0;
1457		size_t len = 0;
1458		size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1459
1460	<	destroy_MessageLine(isupportFile);
1460	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1461	>	{
1462	>	dlinkDelete(ptr, &support_list_lines);
1463	>	MyFree(ptr->data);
1464	>	free_dlink_node(ptr);
1465	>	}
1466
1467		DLINK_FOREACH(ptr, support_list.head)
1468		{
1469		struct Isupport *support = ptr->data;
1470
1471	<	p += (n = ircsprintf(p, "%s", support->name));
1471	>	p += (n = sprintf(p, "%s", support->name));
1472		len += n;
1473
1474		if (support->options != NULL)
1475		{
1476	<	p += (n = ircsprintf(p, "=%s", support->options));
1476	>	p += (n = sprintf(p, "=%s", support->options));
1477		len += n;
1478		}
1479
1480		if (support->number > 0)
1481		{
1482	<	p += (n = ircsprintf(p, "=%d", support->number));
1482	>	p += (n = sprintf(p, "=%d", support->number));
1483		len += n;
1484		}
1485
#	Line 1529 | Line 1492 | rebuild_isupport_message_line(void)
1492		if (*--p == ' ')
1493		*p = '\0';
1494
1495	<	addto_MessageLine(isupportFile, isupportbuffer);
1495	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1496		p = isupportbuffer;
1497		len = 0;
1498		n = tokens = 0;
#	Line 1540 | Line 1503 | rebuild_isupport_message_line(void)
1503		{
1504		if (*--p == ' ')
1505		*p = '\0';
1506	<	addto_MessageLine(isupportFile, isupportbuffer);
1506	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1507		}
1508		}

Diff Legend

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