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 983 by michael, Thu Aug 13 22:32:54 2009 UTC vs.
ircd-hybrid-8/src/s_user.c (file contents), Revision 1176 by michael, Sun Aug 14 11:24:24 2011 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"
#	Line 36 | Line 36
36		#include "sprintf_irc.h"
37		#include "s_bsd.h"
38		#include "ircd.h"
39	–	#include "list.h"
39		#include "listener.h"
40		#include "motd.h"
41		#include "numeric.h"
#	Line 53 | Line 52
52		#include "hook.h"
53		#include "s_misc.h"
54		#include "msg.h"
56	–	#include "pcre.h"
55		#include "watch.h"
56
57	<	int MaxClientCount     = 1;
60	<	int MaxConnectionCount = 1;
57	>
58		struct Callback *entering_umode_cb = NULL;
59		struct Callback *umode_cb = NULL;
63	–	struct Callback *uid_get_cb = NULL;
60
61		static char umode_buffer[IRCD_BUFSIZE];
62
63		static void user_welcome(struct Client *);
64		static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
65		static int check_xline(struct Client *);
66	<	static void introduce_client(struct Client *, struct Client *);
67	<	static void *uid_get(va_list);
66	>	static void introduce_client(struct Client *);
67	>	static const char *uid_get(void);
68
69		/* Used for building up the isupport string,
70		* used with init_isupport, add_isupport, delete_isupport
#	Line 110 | Line 106 | unsigned int user_modes[256] =
106		0,                  /* O */
107		0,                  /* P */
108		0,                  /* Q */
109	<	0,                  /* R */
109	>	UMODE_REGONLY,      /* R */
110		0,                  /* S */
111		0,                  /* T */
112		0,                  /* U */
#	Line 130 | Line 126 | unsigned int user_modes[256] =
126		UMODE_CALLERID,     /* g */
127		0,                  /* h */
128		UMODE_INVISIBLE,    /* i */
129	<	0,                  /* j */
129	>	UMODE_REJ,          /* j */
130		UMODE_SKILL,        /* k */
131		UMODE_LOCOPS,       /* l */
132		0,                  /* m */
#	Line 138 | Line 134 | unsigned int user_modes[256] =
134		UMODE_OPER,         /* o */
135		0,                  /* p */
136		0,                  /* q */
137	<	UMODE_REJ,          /* r */
137	>	UMODE_REGISTERED,   /* r */
138		UMODE_SERVNOTICE,   /* s */
139		0,                  /* t */
140		UMODE_UNAUTH,       /* u */
#	Line 165 | Line 161 | assemble_umode_buffer(void)
161		unsigned int idx = 0;
162		char *umode_buffer_ptr = umode_buffer;
163
164	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
164	>	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
165		if (user_modes[idx])
166		*umode_buffer_ptr++ = idx;
167
#	Line 237 | Line 233 | show_lusers(struct Client *source_p)
233
234		if (!ConfigServerHide.hide_servers || IsOper(source_p))
235		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
236	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
236	>	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
237
238	<	if (Count.local > MaxClientCount)
239	<	MaxClientCount = Count.local;
238	>	if (Count.local > Count.max_loc_cli)
239	>	Count.max_loc_cli = Count.local;
240
241	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
242	<	MaxConnectionCount = Count.local + Count.myserver;
241	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
242	>	Count.max_loc_con = Count.local + Count.myserver;
243		}
244
245		/* show_isupport()
#	Line 282 | Line 278 | show_isupport(struct Client *source_p)
278		**         nick from local user or kill him/her...
279		*/
280		void
281	<	register_local_user(struct Client *client_p, struct Client *source_p,
286	<	const char *nick, const char *username)
281	>	register_local_user(struct Client *source_p)
282		{
283	+	const char *id = NULL;
284		const struct AccessItem *aconf = NULL;
285		dlink_node *ptr = NULL;
290	–	dlink_node *m = NULL;
286
287		assert(source_p != NULL);
288	+	assert(source_p == source_p->from);
289		assert(MyConnect(source_p));
294	–	assert(source_p->username != username);
290		assert(!source_p->localClient->registration);
291
292	<	ClearCap(client_p, CAP_TS6);
292	>	ClearCap(source_p, CAP_TS6);
293
294		if (ConfigFileEntry.ping_cookie)
295		{
296	<	if (!IsPingSent(source_p) &&
302	<	source_p->localClient->random_ping == 0)
296	>	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
297		{
298		do
299		source_p->localClient->random_ping = genrand_int32();
#	Line 315 | Line 309 | register_local_user(struct Client *clien
309		return;
310		}
311
312	<	source_p->localClient->last = CurrentTime;
312	>	source_p->localClient->last_privmsg = CurrentTime;
313		/* Straight up the maximum rate of flooding... */
314		source_p->localClient->allow_read = MAX_FLOOD_BURST;
315
316	<	if (!execute_callback(client_check_cb, source_p, username))
316	>	if (!execute_callback(client_check_cb, source_p, source_p->username))
317		return;
318
319		if (valid_hostname(source_p->host) == 0)
#	Line 335 | Line 329 | register_local_user(struct Client *clien
329
330		if (!IsGotId(source_p))
331		{
332	<	const char *p = NULL;
332	>	char username[USERLEN + 1];
333	>	const char *p = username;
334		unsigned int i = 0;
335
336		if (IsNeedIdentd(aconf))
#	Line 347 | Line 342 | register_local_user(struct Client *clien
342		return;
343		}
344
345	<	p = username;
345	>	strlcpy(username, source_p->username, sizeof(username));
346
347		if (!IsNoTilde(aconf))
348		source_p->username[i++] = '~';
349
350	<	while (*p && i < USERLEN)
356	<	{
350	>	for (; *p && i < USERLEN; ++p)
351		if (*p != '[')
352		source_p->username[i++] = *p;
359	–	p++;
360	–	}
353
354		source_p->username[i] = '\0';
355		}
#	Line 385 | Line 377 | register_local_user(struct Client *clien
377		/* report if user has &^>= etc. and set flags as needed in source_p */
378		report_and_set_user_flags(source_p, aconf);
379
380	<	if (IsDead(client_p))
380	>	if (IsDead(source_p))
381		return;
382
383		/* Limit clients -
#	Line 401 | Line 393 | register_local_user(struct Client *clien
393		{
394		sendto_realops_flags(UMODE_FULL, L_ALL,
395		"Too many clients, rejecting %s[%s].",
396	<	nick, source_p->host);
396	>	source_p->name, source_p->host);
397		++ServerStats.is_ref;
398		exit_client(source_p, &me, "Sorry, server is full - try later");
399		return;
#	Line 413 | Line 405 | register_local_user(struct Client *clien
405		char tmpstr2[IRCD_BUFSIZE];
406
407		sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
408	<	nick, source_p->username, source_p->host);
408	>	source_p->name, source_p->username, source_p->host);
409		++ServerStats.is_ref;
410	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
410	>	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
411	>	source_p->username);
412		exit_client(source_p, &me, tmpstr2);
413		return;
414		}
415
423	–	assert(source_p == client_p);
424	–
416		if (check_xline(source_p))
417		return;
418
419	<	if (me.id[0])
420	<	{
430	<	const char *id = execute_callback(uid_get_cb, source_p);
419	>	while (hash_find_id((id = uid_get())) != NULL)
420	>	;
421
422	<	while (hash_find_id(id) != NULL)
423	<	id = uid_get(NULL);
434	<
435	<	strlcpy(source_p->id, id, sizeof(source_p->id));
436	<	hash_add_id(source_p);
437	<	}
422	>	strlcpy(source_p->id, id, sizeof(source_p->id));
423	>	hash_add_id(source_p);
424
425		sendto_realops_flags(UMODE_CCONN, L_ALL,
426	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
427	<	nick, source_p->username, source_p->host,
426	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
427	>	source_p->name, source_p->username, source_p->host,
428		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
429		"255.255.255.255" : source_p->sockhost,
430		get_client_class(source_p),
431	<	source_p->info);
431	>	source_p->info, source_p->id);
432
433		sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
434		"CLICONN %s %s %s %s %s %s %s 0 %s",
435	<	nick, source_p->username, source_p->host,
435	>	source_p->name, source_p->username, source_p->host,
436		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
437		"255.255.255.255" : source_p->sockhost,
438		get_client_class(source_p),
439		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
440	<	"<hidden>" : source_p->client_host,
440	>	"<hidden>" : source_p->localClient->client_host,
441		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
442	<	"<hidden>" : source_p->client_server,
442	>	"<hidden>" : source_p->localClient->client_server,
443		source_p->info);
444
445
#	Line 472 | Line 458 | register_local_user(struct Client *clien
458		Count.max_loc);
459		}
460
475	–	SetClient(source_p);
476	–
477	–	source_p->servptr = &me;
478	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
479	–
461		/* Increment our total user count here */
462		if (++Count.total > Count.max_tot)
463		Count.max_tot = Count.total;
464		++Count.totalrestartcount;
465
466	+	assert(source_p->servptr == &me);
467	+	SetClient(source_p);
468	+	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
469	+
470		source_p->localClient->allow_read = MAX_FLOOD_BURST;
471
472	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
473	<	{
474	<	free_dlink_node(m);
475	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
491	<	}
492	<	else assert(0);
472	>	assert(dlinkFind(&unknown_list, source_p));
473	>
474	>	dlink_move_node(&source_p->localClient->lclient_node,
475	>	&unknown_list, &local_client_list);
476
477		user_welcome(source_p);
478		add_user_host(source_p->username, source_p->host, 0);
479		SetUserHost(source_p);
480
481	<	introduce_client(client_p, source_p);
481	>	introduce_client(source_p);
482		}
483
484		/* register_remote_user()
485		*
486	<	* inputs       - client_p directly connected client
504	<	*              - source_p remote or directly connected client
486	>	* inputs       - source_p remote or directly connected client
487		*              - username to register as
488		*              - host name to register as
489		*              - server name
#	Line 511 | Line 493 | register_local_user(struct Client *clien
493		*                is introduced by a server.
494		*/
495		void
496	<	register_remote_user(struct Client *client_p, struct Client *source_p,
496	>	register_remote_user(struct Client *source_p,
497		const char *username, const char *host, const char *server,
498		const char *realname)
499		{
#	Line 526 | Line 508 | register_remote_user(struct Client *clie
508		/*
509		* coming from another server, take the servers word for it
510		*/
511	<	source_p->servptr = find_server(server);
511	>	source_p->servptr = hash_find_server(server);
512
513		/* Super GhostDetect:
514		* If we can't find the server the user is supposed to be on,
#	Line 538 | Line 520 | register_remote_user(struct Client *clie
520		"No server %s for user %s[%s@%s] from %s",
521		server, source_p->name, source_p->username,
522		source_p->host, source_p->from->name);
523	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
523	>	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
524
525		SetKilled(source_p);
526		exit_client(source_p, &me, "Ghosted Client");
#	Line 549 | Line 531 | register_remote_user(struct Client *clie
531		{
532		sendto_realops_flags(UMODE_DEBUG, L_ALL,
533		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
534	<	client_p->name, source_p->name, source_p->username,
534	>	source_p->from->name, source_p->name, source_p->username,
535		source_p->host, source_p->servptr->name,
536		target_p->name, target_p->from->name);
537	<	kill_client(client_p, source_p,
537	>	kill_client(source_p->from, source_p,
538		"%s (NICK from wrong direction (%s != %s))",
539		me.name, source_p->servptr->name, target_p->from->name);
540		SetKilled(source_p);
#	Line 560 | Line 542 | register_remote_user(struct Client *clie
542		return;
543		}
544
545	+	/*
546	+	* If the nick has been introduced by a services server,
547	+	* make it a service as well.
548	+	*/
549	+	if (IsService(source_p->servptr))
550	+	SetService(source_p);
551	+
552		/* Increment our total user count here */
553		if (++Count.total > Count.max_tot)
554		Count.max_tot = Count.total;
#	Line 569 | Line 558 | register_remote_user(struct Client *clie
558		add_user_host(source_p->username, source_p->host, 1);
559		SetUserHost(source_p);
560
561	<	introduce_client(client_p, source_p);
561	>	introduce_client(source_p);
562		}
563
564		/* introduce_client()
565		*
566	<	* inputs       - client_p
578	<	*              - 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 604 | 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))
#	Line 640 | Line 628 | valid_hostname(const char *hostname)
628
629		assert(p != NULL);
630
631	<	if ('.' == *p || ':' == *p)
631	>	if (*p == '.' || *p == ':')
632		return 0;
633
634	<	while (*p)
647	<	{
634	>	for (; *p; ++p)
635		if (!IsHostChar(*p))
636		return 0;
650	–	p++;
651	–	}
637
638		return 1;
639		}
#	Line 672 | Line 657 | valid_username(const char *username)
657
658		assert(p != NULL);
659
660	<	if ('~' == *p)
660	>	if (*p == '~')
661		++p;
662
663		/* reject usernames that don't start with an alphanum
#	Line 686 | Line 671 | valid_username(const char *username)
671		{
672		if ((*p == '.') && ConfigFileEntry.dots_in_ident)
673		{
674	<	dots++;
690	<
691	<	if (dots > ConfigFileEntry.dots_in_ident)
674	>	if (++dots > ConfigFileEntry.dots_in_ident)
675		return 0;
676	<	if (!IsUserChar(p[1]))
676	>	if (!IsUserChar(*(p + 1)))
677		return 0;
678		}
679		else if (!IsUserChar(*p))
#	Line 700 | Line 683 | valid_username(const char *username)
683		return 1;
684		}
685
686	+	/* clean_nick_name()
687	+	*
688	+	* input        - nickname
689	+	*              - whether it's a local nick (1) or remote (0)
690	+	* output       - none
691	+	* side effects - walks through the nickname, returning 0 if erroneous
692	+	*/
693	+	int
694	+	valid_nickname(const char *nickname, const int local)
695	+	{
696	+	const char *p = nickname;
697	+	assert(nickname && *nickname);
698	+
699	+	/* nicks can't start with a digit or - or be 0 length */
700	+	/* This closer duplicates behaviour of hybrid-6 */
701	+	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
702	+	return 0;
703	+
704	+	for (; *p; ++p)
705	+	if (!IsNickChar(*p))
706	+	return 0;
707	+
708	+	return p - nickname <= (NICKLEN - 1);
709	+	}
710	+
711		/* report_and_set_user_flags()
712		*
713		* inputs       - pointer to source_p
#	Line 754 | Line 762 | report_and_set_user_flags(struct Client
762		me.name,source_p->name);
763		}
764
757	–	/* If this user is exempt from idle time outs */
758	–	if (IsConfIdlelined(aconf))
759	–	{
760	–	SetIdlelined(source_p);
761	–	sendto_one(source_p,
762	–	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
763	–	me.name, source_p->name);
764	–	}
765	–
765		if (IsConfCanFlood(aconf))
766		{
767		SetCanFlood(source_p);
#	Line 772 | Line 771 | report_and_set_user_flags(struct Client
771		}
772		}
773
775	–	/* do_local_user()
776	–	*
777	–	* inputs       -
778	–	* output       - NONE
779	–	* side effects -
780	–	*/
781	–	void
782	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
783	–	const char *username, const char *host, const char *server,
784	–	const char *realname)
785	–	{
786	–	assert(source_p != NULL);
787	–	assert(source_p->username != username);
788	–
789	–	if (source_p == NULL)
790	–	return;
791	–
792	–	if (!IsUnknown(source_p))
793	–	{
794	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
795	–	me.name, nick);
796	–	return;
797	–	}
798	–
799	–	source_p->localClient->registration &= ~REG_NEED_USER;
800	–
801	–	/*
802	–	* don't take the clients word for it, ever
803	–	*/
804	–	source_p->servptr = &me;
805	–
806	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
807	–
808	–	/* stash for later */
809	–	strlcpy(source_p->client_host, host, sizeof(source_p->client_host));
810	–	strlcpy(source_p->client_server, server, sizeof(source_p->client_server));
811	–
812	–	if (!IsGotId(source_p))
813	–	{
814	–	/* save the username in the client
815	–	* If you move this you'll break ping cookies..you've been warned
816	–	*/
817	–	strlcpy(source_p->username, username, sizeof(source_p->username));
818	–	}
819	–
820	–	if (!source_p->localClient->registration)
821	–	/* NICK already received, now I have USER... */
822	–	register_local_user(client_p, source_p, source_p->name, username);
823	–	}
824	–
774		/* change_simple_umode()
775		*
776		* this callback can be hooked to allow special handling of
#	Line 881 | Line 830 | set_user_mode(struct Client *client_p, s
830		return;
831		}
832
833	<	if (source_p != target_p || target_p->from != source_p->from)
833	>	if (source_p != target_p)
834		{
835		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
836		me.name, source_p->name);
#	Line 939 | Line 888 | set_user_mode(struct Client *client_p, s
888		break;
889
890		ClearOper(source_p);
942	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
891		Count.oper--;
892
893		if (MyConnect(source_p))
#	Line 948 | Line 896 | set_user_mode(struct Client *client_p, s
896
897		detach_conf(source_p, OPER_TYPE);
898		ClearOperFlags(source_p);
899	+	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
900
901		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
902		free_dlink_node(dm);
#	Line 959 | Line 908 | set_user_mode(struct Client *client_p, s
908		/* we may not get these,
909		* but they shouldnt be in default
910		*/
911	+	case 'r':
912		case ' ' :
913		case '\n':
914		case '\r':
#	Line 991 | Line 941 | set_user_mode(struct Client *client_p, s
941		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
942		me.name, source_p->name);
943
944	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
944	>	if (HasUMode(source_p, UMODE_NCHANGE) && !IsOperN(source_p))
945		{
946		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
947		me.name, source_p->name);
948	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
948	>	DelUMode(source_p, UMODE_NCHANGE); /* only tcm's really need this */
949		}
950
951		if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
#	Line 1033 | Line 983 | void
983		send_umode(struct Client *client_p, struct Client *source_p,
984		unsigned int old, unsigned int sendmask, char *umode_buf)
985		{
986	+	char *m = umode_buf;
987		int what = 0;
988		unsigned int i;
989		unsigned int flag;
1039	–	char *m = umode_buf;
990
991		/*
992		* build a string in umode_buf to represent the change in the user's
#	Line 1156 | Line 1106 | user_welcome(struct Client *source_p)
1106
1107		if (ConfigFileEntry.short_motd)
1108		{
1109	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1110	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1109	>	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1110	>	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1111		sendto_one(source_p,
1112	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1113	<	"read it", source_p->name);
1112	>	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1113	>	"read it", me.name, source_p->name);
1114		sendto_one(source_p, form_str(RPL_MOTDSTART),
1115		me.name, source_p->name, me.name);
1116		sendto_one(source_p, form_str(RPL_MOTD),
#	Line 1261 | Line 1211 | oper_up(struct Client *source_p)
1211		SetOFlag(source_p, oconf->port);
1212
1213		if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1214	<	source_p->umodes |= UMODE_ADMIN;
1214	>	AddUMode(source_p, UMODE_ADMIN);
1215		if (!IsOperN(source_p))
1216	<	source_p->umodes &= ~UMODE_NCHANGE;
1216	>	DelUMode(source_p, UMODE_NCHANGE);
1217
1218		sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1219		source_p->name, source_p->username, source_p->host);
#	Line 1279 | Line 1229 | static char new_uid[TOTALSIDUID + 1];
1229		int
1230		valid_sid(const char *sid)
1231		{
1282	–
1232		if (strlen(sid) == IRC_MAXSID)
1233		if (IsDigit(*sid))
1234		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1304 | Line 1253 | init_uid(void)
1253
1254		memset(new_uid, 0, sizeof(new_uid));
1255
1256	<	if (ServerInfo.sid != NULL)
1308	<	{
1256	>	if (!EmptyString(ServerInfo.sid))
1257		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1310	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1311	–
1312	–	hash_add_id(&me);
1313	–	}
1258
1259	<	for (i = 0; i < IRC_MAXSID; i++)
1259	>	for (i = 0; i < IRC_MAXSID; ++i)
1260		if (new_uid[i] == '\0')
1261		new_uid[i] = 'A';
1262
#	Line 1325 | Line 1269 | init_uid(void)
1269
1270		entering_umode_cb = register_callback("entering_umode", NULL);
1271		umode_cb = register_callback("changing_umode", change_simple_umode);
1328	–	uid_get_cb = register_callback("uid_get", uid_get);
1272		}
1273
1274		/*
#	Line 1368 | Line 1311 | add_one_to_uid(int i)
1311		* output       - new UID is returned to caller
1312		* side effects - new_uid is incremented by one.
1313		*/
1314	<	static void *
1315	<	uid_get(va_list args)
1314	>	static const char *
1315	>	uid_get(void)
1316		{
1317		add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1318		return new_uid;

Diff Legend

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