- strlcpy( My_Connections[i].host, result, sizeof( My_Connections[i].host ));
- Client_SetHostname( c, result );
+
+ /* Only update client information of unregistered clients */
+ if( Client_Type( c ) == CLIENT_UNKNOWN )
+ {
+ if( s->stage == 0 )
+ {
+ /* host name */
+ strlcpy( My_Connections[i].host, s->buffer, sizeof( My_Connections[i].host ));
+ Client_SetHostname( c, s->buffer );
+
+#ifdef IDENTAUTH
+ /* clean up buffer for IDENT result */
+ len = strlen( s->buffer ) + 1;
+ memmove( s->buffer, s->buffer + len, sizeof( s->buffer ) - len );
+ s->bufpos -= len;
+
+ /* Don't close pipe and clean up, but
+ * instead wait for IDENT result */
+ s->stage = 1;
+ goto try_resolve;
+ }
+ else if( s->stage == 1 )
+ {
+ /* IDENT user name */
+ if( s->buffer[0] )
+ {
+ Log( LOG_INFO, "IDENT lookup for connection %ld: \"%s\".", i, s->buffer );
+ Client_SetUser( c, s->buffer, TRUE );
+ }
+ else Log( LOG_INFO, "IDENT lookup for connection %ld: no result.", i );
+#endif
+ }
+ else Log( LOG_ERR, "Resolver: got result for unknown stage %d!?", s->stage );
+ }
+#ifdef DEBUG
+ else Log( LOG_DEBUG, "Resolver: discarding result for already registered connection %d.", i );
+#endif