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 507 by michael, Sat Mar 4 08:20:28 2006 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 1904 by michael, Sat Apr 27 21:16:22 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	>
55
59	–	int MaxClientCount     = 1;
60	–	int MaxConnectionCount = 1;
56		struct Callback *entering_umode_cb = NULL;
57		struct Callback *umode_cb = NULL;
63	–	struct Callback *uid_get_cb = NULL;
58
59		static char umode_buffer[IRCD_BUFSIZE];
60
61		static void user_welcome(struct Client *);
62	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
62	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
63		static int check_xline(struct Client *);
64	<	static int check_regexp_xline(struct Client *);
65	<	static void introduce_client(struct Client *, struct Client *);
72	<	static void *uid_get(va_list);
64	>	static void introduce_client(struct Client *);
65	>	static const char *uid_get(void);
66
67		/* Used for building up the isupport string,
68		* used with init_isupport, add_isupport, delete_isupport
#	Line 96 | Line 89 | unsigned int user_modes[256] =
89		0,                  /* @ */
90		0,                  /* A */
91		0,                  /* B */
92	<	0,                  /* C */
92	>	UMODE_CCONN_FULL,   /* C */
93		UMODE_DEAF,         /* D */
94		0,                  /* E */
95		0,                  /* F */
96		UMODE_SOFTCALLERID, /* G */
97	<	0,                  /* H */
97	>	UMODE_HIDDEN,       /* H */
98		0,                  /* I */
99		0,                  /* J */
100		0,                  /* K */
#	Line 111 | Line 104 | unsigned int user_modes[256] =
104		0,                  /* O */
105		0,                  /* P */
106		0,                  /* Q */
107	<	0,                  /* R */
107	>	UMODE_REGONLY,      /* R */
108		0,                  /* S */
109		0,                  /* T */
110		0,                  /* U */
#	Line 126 | Line 119 | unsigned int user_modes[256] =
119		UMODE_BOTS,         /* b */
120		UMODE_CCONN,        /* c */
121		UMODE_DEBUG,        /* d */
122	<	0,                  /* e */
122	>	UMODE_EXTERNAL,     /* e */
123		UMODE_FULL,         /* f */
124		UMODE_CALLERID,     /* g */
125		0,                  /* h */
126		UMODE_INVISIBLE,    /* i */
127	<	0,                  /* j */
127	>	UMODE_REJ,          /* j */
128		UMODE_SKILL,        /* k */
129		UMODE_LOCOPS,       /* l */
130		0,                  /* m */
#	Line 139 | Line 132 | unsigned int user_modes[256] =
132		UMODE_OPER,         /* o */
133		0,                  /* p */
134		0,                  /* q */
135	<	UMODE_REJ,          /* r */
135	>	UMODE_REGISTERED,   /* r */
136		UMODE_SERVNOTICE,   /* s */
137		0,                  /* t */
138		UMODE_UNAUTH,       /* u */
139		0,                  /* v */
140		UMODE_WALLOP,       /* w */
141	<	UMODE_EXTERNAL,     /* x */
141	>	0,                  /* x */
142		UMODE_SPY,          /* y */
143		UMODE_OPERWALL,     /* z      0x7A */
144		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 166 | Line 159 | assemble_umode_buffer(void)
159		unsigned int idx = 0;
160		char *umode_buffer_ptr = umode_buffer;
161
162	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
162	>	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
163		if (user_modes[idx])
164		*umode_buffer_ptr++ = idx;
165
#	Line 195 | Line 188 | show_lusers(struct Client *source_p)
188		to = source_p->name;
189		}
190
191	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
191	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
192		sendto_one(source_p, form_str(RPL_LUSERCLIENT),
193		from, to, (Count.total-Count.invisi),
194		Count.invisi, dlink_list_length(&global_serv_list));
#	Line 215 | Line 208 | show_lusers(struct Client *source_p)
208		sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
209		from, to, dlink_list_length(&global_channel_list));
210
211	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
211	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
212		{
213		sendto_one(source_p, form_str(RPL_LUSERME),
214		from, to, Count.local, Count.myserver);
215		sendto_one(source_p, form_str(RPL_LOCALUSERS),
216	<	from, to, Count.local, Count.max_loc,
224	<	Count.local, Count.max_loc);
216	>	from, to, Count.local, Count.max_loc);
217		}
218		else
219		{
220		sendto_one(source_p, form_str(RPL_LUSERME),
221		from, to, Count.total, 0);
222		sendto_one(source_p, form_str(RPL_LOCALUSERS),
223	<	from, to, Count.total, Count.max_tot,
232	<	Count.total, Count.max_tot);
223	>	from, to, Count.total, Count.max_tot);
224		}
225
226		sendto_one(source_p, form_str(RPL_GLOBALUSERS),
227	<	from, to, Count.total, Count.max_tot,
237	<	Count.total, Count.max_tot);
227	>	from, to, Count.total, Count.max_tot);
228
229	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
229	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
230		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
231	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
231	>	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
232
233	<	if (Count.local > MaxClientCount)
234	<	MaxClientCount = Count.local;
233	>	if (Count.local > Count.max_loc_cli)
234	>	Count.max_loc_cli = Count.local;
235
236	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
237	<	MaxConnectionCount = Count.local + Count.myserver;
236	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
237	>	Count.max_loc_con = Count.local + Count.myserver;
238		}
239
240		/* show_isupport()
#	Line 283 | Line 273 | show_isupport(struct Client *source_p)
273		**         nick from local user or kill him/her...
274		*/
275		void
276	<	register_local_user(struct Client *client_p, struct Client *source_p,
287	<	const char *nick, const char *username)
276	>	register_local_user(struct Client *source_p)
277		{
278	<	const struct AccessItem *aconf = NULL;
279	<	char ipaddr[HOSTIPLEN];
291	<	dlink_node *ptr = NULL;
292	<	dlink_node *m = NULL;
278	>	const char *id = NULL;
279	>	const struct MaskItem *conf = NULL;
280
281		assert(source_p != NULL);
282	+	assert(source_p == source_p->from);
283		assert(MyConnect(source_p));
296	–	assert(source_p->username != username);
284		assert(!source_p->localClient->registration);
285
286	+	ClearCap(source_p, CAP_TS6);
287	+
288		if (ConfigFileEntry.ping_cookie)
289		{
290	<	if (!IsPingSent(source_p) &&
302	<	source_p->localClient->random_ping == 0)
290	>	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
291		{
292	<	source_p->localClient->random_ping = (unsigned long)rand();
293	<	sendto_one(source_p, "PING :%lu",
292	>	do
293	>	source_p->localClient->random_ping = genrand_int32();
294	>	while (!source_p->localClient->random_ping);
295	>
296	>	sendto_one(source_p, "PING :%u",
297		source_p->localClient->random_ping);
298		SetPingSent(source_p);
299		return;
#	Line 312 | Line 303 | register_local_user(struct Client *clien
303		return;
304		}
305
306	<	source_p->localClient->last = CurrentTime;
306	>	source_p->localClient->last_privmsg = CurrentTime;
307		/* Straight up the maximum rate of flooding... */
308		source_p->localClient->allow_read = MAX_FLOOD_BURST;
309
310	<	if (!execute_callback(client_check_cb, source_p, username))
310	>	if (!check_client(source_p))
311		return;
312
313		if (valid_hostname(source_p->host) == 0)
#	Line 327 | Line 318 | register_local_user(struct Client *clien
318		sizeof(source_p->host));
319		}
320
321	<	ptr   = source_p->localClient->confs.head;
331	<	aconf = map_to_conf(ptr->data);
321	>	conf = source_p->localClient->confs.head->data;
322
323		if (!IsGotId(source_p))
324		{
325	<	const char *p = NULL;
325	>	char username[USERLEN + 1];
326	>	const char *p = username;
327		unsigned int i = 0;
328
329	<	if (IsNeedIdentd(aconf))
329	>	if (IsNeedIdentd(conf))
330		{
331	<	ServerStats->is_ref++;
331	>	++ServerStats.is_ref;
332		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
333		"identd to use this server", me.name, source_p->name);
334		exit_client(source_p, &me, "Install identd");
335		return;
336		}
337
338	<	p = username;
338	>	strlcpy(username, source_p->username, sizeof(username));
339
340	<	if (!IsNoTilde(aconf))
340	>	if (!IsNoTilde(conf))
341		source_p->username[i++] = '~';
342
343	<	while (*p && i < USERLEN)
353	<	{
343	>	for (; *p && i < USERLEN; ++p)
344		if (*p != '[')
345		source_p->username[i++] = *p;
356	–	p++;
357	–	}
346
347		source_p->username[i] = '\0';
348		}
349
350		/* password check */
351	<	if (!EmptyString(aconf->passwd))
351	>	if (!EmptyString(conf->passwd))
352		{
353		const char *pass = source_p->localClient->passwd;
354
355	<	if (!match_conf_password(pass, aconf))
355	>	if (!match_conf_password(pass, conf))
356		{
357	<	ServerStats->is_ref++;
357	>	++ServerStats.is_ref;
358		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
359		me.name, source_p->name);
360		exit_client(source_p, &me, "Bad Password");
#	Line 380 | Line 368 | register_local_user(struct Client *clien
368		*/
369
370		/* report if user has &^>= etc. and set flags as needed in source_p */
371	<	report_and_set_user_flags(source_p, aconf);
371	>	report_and_set_user_flags(source_p, conf);
372	>
373	>	if (IsDead(source_p))
374	>	return;
375
376		/* Limit clients -
377		* We want to be able to have servers and F-line clients
#	Line 393 | Line 384 | register_local_user(struct Client *clien
384		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
386		{
387	<	sendto_realops_flags(UMODE_FULL, L_ALL,
387	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
388		"Too many clients, rejecting %s[%s].",
389	<	nick, source_p->host);
390	<	ServerStats->is_ref++;
389	>	source_p->name, source_p->host);
390	>	++ServerStats.is_ref;
391		exit_client(source_p, &me, "Sorry, server is full - try later");
392		return;
393		}
#	Line 406 | Line 397 | register_local_user(struct Client *clien
397		{
398		char tmpstr2[IRCD_BUFSIZE];
399
400	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
401	<	nick, source_p->username, source_p->host);
402	<	ServerStats->is_ref++;
403	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
400	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
401	>	"Invalid username: %s (%s@%s)",
402	>	source_p->name, source_p->username, source_p->host);
403	>	++ServerStats.is_ref;
404	>	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
405	>	source_p->username);
406		exit_client(source_p, &me, tmpstr2);
407		return;
408		}
409
410	<	assert(source_p == client_p);
418	<
419	<	/* end of valid user name check */
420	<	if (check_xline(source_p) || check_regexp_xline(source_p))
410	>	if (check_xline(source_p))
411		return;
412
413	<	if (IsDead(client_p))
414	<	return;
425	<
426	<	if (source_p->id[0] == '\0' && me.id[0])
427	<	{
428	<	char *id = (char *)execute_callback(uid_get_cb, source_p);
429	<	while (hash_find_id(id) != NULL)
430	<	id = uid_get(NULL);
413	>	while (hash_find_id((id = uid_get())) != NULL)
414	>	;
415
416	<	strlcpy(source_p->id, id, sizeof(source_p->id));
417	<	hash_add_id(source_p);
434	<	}
435	<
436	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
437	<	source_p->localClient->ip.ss_len, ipaddr,
438	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
416	>	strlcpy(source_p->id, id, sizeof(source_p->id));
417	>	hash_add_id(source_p);
418
419	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
420	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
421	<	nick, source_p->username, source_p->host,
419	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
420	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
421	>	source_p->name, source_p->username, source_p->host,
422	>	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
423	>	"255.255.255.255" : source_p->sockhost,
424	>	get_client_class(&source_p->localClient->confs),
425	>	source_p->info, source_p->id);
426	>
427	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
428	>	"CLICONN %s %s %s %s %s %s %s 0 %s",
429	>	source_p->name, source_p->username, source_p->host,
430		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	<	"255.255.255.255" : ipaddr, get_client_class(source_p),
431	>	"255.255.255.255" : source_p->sockhost,
432	>	get_client_class(&source_p->localClient->confs),
433	>	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434	>	"<hidden>" : source_p->localClient->client_host,
435	>	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436	>	"<hidden>" : source_p->localClient->client_server,
437		source_p->info);
438
447	–	/* If they have died in send_* don't do anything. */
448	–	if (IsDead(source_p))
449	–	return;
439
440		if (ConfigFileEntry.invisible_on_connect)
441		{
442	<	source_p->umodes |= UMODE_INVISIBLE;
443	<	Count.invisi++;
442	>	AddUMode(source_p, UMODE_INVISIBLE);
443	>	++Count.invisi;
444		}
445
446		if ((++Count.local) > Count.max_loc)
#	Line 459 | Line 448 | register_local_user(struct Client *clien
448		Count.max_loc = Count.local;
449
450		if (!(Count.max_loc % 10))
451	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
451	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
452	>	"New Max Local Clients: %d",
453		Count.max_loc);
454		}
455
466	–	SetClient(source_p);
467	–
468	–	source_p->servptr = &me;
469	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
470	–
456		/* Increment our total user count here */
457		if (++Count.total > Count.max_tot)
458		Count.max_tot = Count.total;
459	<	Count.totalrestartcount++;
459	>	++Count.totalrestartcount;
460	>
461	>	assert(source_p->servptr == &me);
462	>	SetClient(source_p);
463	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
464
465		source_p->localClient->allow_read = MAX_FLOOD_BURST;
466
467	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
468	<	{
469	<	free_dlink_node(m);
470	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
482	<	}
483	<	else assert(0);
467	>	assert(dlinkFind(&unknown_list, source_p));
468	>
469	>	dlink_move_node(&source_p->localClient->lclient_node,
470	>	&unknown_list, &local_client_list);
471
472		user_welcome(source_p);
473		add_user_host(source_p->username, source_p->host, 0);
474		SetUserHost(source_p);
475
476	<	introduce_client(client_p, source_p);
476	>	introduce_client(source_p);
477		}
478
479		/* register_remote_user()
480		*
481	<	* inputs       - client_p directly connected client
495	<	*              - source_p remote or directly connected client
481	>	* inputs       - source_p remote or directly connected client
482		*              - username to register as
483		*              - host name to register as
484		*              - server name
#	Line 502 | Line 488 | register_local_user(struct Client *clien
488		*                is introduced by a server.
489		*/
490		void
491	<	register_remote_user(struct Client *client_p, struct Client *source_p,
491	>	register_remote_user(struct Client *source_p,
492		const char *username, const char *host, const char *server,
493		const char *realname)
494		{
#	Line 512 | Line 498 | register_remote_user(struct Client *clie
498		assert(source_p->username != username);
499
500		strlcpy(source_p->host, host, sizeof(source_p->host));
515	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
501		strlcpy(source_p->username, username, sizeof(source_p->username));
502
518	–	/* Increment our total user count here */
519	–	if (++Count.total > Count.max_tot)
520	–	Count.max_tot = Count.total;
521	–
522	–	source_p->from->serv->dep_users++;
523	–
503		/*
504		* coming from another server, take the servers word for it
505		*/
506	<	source_p->servptr = find_server(server);
506	>	source_p->servptr = hash_find_server(server);
507
508	<	/* Super GhostDetect:
508	>	/*
509	>	* Super GhostDetect:
510		* If we can't find the server the user is supposed to be on,
511		* then simply blow the user away.        -Taner
512		*/
513		if (source_p->servptr == NULL)
514		{
515	<	sendto_realops_flags(UMODE_ALL, L_ALL,
515	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
516		"No server %s for user %s[%s@%s] from %s",
517		server, source_p->name, source_p->username,
518		source_p->host, source_p->from->name);
519	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
519	>	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
520
521	<	SetKilled(source_p);
521	>	AddFlag(source_p, FLAGS_KILLED);
522		exit_client(source_p, &me, "Ghosted Client");
523		return;
524		}
525
526		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
527		{
528	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
528	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
529		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
530	<	client_p->name, source_p->name, source_p->username,
530	>	source_p->from->name, source_p->name, source_p->username,
531		source_p->host, source_p->servptr->name,
532		target_p->name, target_p->from->name);
533	<	kill_client(client_p, source_p,
533	>	kill_client(source_p->from, source_p,
534		"%s (NICK from wrong direction (%s != %s))",
535		me.name, source_p->servptr->name, target_p->from->name);
536	<	SetKilled(source_p);
536	>	AddFlag(source_p, FLAGS_KILLED);
537		exit_client(source_p, &me, "USER server wrong direction");
538		return;
539		}
540
541	+	/*
542	+	* If the nick has been introduced by a services server,
543	+	* make it a service as well.
544	+	*/
545	+	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
546	+	AddFlag(source_p, FLAGS_SERVICE);
547	+
548	+	/* Increment our total user count here */
549	+	if (++Count.total > Count.max_tot)
550	+	Count.max_tot = Count.total;
551	+
552		SetClient(source_p);
553	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->users);
553	>	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
554		add_user_host(source_p->username, source_p->host, 1);
555		SetUserHost(source_p);
556
557	<	introduce_client(client_p, source_p);
557	>	introduce_client(source_p);
558		}
559
560		/* introduce_client()
561		*
562	<	* inputs       - client_p
572	<	*              - source_p
562	>	* inputs       - source_p
563		* output       - NONE
564		* side effects - This common function introduces a client to the rest
565		*                of the net, either from a local client connect or
566		*                from a remote connect.
567		*/
568		static void
569	<	introduce_client(struct Client *client_p, struct Client *source_p)
569	>	introduce_client(struct Client *source_p)
570		{
571		dlink_node *server_node = NULL;
572		static char ubuf[12];
#	Line 586 | Line 576 | introduce_client(struct Client *client_p
576		else
577		send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
578
579	+	watch_check_hash(source_p, RPL_LOGON);
580	+
581		if (*ubuf == '\0')
582		{
583		ubuf[0] = '+';
584		ubuf[1] = '\0';
585		}
586
587	<	/* arghhh one could try not introducing new nicks to ll leafs
596	<	* but then you have to introduce them "on the fly" in SJOIN
597	<	* not fun.
598	<	* Its not going to cost much more bandwidth to simply let new
599	<	* nicks just ride on through.
600	<	*/
601	<
602	<	/* We now introduce nicks "on the fly" in SJOIN anyway --
603	<	* 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	<	*/
610	<	if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL) &&
611	<	client_p != uplink)
587	>	DLINK_FOREACH(server_node, serv_list.head)
588		{
589	<	if (IsCapable(uplink, CAP_TS6) && HasID(source_p))
589	>	struct Client *server = server_node->data;
590	>
591	>	if (server == source_p->from)
592	>	continue;
593	>
594	>	if (IsCapable(server, CAP_SVS))
595		{
596	<	sendto_one(uplink, ":%s UID %s %d %lu %s %s %s %s %s :%s",
597	<	source_p->servptr->id,
598	<	source_p->name, source_p->hopcount+1,
599	<	(unsigned long)source_p->tsinfo,
600	<	ubuf, source_p->username, source_p->host,
601	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
602	<	"0" : source_p->sockhost, source_p->id, source_p->info);
596	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
597	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
598	>	source_p->servptr->id,
599	>	source_p->name, source_p->hopcount+1,
600	>	(unsigned long)source_p->tsinfo,
601	>	ubuf, source_p->username, source_p->host,
602	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
603	>	"0" : source_p->sockhost, source_p->id,
604	>	source_p->svid,
605	>	source_p->info);
606	>	else
607	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
608	>	source_p->name, source_p->hopcount+1,
609	>	(unsigned long)source_p->tsinfo,
610	>	ubuf, source_p->username, source_p->host,
611	>	source_p->servptr->name, source_p->svid,
612	>	source_p->info);
613	>
614		}
615		else
616		{
625	–	sendto_one(uplink, "NICK %s %d %lu %s %s %s %s :%s",
626	–	source_p->name, source_p->hopcount+1,
627	–	(unsigned long)source_p->tsinfo,
628	–	ubuf, source_p->username, source_p->host,
629	–	source_p->servptr->name, source_p->info);
630	–	}
631	–	}
632	–	else
633	–	{
634	–	DLINK_FOREACH(server_node, serv_list.head)
635	–	{
636	–	struct Client *server = server_node->data;
637	–
638	–	if (IsCapable(server, CAP_LL) || server == client_p)
639	–	continue;
640	–
617		if (IsCapable(server, CAP_TS6) && HasID(source_p))
618		sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
619		source_p->servptr->id,
#	Line 672 | Line 648 | valid_hostname(const char *hostname)
648
649		assert(p != NULL);
650
651	<	if ('.' == *p || ':' == *p)
651	>	if (*p == '.' || *p == ':')
652		return 0;
653
654	<	while (*p)
679	<	{
654	>	for (; *p; ++p)
655		if (!IsHostChar(*p))
656		return 0;
682	–	p++;
683	–	}
657
658	<	return 1;
658	>	return p - hostname <= HOSTLEN;
659		}
660
661		/* valid_username()
#	Line 704 | Line 677 | valid_username(const char *username)
677
678		assert(p != NULL);
679
680	<	if ('~' == *p)
680	>	if (*p == '~')
681		++p;
682
683		/* reject usernames that don't start with an alphanum
#	Line 718 | Line 691 | valid_username(const char *username)
691		{
692		if ((*p == '.') && ConfigFileEntry.dots_in_ident)
693		{
694	<	dots++;
722	<
723	<	if (dots > ConfigFileEntry.dots_in_ident)
694	>	if (++dots > ConfigFileEntry.dots_in_ident)
695		return 0;
696	<	if (!IsUserChar(p[1]))
696	>	if (!IsUserChar(*(p + 1)))
697		return 0;
698		}
699		else if (!IsUserChar(*p))
#	Line 732 | Line 703 | valid_username(const char *username)
703		return 1;
704		}
705
706	+	/* clean_nick_name()
707	+	*
708	+	* input        - nickname
709	+	*              - whether it's a local nick (1) or remote (0)
710	+	* output       - none
711	+	* side effects - walks through the nickname, returning 0 if erroneous
712	+	*/
713	+	int
714	+	valid_nickname(const char *nickname, const int local)
715	+	{
716	+	const char *p = nickname;
717	+	assert(nickname && *nickname);
718	+
719	+	/* nicks can't start with a digit or - or be 0 length */
720	+	/* This closer duplicates behaviour of hybrid-6 */
721	+	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
722	+	return 0;
723	+
724	+	for (; *p; ++p)
725	+	if (!IsNickChar(*p))
726	+	return 0;
727	+
728	+	return p - nickname <= NICKLEN;
729	+	}
730	+
731		/* report_and_set_user_flags()
732		*
733		* inputs       - pointer to source_p
734	<	*              - pointer to aconf for this user
734	>	*              - pointer to conf for this user
735		* output       - NONE
736		* side effects - Report to user any special flags
737		*                they are getting, and set them.
738		*/
739		static void
740	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
740	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
741		{
742		/* If this user is being spoofed, tell them so */
743	<	if (IsConfDoSpoofIp(aconf))
743	>	if (IsConfDoSpoofIp(conf))
744		{
745		sendto_one(source_p,
746		":%s NOTICE %s :*** Spoofing your IP. congrats.",
#	Line 752 | Line 748 | report_and_set_user_flags(struct Client
748		}
749
750		/* If this user is in the exception class, Set it "E lined" */
751	<	if (IsConfExemptKline(aconf))
751	>	if (IsConfExemptKline(conf))
752		{
753		SetExemptKline(source_p);
754		sendto_one(source_p,
#	Line 763 | Line 759 | report_and_set_user_flags(struct Client
759		/* The else here is to make sure that G line exempt users
760		* do not get noticed twice.
761		*/
762	<	else if (IsConfExemptGline(aconf))
762	>	else if (IsConfExemptGline(conf))
763		{
764		SetExemptGline(source_p);
765		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
766		me.name, source_p->name);
767		}
768
769	<	if (IsConfExemptResv(aconf))
769	>	if (IsConfExemptResv(conf))
770		{
771		SetExemptResv(source_p);
772		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
#	Line 778 | Line 774 | report_and_set_user_flags(struct Client
774		}
775
776		/* If this user is exempt from user limits set it "F lined" */
777	<	if (IsConfExemptLimits(aconf))
777	>	if (IsConfExemptLimits(conf))
778		{
779		SetExemptLimits(source_p);
780		sendto_one(source_p,
#	Line 786 | Line 782 | report_and_set_user_flags(struct Client
782		me.name,source_p->name);
783		}
784
785	<	/* If this user is exempt from idle time outs */
790	<	if (IsConfIdlelined(aconf))
791	<	{
792	<	SetIdlelined(source_p);
793	<	sendto_one(source_p,
794	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
795	<	me.name, source_p->name);
796	<	}
797	<
798	<	if (IsConfCanFlood(aconf))
785	>	if (IsConfCanFlood(conf))
786		{
787		SetCanFlood(source_p);
788		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 804 | Line 791 | report_and_set_user_flags(struct Client
791		}
792		}
793
807	–	/* do_local_user()
808	–	*
809	–	* inputs       -
810	–	* output       - NONE
811	–	* side effects -
812	–	*/
813	–	void
814	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
815	–	const char *username, const char *host, const char *server,
816	–	const char *realname)
817	–	{
818	–	assert(source_p != NULL);
819	–	assert(source_p->username != username);
820	–
821	–	if (source_p == NULL)
822	–	return;
823	–
824	–	if (!IsUnknown(source_p))
825	–	{
826	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
827	–	me.name, nick);
828	–	return;
829	–	}
830	–
831	–	source_p->localClient->registration &= ~REG_NEED_USER;
832	–
833	–	/*
834	–	* don't take the clients word for it, ever
835	–	*/
836	–	source_p->servptr = &me;
837	–
838	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
839	–
840	–	if (!IsGotId(source_p))
841	–	{
842	–	/* save the username in the client
843	–	* If you move this you'll break ping cookies..you've been warned
844	–	*/
845	–	strlcpy(source_p->username, username, sizeof(source_p->username));
846	–	}
847	–
848	–	if (!source_p->localClient->registration)
849	–	/* NICK already received, now I have USER... */
850	–	register_local_user(client_p, source_p, source_p->name, username);
851	–	}
852	–
794		/* change_simple_umode()
795		*
796		* this callback can be hooked to allow special handling of
#	Line 858 | Line 799 | do_local_user(const char *nick, struct C
799		static void *
800		change_simple_umode(va_list args)
801		{
802	+	struct Client *client_p;
803		struct Client *source_p;
804		int what;
805		unsigned int flag;
806
807	<	va_arg(args, struct Client *);
807	>	client_p = va_arg(args, struct Client *);
808		source_p = va_arg(args, struct Client *);
809		what = va_arg(args, int);
810		flag = va_arg(args, unsigned int);
811
812		if (what == MODE_ADD)
813	<	source_p->umodes |= flag;
813	>	AddUMode(source_p, flag);
814		else
815	<	source_p->umodes &= ~flag;
815	>	DelUMode(source_p, flag);
816
817		return NULL;
818		}
#	Line 884 | Line 826 | change_simple_umode(va_list args)
826		*/
827		void
828		set_user_mode(struct Client *client_p, struct Client *source_p,
829	<	int parc, char *parv[])
829	>	const int parc, char *parv[])
830		{
831		unsigned int flag, setflags;
832		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 901 | Line 843 | set_user_mode(struct Client *client_p, s
843		return;
844		}
845
846	<	if (IsServer(source_p))
905	<	{
906	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
907	<	parv[1], source_p->name);
908	<	return;
909	<	}
910	<
911	<	if (source_p != target_p || target_p->from != source_p->from)
846	>	if (source_p != target_p)
847		{
848		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
849		me.name, source_p->name);
#	Line 921 | Line 856 | set_user_mode(struct Client *client_p, s
856		*m++ = '+';
857
858		for (i = 0; i < 128; i++)
859	<	if (source_p->umodes & user_modes[i])
859	>	if (HasUMode(source_p, user_modes[i]))
860		*m++ = (char)i;
861		*m = '\0';
862
#	Line 951 | Line 886 | set_user_mode(struct Client *client_p, s
886		case 'o':
887		if (what == MODE_ADD)
888		{
889	<	if (IsServer(client_p) && !IsOper(source_p))
889	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
890		{
891		++Count.oper;
892		SetOper(source_p);
#	Line 962 | Line 897 | set_user_mode(struct Client *client_p, s
897		/* Only decrement the oper counts if an oper to begin with
898		* found by Pat Szuta, Perly , perly@xnet.com
899		*/
900	<	if (!IsOper(source_p))
900	>	if (!HasUMode(source_p, UMODE_OPER))
901		break;
902
903		ClearOper(source_p);
969	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
904		Count.oper--;
905
906		if (MyConnect(source_p))
907		{
908		dlink_node *dm;
909
910	<	detach_conf(source_p, OPER_TYPE);
911	<	ClearOperFlags(source_p);
910	>	detach_conf(source_p, CONF_OPER);
911	>	ClrOFlag(source_p);
912	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
913
914		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
915		free_dlink_node(dm);
#	Line 986 | Line 921 | set_user_mode(struct Client *client_p, s
921		/* we may not get these,
922		* but they shouldnt be in default
923		*/
924	+	case 'r':
925		case ' ' :
926		case '\n':
927		case '\r':
#	Line 995 | Line 931 | set_user_mode(struct Client *client_p, s
931		default:
932		if ((flag = user_modes[(unsigned char)*m]))
933		{
934	<	if (MyConnect(source_p) && !IsOper(source_p) &&
934	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
935		(ConfigFileEntry.oper_only_umodes & flag))
936		{
937		badflag = 1;
#	Line 1018 | Line 954 | set_user_mode(struct Client *client_p, s
954		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
955		me.name, source_p->name);
956
957	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
958	<	{
1023	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
1024	<	me.name, source_p->name);
1025	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
1026	<	}
1027	<
1028	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
1029	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
957	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
958	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
959		{
960		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
961		me.name, source_p->name);
962	<	source_p->umodes &= ~UMODE_ADMIN;
962	>	DelUMode(source_p, UMODE_ADMIN);
963		}
964
965	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
965	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
966		++Count.invisi;
967	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
967	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
968		--Count.invisi;
969
970		/*
#	Line 1048 | Line 977 | set_user_mode(struct Client *client_p, s
977		/* send_umode()
978		* send the MODE string for user (user) to connection client_p
979		* -avalon
980	+	*
981	+	* inputs       - client_p
982	+	*              - source_p
983	+	*              - int old
984	+	*              - sendmask mask of modes to send
985	+	*              - suplied umode_buf
986	+	* output       - NONE
987		*/
988		void
989		send_umode(struct Client *client_p, struct Client *source_p,
990		unsigned int old, unsigned int sendmask, char *umode_buf)
991		{
992	+	char *m = umode_buf;
993		int what = 0;
994		unsigned int i;
995		unsigned int flag;
1059	–	char *m = umode_buf;
996
997		/*
998		* build a string in umode_buf to represent the change in the user's
#	Line 1071 | Line 1007 | send_umode(struct Client *client_p, stru
1007		if (MyClient(source_p) && !(flag & sendmask))
1008		continue;
1009
1010	<	if ((flag & old) && !(source_p->umodes & flag))
1010	>	if ((flag & old) && !HasUMode(source_p, flag))
1011		{
1012		if (what == MODE_DEL)
1013		*m++ = (char)i;
#	Line 1082 | Line 1018 | send_umode(struct Client *client_p, stru
1018		*m++ = (char)i;
1019		}
1020		}
1021	<	else if (!(flag & old) && (source_p->umodes & flag))
1021	>	else if (!(flag & old) && HasUMode(source_p, flag))
1022		{
1023		if (what == MODE_ADD)
1024		*m++ = (char)i;
#	Line 1098 | Line 1034 | send_umode(struct Client *client_p, stru
1034		*m = '\0';
1035
1036		if (*umode_buf && client_p)
1037	<	sendto_one(client_p, ":%s MODE %s :%s",
1038	<	source_p->name, source_p->name, umode_buf);
1037	>	sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
1038	>	source_p->name, source_p->username,
1039	>	source_p->host, source_p->name, umode_buf);
1040		}
1041
1042		/* send_umode_out()
#	Line 1112 | Line 1049 | void
1049		send_umode_out(struct Client *client_p, struct Client *source_p,
1050		unsigned int old)
1051		{
1052	<	char buf[IRCD_BUFSIZE];
1052	>	char buf[IRCD_BUFSIZE] = { '\0' };
1053		dlink_node *ptr = NULL;
1054
1055	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1119	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1055	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1056
1057	<	if (*buf)
1057	>	if (buf[0])
1058		{
1059		DLINK_FOREACH(ptr, serv_list.head)
1060		{
1061		struct Client *target_p = ptr->data;
1062
1063		if ((target_p != client_p) && (target_p != source_p))
1064	<	{
1065	<	if ((!(ServerInfo.hub && IsCapable(target_p, CAP_LL))) ||
1066	<	(target_p->localClient->serverMask &
1131	<	source_p->lazyLinkClientExists))
1132	<	sendto_one(target_p, ":%s MODE %s :%s",
1133	<	ID_or_name(source_p, target_p),
1134	<	ID_or_name(source_p, target_p), buf);
1135	<	}
1064	>	sendto_one(target_p, ":%s MODE %s :%s",
1065	>	ID_or_name(source_p, target_p),
1066	>	ID_or_name(source_p, target_p), buf);
1067		}
1068		}
1069
#	Line 1140 | Line 1071 | send_umode_out(struct Client *client_p,
1071		send_umode(client_p, source_p, old, 0xffffffff, buf);
1072		}
1073
1074	+	void
1075	+	user_set_hostmask(struct Client *target_p, const char *hostname)
1076	+	{
1077	+	if (!valid_hostname(hostname))
1078	+	return;
1079	+
1080	+	if (IsUserHostIp(target_p))
1081	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1082	+
1083	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1084	+	SetIPSpoof(target_p);
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	+	clear_ban_cache_client(target_p);
1091	+	}
1092	+
1093		/* user_welcome()
1094		*
1095		* inputs       - client pointer to client to welcome
#	Line 1163 | Line 1113 | user_welcome(struct Client *source_p)
1113		#endif
1114
1115		sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1116	<	ServerInfo.network_name, source_p->name);
1116	>	ServerInfo.network_name, source_p->name,
1117	>	source_p->username, source_p->host);
1118		sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1119		get_listener_name(source_p->localClient->listener), ircd_version);
1120		sendto_one(source_p, form_str(RPL_CREATED),
#	Line 1180 | Line 1131 | user_welcome(struct Client *source_p)
1131
1132		if (ConfigFileEntry.short_motd)
1133		{
1134	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1135	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1134	>	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1135	>	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1136		sendto_one(source_p,
1137	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1138	<	"read it", source_p->name);
1137	>	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1138	>	"read it", me.name, source_p->name);
1139		sendto_one(source_p, form_str(RPL_MOTDSTART),
1140		me.name, source_p->name, me.name);
1141		sendto_one(source_p, form_str(RPL_MOTD),
#	Line 1206 | Line 1157 | user_welcome(struct Client *source_p)
1157		static int
1158		check_xline(struct Client *source_p)
1159		{
1160	<	struct ConfItem *conf;
1210	<	struct MatchItem *xconf;
1211	<	const char *reason;
1212	<
1213	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info,
1214	<	NULL, NULL, 0)) != NULL)
1215	<	{
1216	<	xconf = map_to_conf(conf);
1217	<	xconf->count++;
1218	<
1219	<	if (xconf->reason != NULL)
1220	<	reason = xconf->reason;
1221	<	else
1222	<	reason = "No Reason";
1223	<
1224	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1225	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1226	<	source_p->info, reason,
1227	<	get_client_name(source_p, HIDE_IP),
1228	<	source_p->sockhost);
1229	<
1230	<	ServerStats->is_ref++;
1231	<	if (REJECT_HOLD_TIME > 0)
1232	<	{
1233	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1234	<	me.name, source_p->name);
1235	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1236	<	SetCaptured(source_p);
1237	<	}
1238	<	else
1239	<	exit_client(source_p, &me, "Bad user info");
1240	<	return 1;
1241	<	}
1242	<
1243	<	return 0;
1244	<	}
1245	<
1246	<	static int
1247	<	check_regexp_xline(struct Client *source_p)
1248	<	{
1249	<	struct ConfItem *conf = NULL;
1160	>	struct MaskItem *conf = NULL;
1161		const char *reason = NULL;
1162
1163	<	if ((conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1163	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
1164	>	(conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
1165		{
1166	<	struct MatchItem *reg = map_to_conf(conf);
1255	<
1256	<	++reg->count;
1166	>	++conf->count;
1167
1168	<	if (reg->reason != NULL)
1169	<	reason = reg->reason;
1168	>	if (conf->reason != NULL)
1169	>	reason = conf->reason;
1170		else
1171		reason = "No Reason";
1172
1173	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1174	<	"X-line (REGEX) Rejecting [%s] [%s], user %s [%s]",
1173	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1174	>	"X-line Rejecting [%s] [%s], user %s [%s]",
1175		source_p->info, reason,
1176		get_client_name(source_p, HIDE_IP),
1177		source_p->sockhost);
1178
1179	<	ServerStats->is_ref++;
1179	>	++ServerStats.is_ref;
1180		exit_client(source_p, &me, "Bad user info");
1181		return 1;
1182		}
#	Line 1278 | Line 1188 | check_regexp_xline(struct Client *source
1188		*
1189		* inputs       - pointer to given client to oper
1190		* output       - NONE
1191	<	* side effects - Blindly opers up given source_p, using aconf info
1191	>	* side effects - Blindly opers up given source_p, using conf info
1192		*                all checks on passwords have already been done.
1193		*                This could also be used by rsa oper routines.
1194		*/
1195		void
1196		oper_up(struct Client *source_p)
1197		{
1198	<	unsigned int old = source_p->umodes;
1199	<	const char *operprivs = "";
1290	<	const struct AccessItem *oconf = NULL;
1198	>	const unsigned int old = source_p->umodes;
1199	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1200
1201		assert(source_p->localClient->confs.head);
1293	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1202
1203		++Count.oper;
1204		SetOper(source_p);
1205
1206	<	if (oconf->modes)
1207	<	source_p->umodes |= oconf->modes;
1206	>	if (conf->modes)
1207	>	AddUMode(source_p, conf->modes);
1208		else if (ConfigFileEntry.oper_umodes)
1209	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1210	<	else
1211	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1212	<	UMODE_WALLOP|UMODE_LOCOPS);
1209	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1210	>
1211	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1212	>	++Count.invisi;
1213	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1214	>	--Count.invisi;
1215
1216		assert(dlinkFind(&oper_list, source_p) == NULL);
1217		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1218
1219	<	operprivs = oper_privs_as_string(oconf->port);
1310	<
1311	<	SetOFlag(source_p, oconf->port);
1219	>	AddOFlag(source_p, conf->port);
1220
1221	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1222	<	source_p->umodes |= UMODE_ADMIN;
1315	<	if (!IsOperN(source_p))
1316	<	source_p->umodes &= ~UMODE_NCHANGE;
1221	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1222	>	AddUMode(source_p, UMODE_ADMIN);
1223
1224	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1225	<	source_p->name, source_p->username, source_p->host);
1224	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1225	>	get_oper_name(source_p));
1226		send_umode_out(source_p, source_p, old);
1227		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1322	–	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1323	–	me.name, source_p->name, operprivs);
1324	–	send_message_file(source_p, &ConfigFileEntry.opermotd);
1228		}
1229
1230	<	/*
1328	<	* Quick and dirty UID code for new proposed SID on EFnet
1329	<	*
1330	<	*/
1230	>	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1231
1232	<	static char new_uid[TOTALSIDUID+1];     /* allow for \0 */
1233	<	static void add_one_to_uid(int i);
1232	>	int
1233	>	valid_sid(const char *sid)
1234	>	{
1235	>	if (strlen(sid) == IRC_MAXSID)
1236	>	if (IsDigit(*sid))
1237	>	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1238	>	return 1;
1239	>
1240	>	return 0;
1241	>	}
1242
1243		/*
1244		* init_uid()
#	Line 1344 | Line 1252 | static void add_one_to_uid(int i);
1252		void
1253		init_uid(void)
1254		{
1255	<	int i;
1255	>	unsigned int i;
1256
1257		memset(new_uid, 0, sizeof(new_uid));
1258
1259	<	if (ServerInfo.sid != NULL)
1260	<	{
1353	<	memcpy(new_uid, ServerInfo.sid, IRCD_MIN(strlen(ServerInfo.sid),
1354	<	IRC_MAXSID));
1355	<	memcpy(&me.id, ServerInfo.sid, IRCD_MIN(strlen(ServerInfo.sid),
1356	<	IRC_MAXSID));
1357	<	hash_add_id(&me);
1358	<	}
1259	>	if (!EmptyString(ServerInfo.sid))
1260	>	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1261
1262	<	for (i = 0; i < IRC_MAXSID; i++)
1262	>	for (i = 0; i < IRC_MAXSID; ++i)
1263		if (new_uid[i] == '\0')
1264		new_uid[i] = 'A';
1265
1266	<	/* XXX if IRC_MAXUID != 6, this will have to be rewritten */
1266	>	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1267		/* Yes nenolod, I have known it was off by one ever since I wrote it
1268		* But *JUST* for you, though, it really doesn't look as *pretty*
1269		* -Dianora
1270		*/
1271	<	memcpy(new_uid+IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1271	>	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1272
1273		entering_umode_cb = register_callback("entering_umode", NULL);
1274		umode_cb = register_callback("changing_umode", change_simple_umode);
1373	–	uid_get_cb = register_callback("uid_get", uid_get);
1374	–	}
1375	–
1376	–	/*
1377	–	* uid_get
1378	–	*
1379	–	* inputs       - struct Client *
1380	–	* output       - new UID is returned to caller
1381	–	* side effects - new_uid is incremented by one.
1382	–	*/
1383	–	static void *
1384	–	uid_get(va_list args)
1385	–	{
1386	–	add_one_to_uid(TOTALSIDUID-1);    /* index from 0 */
1387	–	return ((void *) new_uid);
1275		}
1276
1277		/*
#	Line 1407 | Line 1294 | add_one_to_uid(int i)
1294		new_uid[i] = 'A';
1295		add_one_to_uid(i-1);
1296		}
1297	<	else new_uid[i] = new_uid[i] + 1;
1297	>	else
1298	>	++new_uid[i];
1299		}
1300		else
1301		{
1302	<	/* XXX if IRC_MAXUID != 6, this will have to be rewritten */
1302	>	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1303		if (new_uid[i] == 'Z')
1304	<	memcpy(new_uid+IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1304	>	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1305		else
1306	<	new_uid[i] = new_uid[i] + 1;
1306	>	++new_uid[i];
1307		}
1308		}
1309
1310		/*
1311	+	* uid_get
1312	+	*
1313	+	* inputs       - struct Client *
1314	+	* output       - new UID is returned to caller
1315	+	* side effects - new_uid is incremented by one.
1316	+	*/
1317	+	static const char *
1318	+	uid_get(void)
1319	+	{
1320	+	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1321	+	return new_uid;
1322	+	}
1323	+
1324	+	/*
1325		* init_isupport()
1326		*
1327		* input        - NONE
#	Line 1433 | Line 1335 | init_isupport(void)
1335
1336		add_isupport("CALLERID", NULL, -1);
1337		add_isupport("CASEMAPPING", CASEMAP, -1);
1338	+	add_isupport("DEAF", "D", -1);
1339		add_isupport("KICKLEN", NULL, KICKLEN);
1340		add_isupport("MODES", NULL, MAXMODEPARAMS);
1438	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1341		#ifdef HALFOPS
1342		add_isupport("PREFIX", "(ohv)@%+", -1);
1343		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1443 | Line 1345 | init_isupport(void)
1345		add_isupport("PREFIX", "(ov)@+", -1);
1346		add_isupport("STATUSMSG", "@+", -1);
1347		#endif
1446	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1348		}
1349
1350		/*
#	Line 1478 | Line 1379 | add_isupport(const char *name, const cha
1379		dlinkAddTail(support, &support->node, &support_list);
1380		}
1381
1382	<	DupString(support->name, name);
1382	>	support->name = xstrdup(name);
1383		if (options != NULL)
1384	<	DupString(support->options, options);
1384	>	support->options = xstrdup(options);
1385		support->number = n;
1386
1387		rebuild_isupport_message_line();
#	Line 1539 | Line 1440 | rebuild_isupport_message_line(void)
1440		{
1441		struct Isupport *support = ptr->data;
1442
1443	<	p += (n = ircsprintf(p, "%s", support->name));
1443	>	p += (n = sprintf(p, "%s", support->name));
1444		len += n;
1445
1446		if (support->options != NULL)
1447		{
1448	<	p += (n = ircsprintf(p, "=%s", support->options));
1448	>	p += (n = sprintf(p, "=%s", support->options));
1449		len += n;
1450		}
1451
1452		if (support->number > 0)
1453		{
1454	<	p += (n = ircsprintf(p, "=%d", support->number));
1454	>	p += (n = sprintf(p, "=%d", support->number));
1455		len += n;
1456		}
1457

Diff Legend

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