X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/cd25f2e983991b8769135c8e88a372272ec6d96c..075d79322a27a1e04807a9f4b85a52c7eb7c3ede:/src/proto-p10.c

diff --git a/src/proto-p10.c b/src/proto-p10.c
index 37466e8..05c92a0 100644
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -1038,7 +1038,7 @@ irc_topic(struct userNode *service, struct userNode *who, struct chanNode *what,
       host_in_topic = atoi(hstr);
    }
 
-   if (type == 5) {
+   if (type >= 5) {
      putsock("%s " P10_TOPIC " %s %s%s%s%s%s " FMT_TIME_T " " FMT_TIME_T " :%s", service->numeric, what->name,
              who->nick, host_in_topic ? "!" : "", host_in_topic ? (IsSetHost(who) ? sident : who->ident) : "", 
              host_in_topic ? "@" : "", host_in_topic ? shost : "", what->timestamp, now, topic);
@@ -2675,6 +2675,9 @@ AddUser(struct server* uplink, const char *nick, const char *ident, const char *
       make_ipv6virthost((char*)irc_ntoa(&uNode->ip), uNode->hostname, uNode->crypthost);
     }
 
+    if (!uNode->crypthost && uNode->cryptip)
+        snprintf(uNode->crypthost, sizeof(uNode->crypthost), "%s", strdup(uNode->cryptip));
+
     uNode->timestamp = timestamp;
     modeList_init(&uNode->channels);
     uNode->uplink = uplink;