Skip to content

Fix user@host #1867

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

Open
michaelortmann wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix user@host #1867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
addf8d7
Fix user@host
michaelortmann Dec 20, 2025
808490a
Cleanup - userrec.c:get_user_by_host(): host2 aint used anymore
michaelortmann Dec 20, 2025
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
5 changes: 1 addition & 4 deletions src/dcc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,7 @@ void dcc_telnet_hostresolved2(int i, int idx) {
static void dcc_telnet_hostresolved(int i)
{
int idx;
char s[sizeof lasttelnethost], *userhost;
char s[sizeof lasttelnethost];

debug0("dcc_telnet_hostresolved()");
strlcpy(dcc[i].host, dcc[i].u.dns->host, UHOSTLEN);
Expand All @@ -1405,7 +1405,6 @@ static void dcc_telnet_hostresolved(int i)
}
}
snprintf(s, sizeof s, "-telnet!telnet@%s", dcc[i].host);
userhost = s + strlen("-telnet!");
if (match_ignore(s) || detect_telnet_flood(s)) {
killsock(dcc[i].sock);
lostdcc(i);
Expand Down Expand Up @@ -1434,7 +1433,6 @@ static void dcc_telnet_hostresolved(int i)
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 @@ -1447,7 +1445,6 @@ static void dcc_telnet_hostresolved(int i)
}
#endif /* TLS */

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

Expand Down
2 changes: 0 additions & 2 deletions src/userrec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ struct userrec *get_user_by_host(char *host)
struct userrec *u, *ret = NULL;
struct list_type *q;
int cnt, i;
char host2[UHOSTLEN];

if (host == NULL)
return NULL;
Expand All @@ -393,7 +392,6 @@ struct userrec *get_user_by_host(char *host)
return NULL;
cnt = 0;
cache_miss++;
strlcpy(host2, host, sizeof host2);
for (u = userlist; u; u = u->next) {
q = get_user(&USERENTRY_HOSTS, u);
for (; q; q = q->next) {
Expand Down
Loading