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

* Improve display of fake ident & host ("Fakehost: ident@host")

diff --git a/src/nickserv.c b/src/nickserv.c
index b1f0d294382812ce2a9bc8e818b070fa0a8108cd..1192c24a688e6f34bb9e910df8c9ddd3943f2890 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -214,6 +214,7 @@ static const struct message_entry msgtab[] = {
     { "NSMSG_HANDLEINFO_EPITHET", "  Epithet: %s" },
     { "NSMSG_HANDLEINFO_FAKEIDENT", "  Fake ident: %s" },
     { "NSMSG_HANDLEINFO_FAKEHOST", "  Fake host: %s" },
+    { "NSMSG_HANDLEINFO_FAKEIDENTHOST", "  Fake host: %s@%s" },
     { "NSMSG_HANDLEINFO_LAST_HOST", "  Last quit hostmask: %s" },
     { "NSMSG_HANDLEINFO_NO_NOTES", "  Notes: None" },
     { "NSMSG_HANDLEINFO_NOTE_EXPIRES", "  Note %d (%s ago by %s, expires %s): %s" },
@@ -317,6 +318,7 @@ static const struct message_entry msgtab[] = {
     { "NSMSG_SET_TITLE", "$bTITLE:        $b%s" },
     { "NSMSG_SET_FAKEHOST", "$bFAKEHOST:    $b%s" },
     { "NSMSG_SET_FAKEIDENT", "$bFAKEIDENT:   $b%s" },
+    { "NSMSG_SET_FAKEIDENTHOST", "$bFAKEHOST:    $b%s@%s" },
     { "NSMSG_INVALID_KARMA", "$b%s$b is not a valid karma modifier." },
     { "NSMSG_SET_KARMA", "$bKARMA:       $b%d$b" },
     { "NSEMAIL_ACTIVATION_SUBJECT", "Account verification for %s" },
@@ -1441,11 +1443,12 @@ static NICKSERV_FUNC(cmd_handleinfo)
         reply("NSMSG_HANDLEINFO_EPITHET", (hi->epithet ? hi->epithet : nsmsg_none));
     }
 
-    if (hi->fakeident)
-        reply("NSMSG_HANDLEINFO_FAKEIDENT", (hi->fakeident ? hi->fakeident : handle_find_message(hi, "MSG_NONE")));
-
-    if (hi->fakehost)
-        reply("NSMSG_HANDLEINFO_FAKEHOST", (hi->fakehost ? hi->fakehost : handle_find_message(hi, "MSG_NONE")));
+    if (hi->fakeident && hi->fakehost)
+        reply("NSMSG_HANDLEINFO_FAKEIDENTHOST", hi->fakeident, hi->fakehost);
+    else if (hi->fakeident)
+        reply("NSMSG_HANDLEINFO_FAKEIDENT", hi->fakeident);
+    else if (hi->fakehost)
+        reply("NSMSG_HANDLEINFO_FAKEHOST", hi->fakehost);
 
     if (hi->last_quit_host[0])
         reply("NSMSG_HANDLEINFO_LAST_HOST", hi->last_quit_host);
@@ -2652,12 +2655,16 @@ static OPTION_FUNC(opt_fakehost)
             return 0;
         }
 
-        free(hi->fakehost);
-        if (!strcmp(host, "*"))
-            hi->fakehost = NULL;
+        if (host[0]) {
+            free(hi->fakehost);
+            if (!strcmp(host, "*"))
+                hi->fakehost = NULL;
+            else
+                hi->fakehost = strdup(host);
+            host = hi->fakehost;
+        }
         else
-            hi->fakehost = strdup(host);
-        host = hi->fakehost;
+            host = generate_fakehost(hi);
 
         if (ident) {
             free(hi->fakeident);
@@ -2667,6 +2674,8 @@ static OPTION_FUNC(opt_fakehost)
                 hi->fakeident = strdup(ident);
             ident = hi->fakeident;
         }
+        else
+            ident = generate_fakeident(hi, NULL);
 
         apply_fakehost(hi, NULL);
     } else {
@@ -2675,9 +2684,10 @@ static OPTION_FUNC(opt_fakehost)
     }
     if (!host)
         host = (char *) user_find_message(user, "MSG_NONE");
-    send_message(user, nickserv, "NSMSG_SET_FAKEHOST", host);
-    if (ident)
-        send_message(user, nickserv, "NSMSG_SET_FAKEIDENT", ident);
+    if(ident)
+        send_message(user, nickserv, "NSMSG_SET_FAKEIDENTHOST", ident, host);
+    else
+        send_message(user, nickserv, "NSMSG_SET_FAKEHOST", host);
     return 1;
 }
 

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) {