return ok;
} /* Conn_WriteStr */
-GLOBAL const char*
+GLOBAL char*
Conn_Password( CONN_ID Idx )
{
- assert( Idx > NONE );
- if (My_Connections[Idx].pwd == NULL)
- return (char*)"\0";
- else
- return My_Connections[Idx].pwd;
+ assert( Idx > NONE );
+ if (My_Connections[Idx].pwd == NULL)
+ return (char*)"\0";
+ else
+ return My_Connections[Idx].pwd;
} /* Conn_Password */
GLOBAL void
Conn_SetPassword( CONN_ID Idx, const char *Pwd )
{
- assert( Idx > NONE );
- My_Connections[Idx].pwd = strdup(Pwd);
- if (My_Connections[Idx].pwd == NULL) {
- Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]");
- exit(1);
- }
+ assert( Idx > NONE );
+
+ if (My_Connections[Idx].pwd)
+ free(My_Connections[Idx].pwd);
+
+ My_Connections[Idx].pwd = strdup(Pwd);
+ if (My_Connections[Idx].pwd == NULL) {
+ Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]");
+ exit(1);
+ }
} /* Conn_SetPassword */
/**
array_free(&My_Connections[Idx].rbuf);
array_free(&My_Connections[Idx].wbuf);
if (My_Connections[Idx].pwd != NULL)
- free(My_Connections[Idx].pwd);
+ free(My_Connections[Idx].pwd);
/* Clean up connection structure (=free it) */
Init_Conn_Struct( Idx );
#endif
(void)Conn_WriteStr(new_sock,
"NOTICE AUTH :*** Looking up your hostname");
+ (void)Handle_Write(new_sock);
}
Resolve_Addr(&My_Connections[new_sock].proc_stat, &new_addr,
identsock, cb_Read_Resolver_Result);
if (My_Connections[i].lastping <
time(NULL) - Conf_PongTimeout) {
/* Timeout */
- LogDebug
- ("Connection %d: Ping timeout: %d seconds.",
- i, Conf_PongTimeout);
- snprintf(msg, sizeof(msg), "Ping timeout: %d seconds", Conf_PongTimeout);
+ snprintf(msg, sizeof(msg),
+ "Ping timeout: %d seconds",
+ Conf_PongTimeout);
+ LogDebug("Connection %d: %s.", i, msg);
Conn_Close(i, NULL, msg, true);
}
} else if (My_Connections[i].lastdata <
Client_SetHostname(c, readbuf);
if (Conf_NoticeAuth)
(void)Conn_WriteStr(i,
- "NOTICE AUTH :*** Found your hostname");
+ "NOTICE AUTH :*** Found your hostname: %s",
+ My_Connections[i].host);
#ifdef IDENTAUTH
++identptr;
if (*identptr) {
}
if (Conf_NoticeAuth) {
(void)Conn_WriteStr(i,
- "NOTICE AUTH :*** Got %sident response",
- *ptr ? "invalid " : "");
+ "NOTICE AUTH :*** Got %sident response%s%s",
+ *ptr ? "invalid " : "",
+ *ptr ? "" : ": ",
+ *ptr ? "" : identptr);
}
} else {
Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i);
"NOTICE AUTH :*** No ident response");
}
#endif
+
+ if (Conf_NoticeAuth)
+ (void)Handle_Write(i);
+
Class_HandleServerBans(c);
}
#ifdef DEBUG