log account name, rather than provided target, in multimark

diff --git a/modules/nickserv/multimark.c b/modules/nickserv/multimark.c
index 2ece56d83227e4bdb0bd18fb23f2f08ddad6c2cb..dc610a2e0da2e06926575aef18fb0574b864c739 100644 (file)
--- a/modules/nickserv/multimark.c
+++ b/modules/nickserv/multimark.c
@@ -725,9 +725,9 @@ multimark_needforce(struct hook_user_needforce *hdata)
 static void
 ns_cmd_multimark(struct sourceinfo *si, int parc, char *parv[])
 {
-       char *target = parv[0];
-       char *action = parv[1];
-       char *info = parv[2];
+       const char *target = parv[0];
+       const char *action = parv[1];
+       const char *info = parv[2];
        struct myuser *mu;
        struct myuser_name *mun;
        mowgli_list_t *l;
@@ -767,7 +767,9 @@ ns_cmd_multimark(struct sourceinfo *si, int parc, char *parv[])
                return;
        }
 
-       if (!(mu = myuser_find_ext(target)) && strcasecmp(action, "LIST"))
+       if ((mu = myuser_find_ext(target)))
+               target = entity(mu)->name;
+       else if (strcasecmp(action, "LIST"))
        {
                command_fail(si, fault_nosuch_target, STR_IS_NOT_REGISTERED, target);
                return;