Detect attempts to change email to same as current one.

diff --git a/chanserv/authcmds/email.c b/chanserv/authcmds/email.c
index 17656944266573de691d456bf7cb47ed661863f2..0588e508e17280a0e11fc7dbb2a42b30b4108183 100644 (file)
--- a/chanserv/authcmds/email.c
+++ b/chanserv/authcmds/email.c
@@ -50,6 +50,11 @@ int csa_doemail(void *source, int cargc, char **cargv) {
     return CMD_ERROR;
   }
 
+  if(rup->email && !strcasecmp(cargv[1], rup->email->content)) {
+    chanservstdmessage(sender, QM_EMAILMATCHESOLD);
+    return CMD_ERROR;
+  }
+
   if (csa_checkeboy(sender, cargv[1]))
     return CMD_ERROR;
 

diff --git a/chanserv/authcmds/setemail.c b/chanserv/authcmds/setemail.c
index 8dbf0d4544eba75b33e25978b4e2ef1dba64af6b..2466461106bbb32ef8568efeb98b204a400168f2 100644 (file)
--- a/chanserv/authcmds/setemail.c
+++ b/chanserv/authcmds/setemail.c
@@ -29,6 +29,11 @@ int csa_dosetmail(void *source, int cargc, char **cargv) {
   if (!(rup=findreguser(sender, cargv[0])))
     return CMD_ERROR;
 
+  if(rup->email && !strcasecmp(cargv[1], rup->email->content)) {
+    chanservstdmessage(sender, QM_EMAILMATCHESOLD);
+    return CMD_ERROR;
+  }
+
   if (csa_checkeboy(sender, cargv[1]))
     return CMD_ERROR;
 

diff --git a/chanserv/chanserv.h b/chanserv/chanserv.h
index 0fcff0e9bb14797b02054b299cd4d30291db4abb..bccb184884c940cbbef52894cf7b519ae911b471 100644 (file)
--- a/chanserv/chanserv.h
+++ b/chanserv/chanserv.h
@@ -235,6 +235,7 @@
 #define QM_DOMAINBANNED            159
 #define QM_TYPEHELPFORHELP         160
 #define QM_REQUESTPASSPRIVUSER     161
+#define QM_EMAILMATCHESOLD         162
 
 /* List of privileged operations */
 

diff --git a/chanserv/database/chanservdb_messages.c b/chanserv/database/chanservdb_messages.c
index 7d1e8883bf2d6670171e96dc451da9380f1ca5bd..4337873b7025cb4f96663dd5d53f073e61b0d923 100644 (file)
--- a/chanserv/database/chanservdb_messages.c
+++ b/chanserv/database/chanservdb_messages.c
@@ -170,6 +170,7 @@ char *defaultmessages[MAXMESSAGES] = {
   /* 159*/ "That email address has been blocked.",
   /* 160*/ "For more information, type HELP %s.",
   /* 161*/ "Cannot send password for that account.",
+  /* 162*/ "The new email address is the same as current one.",
 };
 
 void initmessages() {