BUILD : 1.7.5 (408) BUGS : 189, 191 NOTES : segfault fix, and vident sent to logs when set

git-svn-id: svn://svn.anope.org/anope/trunk@408 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@272 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 14 insertions, 6 deletions

diff --git a/src/hostserv.c b/src/hostserv.c
index 3a660fd0d..229b809a0 100644
--- a/src/hostserv.c
+++ b/src/hostserv.c
@@ -709,7 +709,11 @@ int do_setall(User * u)
             notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
             return MOD_CONT;
         }
-        alog("vHost for all nicks in group \002%s\002 set to \002%s\002 by oper \002%s\002", nick, hostmask, u->nick);
+        if (vIdent && ircd->vident) {
+            alog("vHost for all nicks in group \002%s\002 set to \002%s@%s\002 by oper \002%s\002", nick, vIdent, hostmask, u->nick);
+        } else {
+            alog("vHost for all nicks in group \002%s\002 set to \002%s\002 by oper \002%s\002", nick, hostmask, u->nick);
+        }
         do_hs_sync(na->nc, vIdent, hostmask, u->nick, tmp_time);
         if (vIdent) {
             notice_lang(s_HostServ, u, HOST_IDENT_SETALL, nick, vIdent,
@@ -740,10 +744,6 @@ int do_delall(User * u)
             notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
             return MOD_CONT;
         }
-        if (na->status & NS_VERBOTEN) {
-            notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
-            return MOD_CONT;
-        }
         nc = na->nc;
         for (i = 0; i < nc->aliases.count; i++) {
             na = nc->aliases.list[i];
@@ -900,7 +900,11 @@ int do_set(User * u)
             notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
             return MOD_CONT;
         }
-        alog("vHost for user \002%s\002 set to \002%s\002 by oper \002%s\002", nick, hostmask, u->nick);
+        if (vIdent && ircd->vident) {
+            alog("vHost for user \002%s\002 set to \002%s@%s\002 by oper \002%s\002", nick, vIdent, hostmask, u->nick);
+        } else {
+            alog("vHost for user \002%s\002 set to \002%s\002 by oper \002%s\002", nick, hostmask, u->nick);
+        }
         addHostCore(nick, vIdent, hostmask, u->nick, tmp_time);
         if (vIdent) {
             notice_lang(s_HostServ, u, HOST_IDENT_SET, nick, vIdent,
@@ -987,6 +991,10 @@ int do_del(User * u)
     char *nick = strtok(NULL, " ");
     if (nick) {
         if ((na = findnick(nick))) {
+            if (na->status & NS_VERBOTEN) {
+                notice_lang(s_HostServ, u, NICK_X_FORBIDDEN, nick);
+                return MOD_CONT;
+            }
             alog("vHost for user \002%s\002 deleted by oper \002%s\002",
                  nick, u->nick);
             delHostCore(nick);