Skip to content

Fix telnet regression of 1104c649aea4a56d59a010c9bfe10131eba68058 #1905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
michaelortmann wants to merge 2 commits into from
Closed

Fix telnet regression of 1104c649aea4a56d59a010c9bfe10131eba68058 #1905

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f31cf3
Fix telnet regression of 1104c649aea4a56d59a010c9bfe10131eba68058
michaelortmann May 4, 2026
49f84bb
Merge remote-tracking branch 'upstream/develop' into geo.telnet
michaelortmann May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/dcc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,7 +1339,7 @@ void dcc_telnet_hostresolved2(int i, int idx) {
/* Skip ident lookup if disabled */
if (identtimeout <= 0) {
dcc[i].u.ident_sock = dcc[idx].sock;
dcc_telnet_got_ident(i, dcc[idx].host);
dcc_telnet_got_ident(i, dcc[i].host);
return;
}

Expand Down Expand Up @@ -1392,7 +1392,7 @@ void dcc_telnet_hostresolved2(int i, int idx) {
static void dcc_telnet_hostresolved(int i)
{
int idx;
char s[sizeof lasttelnethost];
char s[sizeof lasttelnethost], *userhost;

debug0("dcc_telnet_hostresolved()");
strlcpy(dcc[i].host, dcc[i].u.dns->host, UHOSTLEN);
Expand Down Expand Up @@ -1442,11 +1442,14 @@ static void dcc_telnet_hostresolved(int i)
}
#endif

userhost = s + strlen("-telnet!");

/* Skip ident lookup for public script listeners */
if ((dcc[idx].status & LSTN_PUBLIC) && !strcmp(dcc[idx].nick, "(script)")) {
changeover_dcc(i, &DCC_SOCKET, 0);
dcc[i].u.other = NULL;
strcpy(dcc[i].nick, "*");
strlcpy(dcc[i].host, userhost, UHOSTLEN);
check_tcl_listen(dcc[idx].host, dcc[i].sock);
return;
}
Expand All @@ -1459,6 +1462,7 @@ static void dcc_telnet_hostresolved(int i)
}
#endif /* TLS */

strlcpy(dcc[i].host, userhost, UHOSTLEN);
dcc_telnet_hostresolved2(i, idx);
}

Expand Down
Loading