ViewVC Help

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

root/svn/ircd-hybrid/branches/8.1.x/src/s_user.c

Comparing:
ircd-hybrid-7.2/src/s_user.c (file contents), Revision 982 by michael, Thu Aug 13 22:15:08 2009 UTC vs.
ircd-hybrid/branches/8.1.x/src/s_user.c (file contents), Revision 2144 by michael, Thu May 30 10:56:53 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"
36		#include "ircd.h"
39	–	#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"
43		#include "send.h"
44		#include "supported.h"
#	Line 52 | Line 49
49		#include "userhost.h"
50		#include "hook.h"
51		#include "s_misc.h"
52	<	#include "msg.h"
56	<	#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 void introduce_client(struct Client *, struct Client *);
62	<	static void *uid_get(va_list);
61	>	static void introduce_client(struct Client *);
62	>	static const char *uid_get(void);
63
64		/* Used for building up the isupport string,
65		* used with init_isupport, add_isupport, delete_isupport
#	Line 86 | 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 98 | Line 89 | unsigned int user_modes[256] =
89		UMODE_CCONN_FULL,   /* C */
90		UMODE_DEAF,         /* D */
91		0,                  /* E */
92	<	0,                  /* F */
92	>	UMODE_FARCONNECT,   /* F */
93		UMODE_SOFTCALLERID, /* G */
94	<	0,                  /* H */
94	>	UMODE_HIDDEN,       /* H */
95		0,                  /* I */
96		0,                  /* J */
97		0,                  /* K */
#	Line 110 | 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 125 | 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 138 | Line 129 | unsigned int user_modes[256] =
129		UMODE_OPER,         /* o */
130		0,                  /* p */
131		0,                  /* q */
132	<	UMODE_REJ,          /* r */
132	>	UMODE_REGISTERED,   /* r */
133		UMODE_SERVNOTICE,   /* s */
134		0,                  /* t */
135		UMODE_UNAUTH,       /* u */
136		0,                  /* v */
137		UMODE_WALLOP,       /* w */
138	<	UMODE_EXTERNAL,     /* x */
138	>	UMODE_HIDDENHOST,   /* x */
139		UMODE_SPY,          /* y */
140		UMODE_OPERWALL,     /* z      0x7A */
141		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 165 | 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 194 | 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 214 | 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,
223	<	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,
231	<	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,
236	<	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 282 | 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,
286	<	const char *nick, const char *username)
273	>	register_local_user(struct Client *source_p)
274		{
275	<	const struct AccessItem *aconf = NULL;
276	<	dlink_node *ptr = NULL;
290	<	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));
294	–	assert(source_p->username != username);
281		assert(!source_p->localClient->registration);
282
283	<	ClearCap(client_p, CAP_TS6);
283	>	ClearCap(source_p, CAP_TS6);
284
285		if (ConfigFileEntry.ping_cookie)
286		{
287	<	if (!IsPingSent(source_p) &&
302	<	source_p->localClient->random_ping == 0)
287	>	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
288		{
289	<	source_p->localClient->random_ping = genrand_int32();
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);
#	Line 312 | 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 327 | Line 315 | register_local_user(struct Client *clien
315		sizeof(source_p->host));
316		}
317
318	<	ptr   = source_p->localClient->confs.head;
331	<	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;
329		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
#	Line 344 | Line 332 | register_local_user(struct Client *clien
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)
353	<	{
340	>	for (; *p && i < USERLEN; ++p)
341		if (*p != '[')
342		source_p->username[i++] = *p;
356	–	p++;
357	–	}
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;
355		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
#	Line 380 | 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(client_p))
370	>	if (IsDead(source_p))
371		return;
372
373		/* Limit clients -
#	Line 396 | 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);
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);
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	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
401	>	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
402	>	source_p->username);
403		exit_client(source_p, &me, tmpstr2);
404		return;
405		}
406
420	–	assert(source_p == client_p);
421	–
407		if (check_xline(source_p))
408		return;
409
410	<	if (me.id[0])
411	<	{
427	<	const char *id = execute_callback(uid_get_cb, source_p);
410	>	while (hash_find_id((id = uid_get())) != NULL)
411	>	;
412
413	<	while (hash_find_id(id) != NULL)
414	<	id = uid_get(NULL);
431	<
432	<	strlcpy(source_p->id, id, sizeof(source_p->id));
433	<	hash_add_id(source_p);
434	<	}
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),
422	<	source_p->info);
421	>	get_client_class(&source_p->localClient->confs),
422	>	source_p->info, source_p->id);
423
424	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
424	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
425		"CLICONN %s %s %s %s %s %s %s 0 %s",
426	<	nick, source_p->username, source_p->host,
426	>	source_p->name, source_p->username, source_p->host,
427		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
428		"255.255.255.255" : source_p->sockhost,
429	<	get_client_class(source_p),
429	>	get_client_class(&source_p->localClient->confs),
430		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	<	"<hidden>" : source_p->client_host,
431	>	"<hidden>" : source_p->localClient->client_host,
432		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
433	<	"<hidden>" : source_p->client_server,
433	>	"<hidden>" : source_p->localClient->client_server,
434		source_p->info);
435
436
437		if (ConfigFileEntry.invisible_on_connect)
438		{
439	<	source_p->umodes |= UMODE_INVISIBLE;
439	>	AddUMode(source_p, UMODE_INVISIBLE);
440		++Count.invisi;
441		}
442
#	Line 465 | 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
472	–	SetClient(source_p);
473	–
474	–	source_p->servptr = &me;
475	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
476	–
453		/* Increment our total user count here */
454		if (++Count.total > Count.max_tot)
455		Count.max_tot = Count.total;
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);
488	<	}
489	<	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
501	<	*              - 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 508 | 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 523 | Line 500 | register_remote_user(struct Client *clie
500		/*
501		* coming from another server, take the servers word for it
502		*/
503	<	source_p->servptr = find_server(server);
503	>	source_p->servptr = hash_find_server(server);
504
505	<	/* Super GhostDetect:
505	>	/*
506	>	* Super GhostDetect:
507		* If we can't find the server the user is supposed to be on,
508		* then simply blow the user away.        -Taner
509		*/
510		if (source_p->servptr == NULL)
511		{
512	<	sendto_realops_flags(UMODE_ALL, L_ALL,
512	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
513		"No server %s for user %s[%s@%s] from %s",
514		server, source_p->name, source_p->username,
515		source_p->host, source_p->from->name);
516	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
516	>	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
517
518	<	SetKilled(source_p);
518	>	AddFlag(source_p, FLAGS_KILLED);
519		exit_client(source_p, &me, "Ghosted Client");
520		return;
521		}
522
523		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
524		{
525	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
525	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
526		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
527	<	client_p->name, source_p->name, source_p->username,
527	>	source_p->from->name, source_p->name, source_p->username,
528		source_p->host, source_p->servptr->name,
529		target_p->name, target_p->from->name);
530	<	kill_client(client_p, source_p,
530	>	kill_client(source_p->from, source_p,
531		"%s (NICK from wrong direction (%s != %s))",
532		me.name, source_p->servptr->name, target_p->from->name);
533	<	SetKilled(source_p);
533	>	AddFlag(source_p, FLAGS_KILLED);
534		exit_client(source_p, &me, "USER server wrong direction");
535		return;
536		}
537
538	+	/*
539	+	* If the nick has been introduced by a services server,
540	+	* make it a service as well.
541	+	*/
542	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
543	+	AddFlag(source_p, FLAGS_SERVICE);
544	+
545		/* Increment our total user count here */
546		if (++Count.total > Count.max_tot)
547		Count.max_tot = Count.total;
#	Line 566 | Line 551 | register_remote_user(struct Client *clie
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
575	<	*              - 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 601 | Line 592 | introduce_client(struct Client *client_p
592		{
593		struct Client *server = server_node->data;
594
595	<	if (server == client_p)
595	>	if (server == source_p->from)
596		continue;
597
598	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
599	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
600	<	source_p->servptr->id,
601	<	source_p->name, source_p->hopcount+1,
602	<	(unsigned long)source_p->tsinfo,
603	<	ubuf, source_p->username, source_p->host,
604	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
605	<	"0" : source_p->sockhost, source_p->id, source_p->info);
598	>	if (IsCapable(server, CAP_SVS))
599	>	{
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	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
621	<	source_p->name, source_p->hopcount+1,
622	<	(unsigned long)source_p->tsinfo,
623	<	ubuf, source_p->username, source_p->host,
624	<	source_p->servptr->name, source_p->info);
620	>	{
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,
624	>	source_p->name, source_p->hopcount+1,
625	>	(unsigned long)source_p->tsinfo,
626	>	ubuf, source_p->username, source_p->host,
627	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
628	>	"0" : source_p->sockhost, source_p->id, source_p->info);
629	>	else
630	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
631	>	source_p->name, source_p->hopcount+1,
632	>	(unsigned long)source_p->tsinfo,
633	>	ubuf, source_p->username, source_p->host,
634	>	source_p->servptr->name, source_p->info);
635	>	}
636		}
637		}
638
#	Line 637 | 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)
644	<	{
658	>	for (; *p; ++p)
659		if (!IsHostChar(*p))
660		return 0;
647	–	p++;
648	–	}
661
662	<	return 1;
662	>	return p - hostname <= HOSTLEN;
663		}
664
665		/* valid_username()
#	Line 662 | 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		}
709	<	else if (!IsUserChar(*p))
710	<	return 0;
709	>	}
710	>	else
711	>	{
712	>	while (*++p)
713	>	if (!IsUserChar(*p))
714	>	return 0;
715		}
716
717	<	return 1;
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 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))
713	<	{
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);
717	–	}
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 */
755	<	if (IsConfIdlelined(aconf))
756	<	{
757	<	SetIdlelined(source_p);
758	<	sendto_one(source_p,
759	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
760	<	me.name, source_p->name);
761	<	}
762	<
763	<	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 769 | Line 803 | report_and_set_user_flags(struct Client
803		}
804		}
805
772	–	/* do_local_user()
773	–	*
774	–	* inputs       -
775	–	* output       - NONE
776	–	* side effects -
777	–	*/
778	–	void
779	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
780	–	const char *username, const char *host, const char *server,
781	–	const char *realname)
782	–	{
783	–	assert(source_p != NULL);
784	–	assert(source_p->username != username);
785	–
786	–	if (source_p == NULL)
787	–	return;
788	–
789	–	if (!IsUnknown(source_p))
790	–	{
791	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
792	–	me.name, nick);
793	–	return;
794	–	}
795	–
796	–	source_p->localClient->registration &= ~REG_NEED_USER;
797	–
798	–	/*
799	–	* don't take the clients word for it, ever
800	–	*/
801	–	source_p->servptr = &me;
802	–
803	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
804	–
805	–	/* stash for later */
806	–	strlcpy(source_p->client_host, host, sizeof(source_p->client_host));
807	–	strlcpy(source_p->client_server, server, sizeof(source_p->client_server));
808	–
809	–	if (!IsGotId(source_p))
810	–	{
811	–	/* save the username in the client
812	–	* If you move this you'll break ping cookies..you've been warned
813	–	*/
814	–	strlcpy(source_p->username, username, sizeof(source_p->username));
815	–	}
816	–
817	–	if (!source_p->localClient->registration)
818	–	/* NICK already received, now I have USER... */
819	–	register_local_user(client_p, source_p, source_p->name, username);
820	–	}
821	–
822	–	/* change_simple_umode()
823	–	*
824	–	* this callback can be hooked to allow special handling of
825	–	* certain usermodes
826	–	*/
827	–	static void *
828	–	change_simple_umode(va_list args)
829	–	{
830	–	struct Client *client_p;
831	–	struct Client *source_p;
832	–	int what;
833	–	unsigned int flag;
834	–
835	–	client_p = va_arg(args, struct Client *);
836	–	source_p = va_arg(args, struct Client *);
837	–	what = va_arg(args, int);
838	–	flag = va_arg(args, unsigned int);
839	–
840	–	if (what == MODE_ADD)
841	–	source_p->umodes |= flag;
842	–	else
843	–	source_p->umodes &= ~flag;
844	–
845	–	return NULL;
846	–	}
847	–
806		/* set_user_mode()
807		*
808		* added 15/10/91 By Darren Reed.
#	Line 854 | 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 871 | Line 829 | set_user_mode(struct Client *client_p, s
829		return;
830		}
831
832	<	if (IsServer(source_p))
875	<	{
876	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
877	<	parv[1], source_p->name);
878	<	return;
879	<	}
880	<
881	<	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 891 | 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 900 | Line 851 | set_user_mode(struct Client *client_p, s
851		return;
852		}
853
903	–	execute_callback(entering_umode_cb, client_p, source_p);
904	–
854		/* find flags already set for user */
855		setflags = source_p->umodes;
856
#	Line 921 | 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 932 | 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);
939	–	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 953 | Line 902 | set_user_mode(struct Client *client_p, s
902
903		break;
904
905	<	/* we may not get these,
906	<	* but they shouldnt be in default
958	<	*/
959	<	case ' ' :
960	<	case '\n':
961	<	case '\r':
962	<	case '\t':
905	>	case 'r':  /* Only services may set +r */
906	>	case 'x':  /* Only services may set +x */
907		break;
908
909		default:
910		if ((flag = user_modes[(unsigned char)*m]))
911		{
912	<	if (MyConnect(source_p) && !IsOper(source_p) &&
912	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
913		(ConfigFileEntry.oper_only_umodes & flag))
970	–	{
914		badflag = 1;
972	–	}
915		else
916	<	execute_callback(umode_cb, client_p, source_p, what, flag);
916	>	{
917	>	if (what == MODE_ADD)
918	>	AddUMode(source_p, flag);
919	>	else
920	>	DelUMode(source_p, flag);
921	>	}
922		}
923		else
924		{
#	Line 988 | Line 935 | set_user_mode(struct Client *client_p, s
935		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
936		me.name, source_p->name);
937
938	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
939	<	{
993	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
994	<	me.name, source_p->name);
995	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
996	<	}
997	<
998	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
999	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
938	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
939	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
940		{
941		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
942		me.name, source_p->name);
943	<	source_p->umodes &= ~UMODE_ADMIN;
943	>	DelUMode(source_p, UMODE_ADMIN);
944		}
945
946	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
946	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
947		++Count.invisi;
948	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
948	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
949		--Count.invisi;
950
951		/*
#	Line 1030 | Line 970 | void
970		send_umode(struct Client *client_p, struct Client *source_p,
971		unsigned int old, unsigned int sendmask, char *umode_buf)
972		{
973	+	char *m = umode_buf;
974		int what = 0;
975		unsigned int i;
976		unsigned int flag;
1036	–	char *m = umode_buf;
977
978		/*
979		* build a string in umode_buf to represent the change in the user's
#	Line 1048 | Line 988 | send_umode(struct Client *client_p, stru
988		if (MyClient(source_p) && !(flag & sendmask))
989		continue;
990
991	<	if ((flag & old) && !(source_p->umodes & flag))
991	>	if ((flag & old) && !HasUMode(source_p, flag))
992		{
993		if (what == MODE_DEL)
994		*m++ = (char)i;
#	Line 1059 | Line 999 | send_umode(struct Client *client_p, stru
999		*m++ = (char)i;
1000		}
1001		}
1002	<	else if (!(flag & old) && (source_p->umodes & flag))
1002	>	else if (!(flag & old) && HasUMode(source_p, flag))
1003		{
1004		if (what == MODE_ADD)
1005		*m++ = (char)i;
#	Line 1093 | Line 1033 | send_umode_out(struct Client *client_p,
1033		char buf[IRCD_BUFSIZE] = { '\0' };
1034		dlink_node *ptr = NULL;
1035
1036	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1097	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1036	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1037
1038		if (buf[0])
1039		{
#	Line 1113 | Line 1052 | send_umode_out(struct Client *client_p,
1052		send_umode(client_p, source_p, old, 0xffffffff, buf);
1053		}
1054
1055	+	void
1056	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1057	+	{
1058	+	dlink_node *ptr = NULL;
1059	+
1060	+	if (!strcmp(target_p->host, hostname))
1061	+	return;
1062	+
1063	+	switch (what)
1064	+	{
1065	+	case MODE_ADD:
1066	+	AddUMode(target_p, UMODE_HIDDENHOST);
1067	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1068	+	break;
1069	+	case MODE_DEL:
1070	+	DelUMode(target_p, UMODE_HIDDENHOST);
1071	+
1072	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1073	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1074	+	break;
1075	+	default: return;
1076	+	}
1077	+
1078	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1079	+	target_p->name, target_p->username, target_p->host);
1080	+
1081	+	if (IsUserHostIp(target_p))
1082	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1083	+
1084	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1085	+
1086	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1087	+	SetUserHost(target_p);
1088	+
1089	+	if (MyClient(target_p))
1090	+	{
1091	+	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1092	+	target_p->name, target_p->host);
1093	+	clear_ban_cache_client(target_p);
1094	+	}
1095	+
1096	+	DLINK_FOREACH(ptr, target_p->channel.head)
1097	+	{
1098	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1099	+	char *p = modebuf;
1100	+	int len = 0;
1101	+	const struct Membership *ms = ptr->data;
1102	+
1103	+	if (has_member_flags(ms, CHFL_CHANOP)) {
1104	+	*p++ = 'o';
1105	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1106	+	}
1107	+
1108	+	if (has_member_flags(ms, CHFL_HALFOP)) {
1109	+	*p++ = 'h';
1110	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1111	+	}
1112	+
1113	+	if (has_member_flags(ms, CHFL_VOICE)) {
1114	+	*p++ = 'v';
1115	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1116	+	}
1117	+
1118	+	*p = '\0';
1119	+
1120	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1121	+	target_p->name, target_p->username, target_p->host,
1122	+	ms->chptr->chname);
1123	+	if (nickbuf[0])
1124	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1125	+	target_p->servptr->name, ms->chptr->chname,
1126	+	modebuf, nickbuf);
1127	+
1128	+	}
1129	+
1130	+	if (target_p->away[0])
1131	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1132	+	":%s!%s@%s AWAY :%s",
1133	+	target_p->name, target_p->username,
1134	+	target_p->host, target_p->away);
1135	+	}
1136	+
1137		/* user_welcome()
1138		*
1139		* inputs       - client pointer to client to welcome
#	Line 1153 | Line 1174 | user_welcome(struct Client *source_p)
1174
1175		if (ConfigFileEntry.short_motd)
1176		{
1177	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1178	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1177	>	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1178	>	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1179		sendto_one(source_p,
1180	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1181	<	"read it", source_p->name);
1180	>	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1181	>	"read it", me.name, source_p->name);
1182		sendto_one(source_p, form_str(RPL_MOTDSTART),
1183		me.name, source_p->name, me.name);
1184		sendto_one(source_p, form_str(RPL_MOTD),
#	Line 1179 | Line 1200 | user_welcome(struct Client *source_p)
1200		static int
1201		check_xline(struct Client *source_p)
1202		{
1203	<	struct ConfItem *conf = NULL;
1203	>	struct MaskItem *conf = NULL;
1204		const char *reason = NULL;
1205
1206	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1186	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1206	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1207		{
1208	<	struct MatchItem *reg = map_to_conf(conf);
1189	<
1190	<	++reg->count;
1208	>	++conf->count;
1209
1210	<	if (reg->reason != NULL)
1211	<	reason = reg->reason;
1210	>	if (conf->reason != NULL)
1211	>	reason = conf->reason;
1212		else
1213		reason = "No Reason";
1214
1215	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1215	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1216		"X-line Rejecting [%s] [%s], user %s [%s]",
1217		source_p->info, reason,
1218		get_client_name(source_p, HIDE_IP),
1219		source_p->sockhost);
1220
1221		++ServerStats.is_ref;
1222	<	if (REJECT_HOLD_TIME > 0)
1205	<	{
1206	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1207	<	me.name, source_p->name);
1208	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1209	<	SetCaptured(source_p);
1210	<	}
1211	<	else
1212	<	exit_client(source_p, &me, "Bad user info");
1222	>	exit_client(source_p, &me, "Bad user info");
1223		return 1;
1224		}
1225
#	Line 1220 | Line 1230 | check_xline(struct Client *source_p)
1230		*
1231		* inputs       - pointer to given client to oper
1232		* output       - NONE
1233	<	* side effects - Blindly opers up given source_p, using aconf info
1233	>	* side effects - Blindly opers up given source_p, using conf info
1234		*                all checks on passwords have already been done.
1235		*                This could also be used by rsa oper routines.
1236		*/
1237		void
1238		oper_up(struct Client *source_p)
1239		{
1240	<	unsigned int old = source_p->umodes;
1241	<	const char *operprivs = "";
1232	<	const struct AccessItem *oconf = NULL;
1240	>	const unsigned int old = source_p->umodes;
1241	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1242
1243		assert(source_p->localClient->confs.head);
1235	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1244
1245		++Count.oper;
1246		SetOper(source_p);
1247
1248	<	if (oconf->modes)
1249	<	source_p->umodes |= oconf->modes;
1248	>	if (conf->modes)
1249	>	AddUMode(source_p, conf->modes);
1250		else if (ConfigFileEntry.oper_umodes)
1251	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1244	<	else
1245	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1246	<	UMODE_WALLOP|UMODE_LOCOPS);
1251	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1252
1253	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1253	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1254		++Count.invisi;
1255	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1255	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1256		--Count.invisi;
1257
1258		assert(dlinkFind(&oper_list, source_p) == NULL);
1259		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1260
1261	<	operprivs = oper_privs_as_string(oconf->port);
1261	>	AddOFlag(source_p, conf->port);
1262
1263	<	SetOFlag(source_p, oconf->port);
1263	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1264	>	AddUMode(source_p, UMODE_ADMIN);
1265
1266	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1267	<	source_p->umodes |= UMODE_ADMIN;
1262	<	if (!IsOperN(source_p))
1263	<	source_p->umodes &= ~UMODE_NCHANGE;
1264	<
1265	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1266	<	source_p->name, source_p->username, source_p->host);
1266	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1267	>	get_oper_name(source_p));
1268		send_umode_out(source_p, source_p, old);
1269		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1269	–	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1270	–	me.name, source_p->name, operprivs);
1271	–	send_message_file(source_p, &ConfigFileEntry.opermotd);
1270		}
1271
1272		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1276 | Line 1274 | static char new_uid[TOTALSIDUID + 1];
1274		int
1275		valid_sid(const char *sid)
1276		{
1279	–
1277		if (strlen(sid) == IRC_MAXSID)
1278		if (IsDigit(*sid))
1279		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1297 | Line 1294 | valid_sid(const char *sid)
1294		void
1295		init_uid(void)
1296		{
1297	<	int i;
1297	>	unsigned int i;
1298
1299		memset(new_uid, 0, sizeof(new_uid));
1300
1301	<	if (ServerInfo.sid != NULL)
1305	<	{
1301	>	if (!EmptyString(ServerInfo.sid))
1302		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1307	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1303
1304	<	hash_add_id(&me);
1310	<	}
1311	<
1312	<	for (i = 0; i < IRC_MAXSID; i++)
1304	>	for (i = 0; i < IRC_MAXSID; ++i)
1305		if (new_uid[i] == '\0')
1306		new_uid[i] = 'A';
1307
#	Line 1319 | Line 1311 | init_uid(void)
1311		* -Dianora
1312		*/
1313		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1322	–
1323	–	entering_umode_cb = register_callback("entering_umode", NULL);
1324	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1325	–	uid_get_cb = register_callback("uid_get", uid_get);
1314		}
1315
1316		/*
#	Line 1365 | Line 1353 | add_one_to_uid(int i)
1353		* output       - new UID is returned to caller
1354		* side effects - new_uid is incremented by one.
1355		*/
1356	<	static void *
1357	<	uid_get(va_list args)
1356	>	static const char *
1357	>	uid_get(void)
1358		{
1359		add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1360		return new_uid;
#	Line 1389 | Line 1377 | init_isupport(void)
1377		add_isupport("DEAF", "D", -1);
1378		add_isupport("KICKLEN", NULL, KICKLEN);
1379		add_isupport("MODES", NULL, MAXMODEPARAMS);
1392	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1380		#ifdef HALFOPS
1381		add_isupport("PREFIX", "(ohv)@%+", -1);
1382		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1397 | Line 1384 | init_isupport(void)
1384		add_isupport("PREFIX", "(ov)@+", -1);
1385		add_isupport("STATUSMSG", "@+", -1);
1386		#endif
1400	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1387		}
1388
1389		/*
#	Line 1432 | Line 1418 | add_isupport(const char *name, const cha
1418		dlinkAddTail(support, &support->node, &support_list);
1419		}
1420
1421	<	DupString(support->name, name);
1421	>	support->name = xstrdup(name);
1422		if (options != NULL)
1423	<	DupString(support->options, options);
1423	>	support->options = xstrdup(options);
1424		support->number = n;
1425
1426		rebuild_isupport_message_line();
#	Line 1493 | Line 1479 | rebuild_isupport_message_line(void)
1479		{
1480		struct Isupport *support = ptr->data;
1481
1482	<	p += (n = ircsprintf(p, "%s", support->name));
1482	>	p += (n = sprintf(p, "%s", support->name));
1483		len += n;
1484
1485		if (support->options != NULL)
1486		{
1487	<	p += (n = ircsprintf(p, "=%s", support->options));
1487	>	p += (n = sprintf(p, "=%s", support->options));
1488		len += n;
1489		}
1490
1491		if (support->number > 0)
1492		{
1493	<	p += (n = ircsprintf(p, "=%d", support->number));
1493	>	p += (n = sprintf(p, "=%d", support->number));
1494		len += n;
1495		}
1496

Diff Legend

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