# HG changeset patch
# User syzop
# Date 1157754537 0
# Node ID 445ad31b977d62080390a0052424842a47fe9548
# Parent  6f82105c1bc950f183fdf74655a6d3cb07221c46
- Bugfix for above (wrongpasscont).

diff -r 6f82105c1bc9 -r 445ad31b977d src/s_conf.c
--- a/src/s_conf.c	Thu Sep 07 22:42:00 2006 +0000
+++ b/src/s_conf.c	Fri Sep 08 22:28:57 2006 +0000
@@ -2515,15 +2515,9 @@
 		}
 		
 		continue;
-	      attach:
-/*		if (index(uhost, '@'))  now flag based -- codemastr */
-		if (!aconf->flags.noident)
-			cptr->flags |= FLAGS_DOID;
-		if (!aconf->flags.useip && hp) 
-			strncpyzt(uhost, fullname, sizeof(uhost));
-		else
-			strncpyzt(uhost, sockhost, sizeof(uhost));
-		get_sockhost(cptr, uhost);
+
+attach:
+
 		/* FIXME */
 		if (aconf->maxperip)
 		{
@@ -2560,6 +2554,17 @@
 			MyFree(cptr->passwd);
 			cptr->passwd = NULL;
 		}
+
+		if (!aconf->flags.noident)
+			cptr->flags |= FLAGS_DOID;
+
+		if (!aconf->flags.useip && hp) 
+			strncpyzt(uhost, fullname, sizeof(uhost));
+		else
+			strncpyzt(uhost, sockhost, sizeof(uhost));
+
+		get_sockhost(cptr, uhost);
+
 		if (!((aconf->class->clients + 1) > aconf->class->maxclients))
 		{
 			cptr->class = aconf->class;