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 386 by adx, Tue Jan 31 12:40:56 2006 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2134 by michael, Wed May 29 18:59:39 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"
53	<	#include "pcre.h"
52	>	#include "parse.h"
53	>	#include "watch.h"
54
59	–	int MaxClientCount     = 1;
60	–	int MaxConnectionCount = 1;
61	–	struct Callback *entering_umode_cb = NULL;
62	–	struct Callback *umode_cb = NULL;
63	–	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 int check_regexp_xline(struct Client *);
62	<	static void introduce_client(struct Client *, struct Client *);
72	<	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 96 | Line 86 | unsigned int user_modes[256] =
86		0,                  /* @ */
87		0,                  /* A */
88		0,                  /* B */
89	<	0,                  /* C */
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	>	0,                  /* 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));
281	<	assert(source_p->username != username);
281	>	assert(!source_p->localClient->registration);
282	>
283	>	ClearCap(source_p, CAP_TS6);
284
285		if (ConfigFileEntry.ping_cookie)
286		{
287	<	if (!IsPingSent(source_p) &&
301	<	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 311 | 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 326 | Line 315 | register_local_user(struct Client *clien
315		sizeof(source_p->host));
316		}
317
318	<	ptr   = source_p->localClient->confs.head;
330	<	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)
352	<	{
340	>	for (; *p && i < USERLEN; ++p)
341		if (*p != '[')
342		source_p->username[i++] = *p;
355	–	p++;
356	–	}
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 379 | 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 392 | 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
407	<	assert(source_p == client_p);
417	<
418	<	/* end of valid user name check */
419	<	if (check_xline(source_p) || check_regexp_xline(source_p))
420	<	return;
421	<
422	<	if (IsDead(client_p))
407	>	if (check_xline(source_p))
408		return;
409
410	<	if (source_p->id[0] == '\0' && me.id[0])
411	<	{
427	<	char *id = (char *)execute_callback(uid_get_cb, source_p);
428	<	while (hash_find_id(id) != NULL)
429	<	id = uid_get(NULL);
430	<
431	<	strlcpy(source_p->id, id, sizeof(source_p->id));
432	<	hash_add_id(source_p);
433	<	}
410	>	while (hash_find_id((id = uid_get())) != NULL)
411	>	;
412
413	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
414	<	source_p->localClient->ip.ss_len, ipaddr,
437	<	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" : 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, SEND_NOTICE,
425	>	"CLICONN %s %s %s %s %s %s %s 0 %s",
426	>	source_p->name, source_p->username, source_p->host,
427		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
428	<	"255.255.255.255" : ipaddr, 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->localClient->client_host,
432	>	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
433	>	"<hidden>" : source_p->localClient->client_server,
434		source_p->info);
435
446	–	/* If they have died in send_* don't do anything. */
447	–	if (IsDead(source_p))
448	–	return;
436
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 458 | 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
465	–	SetClient(source_p);
466	–
467	–	source_p->servptr = &me;
468	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
469	–
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);
481	<	}
482	<	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
494	<	*              - 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 501 | 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 511 | 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));
514	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
498		strlcpy(source_p->username, username, sizeof(source_p->username));
499
517	–	/* Increment our total user count here */
518	–	if (++Count.total > Count.max_tot)
519	–	Count.max_tot = Count.total;
520	–
521	–	source_p->from->serv->dep_users++;
522	–
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	<	/* XXX */
541	<	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	+
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
572	<	*              - 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 586 | Line 580 | introduce_client(struct Client *client_p
580		else
581		send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
582
583	+	watch_check_hash(source_p, RPL_LOGON);
584	+
585		if (*ubuf == '\0')
586		{
587		ubuf[0] = '+';
588		ubuf[1] = '\0';
589		}
590
591	<	/* arghhh one could try not introducing new nicks to ll leafs
592	<	* but then you have to introduce them "on the fly" in SJOIN
593	<	* not fun.
598	<	* Its not going to cost much more bandwidth to simply let new
599	<	* nicks just ride on through.
600	<	*/
591	>	DLINK_FOREACH(server_node, serv_list.head)
592	>	{
593	>	struct Client *server = server_node->data;
594
595	<	/* We now introduce nicks "on the fly" in SJOIN anyway --
596	<	* you _need_ to if you aren't going to burst everyone initially.
604	<	*
605	<	* Only send to non CAP_LL servers, unless we're a lazylink leaf,
606	<	* in that case just send it to the uplink.
607	<	* -davidt
608	<	* rewritten to cope with SIDs .. eww eww eww --is
609	<	*/
595	>	if (server == source_p->from)
596	>	continue;
597
598	<	/* XXX THESE NEED A PREFIX!?!?!? */
612	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL) &&
613	<	client_p != uplink)
614	<	{
615	<	if (IsCapable(uplink, CAP_TS6) && HasID(source_p))
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		{
627	–	sendto_one(uplink, "NICK %s %d %lu %s %s %s %s :%s",
628	–	source_p->name, source_p->hopcount+1,
629	–	(unsigned long)source_p->tsinfo,
630	–	ubuf, source_p->username, source_p->host,
631	–	source_p->servptr->name, source_p->info);
632	–	}
633	–	}
634	–	else
635	–	{
636	–	DLINK_FOREACH(server_node, serv_list.head)
637	–	{
638	–	struct Client *server = server_node->data;
639	–
640	–	if (IsCapable(server, CAP_LL) || server == client_p)
641	–	continue;
642	–
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 674 | 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)
681	<	{
658	>	for (; *p; ++p)
659		if (!IsHostChar(*p))
660		return 0;
684	–	p++;
685	–	}
661
662	<	return 1;
662	>	return p - hostname <= HOSTLEN;
663		}
664
665		/* valid_username()
#	Line 699 | 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		}
730	–	else if (!IsUserChar(*p))
731	–	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))
750	<	{
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);
754	–	}
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 */
792	<	if (IsConfIdlelined(aconf))
793	<	{
794	<	SetIdlelined(source_p);
795	<	sendto_one(source_p,
796	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
797	<	me.name, source_p->name);
798	<	}
799	<
800	<	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 806 | Line 803 | report_and_set_user_flags(struct Client
803		}
804		}
805
809	–	/* do_local_user()
810	–	*
811	–	* inputs       -
812	–	* output       - NONE
813	–	* side effects -
814	–	*/
815	–	void
816	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
817	–	const char *username, const char *host, const char *server,
818	–	const char *realname)
819	–	{
820	–	assert(source_p != NULL);
821	–	assert(source_p->username != username);
822	–
823	–	if (source_p == NULL)
824	–	return;
825	–
826	–	if (!IsUnknown(source_p))
827	–	{
828	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
829	–	me.name, nick);
830	–	return;
831	–	}
832	–
833	–	source_p->flags |= FLAGS_GOTUSER;
834	–
835	–	/*
836	–	* don't take the clients word for it, ever
837	–	*/
838	–	source_p->servptr = &me;
839	–
840	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
841	–
842	–	if (!IsGotId(source_p))
843	–	{
844	–	/* save the username in the client
845	–	* If you move this you'll break ping cookies..you've been warned
846	–	*/
847	–	strlcpy(source_p->username, username, sizeof(source_p->username));
848	–	}
849	–
850	–	if (source_p->name[0])
851	–	{
852	–	/* NICK already received, now I have USER... */
853	–	register_local_user(client_p, source_p, source_p->name, username);
854	–	}
855	–	}
856	–
857	–	/* change_simple_umode()
858	–	*
859	–	* this callback can be hooked to allow special handling of
860	–	* certain usermodes
861	–	*/
862	–	static void *
863	–	change_simple_umode(va_list args)
864	–	{
865	–	struct Client *source_p;
866	–	int what;
867	–	unsigned int flag;
868	–
869	–	va_arg(args, struct Client *);
870	–	source_p = va_arg(args, struct Client *);
871	–	what = va_arg(args, int);
872	–	flag = va_arg(args, unsigned int);
873	–
874	–	if (what == MODE_ADD)
875	–	source_p->umodes |= flag;
876	–	else
877	–	source_p->umodes &= ~flag;
878	–
879	–	return NULL;
880	–	}
881	–
806		/* set_user_mode()
807		*
808		* added 15/10/91 By Darren Reed.
#	Line 888 | 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 905 | Line 829 | set_user_mode(struct Client *client_p, s
829		return;
830		}
831
832	<	if (IsServer(source_p))
909	<	{
910	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
911	<	parv[1], source_p->name);
912	<	return;
913	<	}
914	<
915	<	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 925 | 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 934 | Line 851 | set_user_mode(struct Client *client_p, s
851		return;
852		}
853
937	–	execute_callback(entering_umode_cb, client_p, source_p);
938	–
854		/* find flags already set for user */
855		setflags = source_p->umodes;
856
#	Line 955 | 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 966 | 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);
973	–	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 987 | Line 902 | set_user_mode(struct Client *client_p, s
902
903		break;
904
905	<	/* we may not get these,
991	<	* but they shouldnt be in default
992	<	*/
993	<	case ' ' :
994	<	case '\n':
995	<	case '\r':
996	<	case '\t':
905	>	case 'r':  /* Only services may set +r */
906		break;
907
908		default:
909		if ((flag = user_modes[(unsigned char)*m]))
910		{
911	<	if (MyConnect(source_p) && !IsOper(source_p) &&
911	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
912		(ConfigFileEntry.oper_only_umodes & flag))
1004	–	{
913		badflag = 1;
1006	–	}
914		else
915	<	execute_callback(umode_cb, client_p, source_p, what, flag);
915	>	{
916	>	if (what == MODE_ADD)
917	>	AddUMode(source_p, flag);
918	>	else
919	>	DelUMode(source_p, flag);
920	>	}
921		}
922		else
923		{
#	Line 1022 | Line 934 | set_user_mode(struct Client *client_p, s
934		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
935		me.name, source_p->name);
936
937	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
938	<	{
1027	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1028	<	me.name, source_p->name);
1029	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1030	<	}
1031	<
1032	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
1033	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
937	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
938	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
939		{
940		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
941		me.name, source_p->name);
942	<	source_p->umodes &= ~UMODE_ADMIN;
942	>	DelUMode(source_p, UMODE_ADMIN);
943		}
944
945	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
945	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
946		++Count.invisi;
947	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
947	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
948		--Count.invisi;
949
950		/*
#	Line 1052 | Line 957 | set_user_mode(struct Client *client_p, s
957		/* send_umode()
958		* send the MODE string for user (user) to connection client_p
959		* -avalon
960	+	*
961	+	* inputs       - client_p
962	+	*              - source_p
963	+	*              - int old
964	+	*              - sendmask mask of modes to send
965	+	*              - suplied umode_buf
966	+	* output       - NONE
967		*/
968		void
969		send_umode(struct Client *client_p, struct Client *source_p,
970		unsigned int old, unsigned int sendmask, char *umode_buf)
971		{
972	+	char *m = umode_buf;
973		int what = 0;
974		unsigned int i;
975		unsigned int flag;
1063	–	char *m = umode_buf;
976
977		/*
978		* build a string in umode_buf to represent the change in the user's
#	Line 1075 | Line 987 | send_umode(struct Client *client_p, stru
987		if (MyClient(source_p) && !(flag & sendmask))
988		continue;
989
990	<	if ((flag & old) && !(source_p->umodes & flag))
990	>	if ((flag & old) && !HasUMode(source_p, flag))
991		{
992		if (what == MODE_DEL)
993		*m++ = (char)i;
#	Line 1086 | Line 998 | send_umode(struct Client *client_p, stru
998		*m++ = (char)i;
999		}
1000		}
1001	<	else if (!(flag & old) && (source_p->umodes & flag))
1001	>	else if (!(flag & old) && HasUMode(source_p, flag))
1002		{
1003		if (what == MODE_ADD)
1004		*m++ = (char)i;
#	Line 1102 | Line 1014 | send_umode(struct Client *client_p, stru
1014		*m = '\0';
1015
1016		if (*umode_buf && client_p)
1017	<	sendto_one(client_p, ":%s MODE %s :%s",
1018	<	source_p->name, source_p->name, umode_buf);
1017	>	sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
1018	>	source_p->name, source_p->username,
1019	>	source_p->host, source_p->name, umode_buf);
1020		}
1021
1022		/* send_umode_out()
#	Line 1116 | Line 1029 | void
1029		send_umode_out(struct Client *client_p, struct Client *source_p,
1030		unsigned int old)
1031		{
1032	<	char buf[IRCD_BUFSIZE];
1032	>	char buf[IRCD_BUFSIZE] = { '\0' };
1033		dlink_node *ptr = NULL;
1034
1035	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1123	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1035	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1036
1037	<	if (*buf)
1037	>	if (buf[0])
1038		{
1039		DLINK_FOREACH(ptr, serv_list.head)
1040		{
1041		struct Client *target_p = ptr->data;
1042
1043		if ((target_p != client_p) && (target_p != source_p))
1044	<	{
1045	<	if ((!(ServerInfo.hub && IsCapable(target_p, CAP_LL))) ||
1046	<	(target_p->localClient->serverMask &
1135	<	source_p->lazyLinkClientExists))
1136	<	sendto_one(target_p, ":%s MODE %s :%s",
1137	<	ID_or_name(source_p, target_p),
1138	<	ID_or_name(source_p, target_p), buf);
1139	<	}
1044	>	sendto_one(target_p, ":%s MODE %s :%s",
1045	>	ID_or_name(source_p, target_p),
1046	>	ID_or_name(source_p, target_p), buf);
1047		}
1048		}
1049
#	Line 1144 | Line 1051 | send_umode_out(struct Client *client_p,
1051		send_umode(client_p, source_p, old, 0xffffffff, buf);
1052		}
1053
1054	+	void
1055	+	user_set_hostmask(struct Client *target_p, const char *hostname)
1056	+	{
1057	+	if (!valid_hostname(hostname))
1058	+	return;
1059	+
1060	+	if (IsUserHostIp(target_p))
1061	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1062	+
1063	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1064	+	SetIPSpoof(target_p);
1065	+
1066	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1067	+	SetUserHost(target_p);
1068	+
1069	+	if (MyClient(target_p))
1070	+	clear_ban_cache_client(target_p);
1071	+	}
1072	+
1073		/* user_welcome()
1074		*
1075		* inputs       - client pointer to client to welcome
#	Line 1184 | Line 1110 | user_welcome(struct Client *source_p)
1110
1111		if (ConfigFileEntry.short_motd)
1112		{
1113	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1114	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1113	>	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1114	>	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1115		sendto_one(source_p,
1116	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1117	<	"read it", source_p->name);
1116	>	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1117	>	"read it", me.name, source_p->name);
1118		sendto_one(source_p, form_str(RPL_MOTDSTART),
1119		me.name, source_p->name, me.name);
1120		sendto_one(source_p, form_str(RPL_MOTD),
#	Line 1210 | Line 1136 | user_welcome(struct Client *source_p)
1136		static int
1137		check_xline(struct Client *source_p)
1138		{
1139	<	struct ConfItem *conf;
1214	<	struct MatchItem *xconf;
1215	<	const char *reason;
1216	<
1217	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info,
1218	<	NULL, NULL, 0)) != NULL)
1219	<	{
1220	<	xconf = map_to_conf(conf);
1221	<	xconf->count++;
1222	<
1223	<	if (xconf->reason != NULL)
1224	<	reason = xconf->reason;
1225	<	else
1226	<	reason = "No Reason";
1227	<
1228	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1229	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1230	<	source_p->info, reason,
1231	<	get_client_name(source_p, HIDE_IP),
1232	<	source_p->sockhost);
1233	<
1234	<	ServerStats->is_ref++;
1235	<	if (REJECT_HOLD_TIME > 0)
1236	<	{
1237	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1238	<	me.name, source_p->name);
1239	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1240	<	SetCaptured(source_p);
1241	<	}
1242	<	else
1243	<	exit_client(source_p, &me, "Bad user info");
1244	<	return 1;
1245	<	}
1246	<
1247	<	return 0;
1248	<	}
1249	<
1250	<	static int
1251	<	check_regexp_xline(struct Client *source_p)
1252	<	{
1253	<	struct ConfItem *conf = NULL;
1139	>	struct MaskItem *conf = NULL;
1140		const char *reason = NULL;
1141
1142	<	if ((conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1142	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1143		{
1144	<	struct MatchItem *reg = map_to_conf(conf);
1259	<
1260	<	++reg->count;
1144	>	++conf->count;
1145
1146	<	if (reg->reason != NULL)
1147	<	reason = reg->reason;
1146	>	if (conf->reason != NULL)
1147	>	reason = conf->reason;
1148		else
1149		reason = "No Reason";
1150
1151	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1152	<	"X-line (REGEX) Rejecting [%s] [%s], user %s [%s]",
1151	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1152	>	"X-line Rejecting [%s] [%s], user %s [%s]",
1153		source_p->info, reason,
1154		get_client_name(source_p, HIDE_IP),
1155		source_p->sockhost);
1156
1157	<	ServerStats->is_ref++;
1157	>	++ServerStats.is_ref;
1158		exit_client(source_p, &me, "Bad user info");
1159		return 1;
1160		}
#	Line 1282 | Line 1166 | check_regexp_xline(struct Client *source
1166		*
1167		* inputs       - pointer to given client to oper
1168		* output       - NONE
1169	<	* side effects - Blindly opers up given source_p, using aconf info
1169	>	* side effects - Blindly opers up given source_p, using conf info
1170		*                all checks on passwords have already been done.
1171		*                This could also be used by rsa oper routines.
1172		*/
1173		void
1174		oper_up(struct Client *source_p)
1175		{
1176	<	unsigned int old = source_p->umodes;
1177	<	const char *operprivs = "";
1294	<	const struct AccessItem *oconf = NULL;
1176	>	const unsigned int old = source_p->umodes;
1177	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1178
1179		assert(source_p->localClient->confs.head);
1297	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1180
1181		++Count.oper;
1182		SetOper(source_p);
1183
1184	<	if (oconf->modes)
1185	<	source_p->umodes |= oconf->modes;
1184	>	if (conf->modes)
1185	>	AddUMode(source_p, conf->modes);
1186		else if (ConfigFileEntry.oper_umodes)
1187	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1188	<	else
1189	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1190	<	UMODE_WALLOP|UMODE_LOCOPS);
1187	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1188	>
1189	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1190	>	++Count.invisi;
1191	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1192	>	--Count.invisi;
1193
1194		assert(dlinkFind(&oper_list, source_p) == NULL);
1195		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1196
1197	<	operprivs = oper_privs_as_string(oconf->port);
1197	>	AddOFlag(source_p, conf->port);
1198
1199	<	SetOFlag(source_p, oconf->port);
1199	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1200	>	AddUMode(source_p, UMODE_ADMIN);
1201
1202	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1203	<	source_p->umodes |= UMODE_ADMIN;
1319	<	if (!IsOperN(source_p))
1320	<	source_p->umodes &= ~UMODE_NCHANGE;
1321	<
1322	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1323	<	source_p->name, source_p->username, source_p->host);
1202	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1203	>	get_oper_name(source_p));
1204		send_umode_out(source_p, source_p, old);
1205		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);
1206		}
1207
1208	<	/*
1209	<	* Quick and dirty UID code for new proposed SID on EFnet
1210	<	*
1211	<	*/
1208	>	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1209	>
1210	>	int
1211	>	valid_sid(const char *sid)
1212	>	{
1213	>	if (strlen(sid) == IRC_MAXSID)
1214	>	if (IsDigit(*sid))
1215	>	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1216	>	return 1;
1217
1218	<	static char new_uid[TOTALSIDUID+1];     /* allow for \0 */
1219	<	static void add_one_to_uid(int i);
1218	>	return 0;
1219	>	}
1220
1221		/*
1222		* init_uid()
#	Line 1348 | Line 1230 | static void add_one_to_uid(int i);
1230		void
1231		init_uid(void)
1232		{
1233	<	int i;
1233	>	unsigned int i;
1234
1235		memset(new_uid, 0, sizeof(new_uid));
1236
1237	<	if (ServerInfo.sid != NULL)
1238	<	{
1357	<	memcpy(new_uid, ServerInfo.sid, IRCD_MIN(strlen(ServerInfo.sid),
1358	<	IRC_MAXSID));
1359	<	memcpy(&me.id, ServerInfo.sid, IRCD_MIN(strlen(ServerInfo.sid),
1360	<	IRC_MAXSID));
1361	<	hash_add_id(&me);
1362	<	}
1237	>	if (!EmptyString(ServerInfo.sid))
1238	>	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1239
1240	<	for (i = 0; i < IRC_MAXSID; i++)
1240	>	for (i = 0; i < IRC_MAXSID; ++i)
1241		if (new_uid[i] == '\0')
1242		new_uid[i] = 'A';
1243
1244	<	/* XXX if IRC_MAXUID != 6, this will have to be rewritten */
1244	>	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1245		/* Yes nenolod, I have known it was off by one ever since I wrote it
1246		* But *JUST* for you, though, it really doesn't look as *pretty*
1247		* -Dianora
1248		*/
1249	<	memcpy(new_uid+IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1374	<
1375	<	entering_umode_cb = register_callback("entering_umode", NULL);
1376	<	umode_cb = register_callback("changing_umode", change_simple_umode);
1377	<	uid_get_cb = register_callback("uid_get", uid_get);
1378	<	}
1379	<
1380	<	/*
1381	<	* uid_get
1382	<	*
1383	<	* inputs       - struct Client *
1384	<	* output       - new UID is returned to caller
1385	<	* side effects - new_uid is incremented by one.
1386	<	*/
1387	<	static void *
1388	<	uid_get(va_list args)
1389	<	{
1390	<	add_one_to_uid(TOTALSIDUID-1);    /* index from 0 */
1391	<	return ((void *) new_uid);
1249	>	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1250		}
1251
1252		/*
#	Line 1411 | Line 1269 | add_one_to_uid(int i)
1269		new_uid[i] = 'A';
1270		add_one_to_uid(i-1);
1271		}
1272	<	else new_uid[i] = new_uid[i] + 1;
1272	>	else
1273	>	++new_uid[i];
1274		}
1275		else
1276		{
1277	<	/* XXX if IRC_MAXUID != 6, this will have to be rewritten */
1277	>	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1278		if (new_uid[i] == 'Z')
1279	<	memcpy(new_uid+IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1279	>	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1280		else
1281	<	new_uid[i] = new_uid[i] + 1;
1281	>	++new_uid[i];
1282		}
1283		}
1284
1285		/*
1286	+	* uid_get
1287	+	*
1288	+	* inputs       - struct Client *
1289	+	* output       - new UID is returned to caller
1290	+	* side effects - new_uid is incremented by one.
1291	+	*/
1292	+	static const char *
1293	+	uid_get(void)
1294	+	{
1295	+	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1296	+	return new_uid;
1297	+	}
1298	+
1299	+	/*
1300		* init_isupport()
1301		*
1302		* input        - NONE
#	Line 1437 | Line 1310 | init_isupport(void)
1310
1311		add_isupport("CALLERID", NULL, -1);
1312		add_isupport("CASEMAPPING", CASEMAP, -1);
1313	+	add_isupport("DEAF", "D", -1);
1314		add_isupport("KICKLEN", NULL, KICKLEN);
1315		add_isupport("MODES", NULL, MAXMODEPARAMS);
1442	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1316		#ifdef HALFOPS
1317		add_isupport("PREFIX", "(ohv)@%+", -1);
1318		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1447 | Line 1320 | init_isupport(void)
1320		add_isupport("PREFIX", "(ov)@+", -1);
1321		add_isupport("STATUSMSG", "@+", -1);
1322		#endif
1450	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1323		}
1324
1325		/*
#	Line 1482 | Line 1354 | add_isupport(const char *name, const cha
1354		dlinkAddTail(support, &support->node, &support_list);
1355		}
1356
1357	<	DupString(support->name, name);
1357	>	support->name = xstrdup(name);
1358		if (options != NULL)
1359	<	DupString(support->options, options);
1359	>	support->options = xstrdup(options);
1360		support->number = n;
1361
1362		rebuild_isupport_message_line();
#	Line 1543 | Line 1415 | rebuild_isupport_message_line(void)
1415		{
1416		struct Isupport *support = ptr->data;
1417
1418	<	p += (n = ircsprintf(p, "%s", support->name));
1418	>	p += (n = sprintf(p, "%s", support->name));
1419		len += n;
1420
1421		if (support->options != NULL)
1422		{
1423	<	p += (n = ircsprintf(p, "=%s", support->options));
1423	>	p += (n = sprintf(p, "=%s", support->options));
1424		len += n;
1425		}
1426
1427		if (support->number > 0)
1428		{
1429	<	p += (n = ircsprintf(p, "=%d", support->number));
1429	>	p += (n = sprintf(p, "=%d", support->number));
1430		len += n;
1431		}
1432

Diff Legend

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