summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/actions.c4
-rw-r--r--src/core/ns_info.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/actions.c b/src/actions.c
index 5ced638c6..e9c70ae52 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -212,6 +212,8 @@ char *common_get_vhost(User * u)
if (ircd->vhostmode && (u->mode & ircd->vhostmode))
return u->vhost;
+ else if (ircd->vhost && u->vhost)
+ return u->vhost;
else
return u->host;
}
@@ -231,6 +233,8 @@ char *common_get_vident(User * u)
if (ircd->vhostmode && (u->mode & ircd->vhostmode))
return u->vident;
+ else if (ircd->vident && u->vident)
+ return u->vident;
else
return u->username;
}
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index bb4c613ac..5037dd1c7 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -161,7 +161,6 @@ int do_info(User * u)
}
-
if (nick_online) {
if (show_hidden || !(na->nc->flags & NI_HIDE_MASK))
notice_lang(s_NickServ, u, NICK_INFO_ADDRESS_ONLINE,