Replace QM_DOMAINBANNED with QM_MAILLOCKED as it was leaking information.

diff --git a/chanserv/authcmds/email.c b/chanserv/authcmds/email.c
index 6e16afc9f23769a824fdce34b5f87264da8bba09..26d3aefae62c9466609f900928b8d66451d20107 100644 (file)
--- a/chanserv/authcmds/email.c
+++ b/chanserv/authcmds/email.c
@@ -83,7 +83,7 @@ int csa_doemail(void *source, int cargc, char **cargv) {
     for(smdp=mdp; smdp; smdp=smdp->parent) {
       if(MDIsBanned(smdp)) {
         free(dupemail);
-        chanservstdmessage(sender, QM_DOMAINBANNED);
+        chanservstdmessage(sender, QM_MAILLOCKED);
         return CMD_ERROR;
       }
       if((smdp->count >= smdp->limit) && (smdp->limit > 0)) {

diff --git a/chanserv/authcmds/hello.c b/chanserv/authcmds/hello.c
index 5c7786c1866f3cd79bf5f8369fb6a5a4ee79df75..80f7961605a482bd8d9b90b517b83cc5ca6334a1 100644 (file)
--- a/chanserv/authcmds/hello.c
+++ b/chanserv/authcmds/hello.c
@@ -84,7 +84,7 @@ int csa_dohello(void *source, int cargc, char **cargv) {
     for(smdp=mdp; smdp; smdp=smdp->parent) {
       if(MDIsBanned(smdp)) {
         free(dupemail);
-        chanservstdmessage(sender, QM_DOMAINBANNED);
+        chanservstdmessage(sender, QM_MAILLOCKED);
         return CMD_ERROR;
       }
       if((smdp->count >= smdp->limit) && (smdp->limit > 0)) {

diff --git a/chanserv/chanserv_messages.h b/chanserv/chanserv_messages.h
index 6557ff550bc0d66ca1278b936ed66d037439359f..2e16ceeb396cf6999f6ee57da3b8247ec7b996b1 100644 (file)
--- a/chanserv/chanserv_messages.h
+++ b/chanserv/chanserv_messages.h
@@ -176,7 +176,7 @@ BeginMessages() {
   msg(QM_WARNNOTREMOVEDPERMBAN, "Warning: not removing registered ban $0 from $1.", "ss"),
   msg(QM_MAXHELLOLIMIT, "Sorry, the registration service is unavailable to you at this time. Please try again later.", ""),
   msg(QM_ADDRESSLIMIT, "Too many accounts exist from this email address.", ""),
-  msg(QM_DOMAINBANNED, "That email address has been blocked.", ""),
+  msg(UNUSED_1, "", ""),
   msg(QM_TYPEHELPFORHELP, "For more information, type HELP $0.", "s"),
   msg(QM_REQUESTPASSPRIVUSER, "Cannot send password for that account.", ""),
   msg(QM_EMAILMATCHESOLD, "The new email address is the same as current one.", ""),