* Fix sending of empty fakehosts when osetting 'fakehost xxx@'

[srvx.git] / src / opserv.c

diff --git a/src/opserv.c b/src/opserv.c
index 198f5e72a5f6e788da4155b574aa86bb6ed2e7f7..30ef2f02d3fe2d4621455d2d2340b3ae1bdfd3a8 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -120,6 +120,7 @@ static const struct message_entry msgtab[] = {
     { "OSMSG_WHOIS_HOST", "Host     : %s@%s" },
     { "OSMSG_WHOIS_FAKEHOST", "Fakehost : %s" },
     { "OSMSG_WHOIS_FAKEIDENT", "Fakeident: %s" },
+    { "OSMSG_WHOIS_FAKEIDENTHOST", "Fakehost : %s@%s" },
     { "OSMSG_WHOIS_IP",   "Real IP  : %s" },
     { "OSMSG_WHOIS_MODES", "Modes    : +%s " },
     { "OSMSG_WHOIS_INFO", "Info     : %s" },
@@ -1253,9 +1254,11 @@ static MODCMD_FUNC(cmd_whois)
     }
     reply("OSMSG_WHOIS_NICK", target->nick);
     reply("OSMSG_WHOIS_HOST", target->ident, target->hostname);
-    if (IsFakeIdent(target))
+    if (IsFakeIdent(target) && IsFakeHost(target))
+        reply("OSMSG_WHOIS_FAKEIDENTHOST", target->fakeident, target->fakehost);
+    else if (IsFakeIdent(target))
         reply("OSMSG_WHOIS_FAKEIDENT", target->fakeident);
-    if (IsFakeHost(target))
+    else if (IsFakeHost(target))
         reply("OSMSG_WHOIS_FAKEHOST", target->fakehost);
     reply("OSMSG_WHOIS_IP", irc_ntoa(&target->ip));
     if (target->modes) {