aboutsummaryrefslogtreecommitdiffstats
path: root/ircd
diff options
context:
space:
mode:
authorGravatar jesopo2022-06-16 15:39:09 +0000
committerGravatar jesopo2022-06-16 15:39:09 +0000
commit4579f8b555dca0d0e717651b03d5f87988a0745c (patch)
tree97c4961afd78b243518f135b60a6bc0ee059e856 /ircd
parentonly SetGotId when webirc spoofed username doesn't have ~ (diff)
downloadsolanum-jess/webirc-ident.tar.gz
solanum-jess/webirc-ident.tar.bz2
solanum-jess/webirc-ident.zip
don't override webirc spoofed username in USER jess/webirc-ident
Diffstat (limited to 'ircd')
-rw-r--r--ircd/s_conf.c2
-rw-r--r--ircd/s_user.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index cb86811f..23863307 100644
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -346,6 +346,8 @@ verify_access(struct Client *client_p, const char *username)
/* user@host spoof */
if((p = strchr(aconf->info.name, '@')) != NULL)
{
+ SetUserSpoof(client_p);
+
char *host = p+1;
*p = '\0';
diff --git a/ircd/s_user.c b/ircd/s_user.c
index d758b537..8a19b2ec 100644
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -500,7 +500,7 @@ register_local_user(struct Client *client_p, struct Client *source_p)
}
/* dont replace username if its supposed to be spoofed --fl */
- if(!IsConfDoSpoofIp(aconf) || !strchr(aconf->info.name, '@'))
+ if(!IsUserSpoof(source_p))
{
p = myusername;