chm_regmsg: don't duplicate nick in 415

[solanum.git] / extensions / chm_regmsg.c

diff --git a/extensions/chm_regmsg.c b/extensions/chm_regmsg.c
index 97c851ff76530495ea55e13dc01f6e0c52c81762..bddb128cb4db50da8a3eed77f8c9bb7cae61c1b8 100644 (file)
--- a/extensions/chm_regmsg.c
+++ b/extensions/chm_regmsg.c
@@ -57,6 +57,10 @@ chm_regmsg_process(void *data_)
        if (data->approved)
                return;
 
+       /* mode is unset, accept */
+       if (!(data->chptr->mode.mode & mode_regmsg))
+               return;
+
        /* user is identified, accept */
        if (!EmptyString(data->source_p->user->suser))
                return;
@@ -67,7 +71,7 @@ chm_regmsg_process(void *data_)
                return;
 
        sendto_one_numeric(data->source_p, ERR_MSGNEEDREGGEDNICK, form_str(ERR_MSGNEEDREGGEDNICK),
-               data->source_p->name, data->chptr->chname);
+               data->chptr->chname);
        data->approved = ERR_MSGNEEDREGGEDNICK;
 }