ViewVC Help

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

root/svn/ircd-hybrid/trunk/src/s_user.c

Comparing ircd-hybrid-7.2/src/s_user.c (file contents):
Revision 386 by adx, Tue Jan 31 12:40:56 2006 UTC vs.
Revision 507 by michael, Sat Mar 4 08:20:28 2006 UTC

#	Line 294 | Line 294 | register_local_user(struct Client *clien
294		assert(source_p != NULL);
295		assert(MyConnect(source_p));
296		assert(source_p->username != username);
297	+	assert(!source_p->localClient->registration);
298
299		if (ConfigFileEntry.ping_cookie)
300		{
#	Line 537 | Line 538 | register_remote_user(struct Client *clie
538		source_p->host, source_p->from->name);
539		kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
540
540	–	/* XXX */
541		SetKilled(source_p);
542		exit_client(source_p, &me, "Ghosted Client");
543		return;
#	Line 607 | Line 607 | introduce_client(struct Client *client_p
607		* -davidt
608		* rewritten to cope with SIDs .. eww eww eww --is
609		*/
610	–
611	–	/* XXX THESE NEED A PREFIX!?!?!? */
610		if (!ServerInfo.hub && uplink && IsCapable(uplink, CAP_LL) &&
611		client_p != uplink)
612		{
#	Line 830 | Line 828 | do_local_user(const char *nick, struct C
828		return;
829		}
830
831	<	source_p->flags |= FLAGS_GOTUSER;
831	>	source_p->localClient->registration &= ~REG_NEED_USER;
832
833		/*
834		* don't take the clients word for it, ever
#	Line 847 | Line 845 | do_local_user(const char *nick, struct C
845		strlcpy(source_p->username, username, sizeof(source_p->username));
846		}
847
848	<	if (source_p->name[0])
851	<	{
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);
854	–	}
851		}
852
853		/* change_simple_umode()

Diff Legend

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