nickserv/sendpass{,user}: These modules conflict

Make these modules conflict, as they both implement the SENDPASS command for NickServ, and so loading both at the same time will cause Bad Things. Closes atheme#145
freenode · Apr 21, 2013 · 0a90a6c · 0a90a6c
1 parent 2b937f3
commit 0a90a6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/modules/nickserv/sendpass.c b/modules/nickserv/sendpass.c
@@ -21,6 +21,7 @@ command_t ns_sendpass = { "SENDPASS", N_("Email registration passwords."), PRIV_
 
 void _modinit(module_t *m)
 {
+	MODULE_CONFLICT(m, "nickserv/sendpass_user")
 	service_named_bind_command("nickserv", &ns_sendpass);
 }
 

diff --git a/modules/nickserv/sendpass_user.c b/modules/nickserv/sendpass_user.c
@@ -21,6 +21,7 @@ command_t ns_sendpass = { "SENDPASS", N_("Email registration passwords."), AC_NO
 
 void _modinit(module_t *m)
 {
+	MODULE_CONFLICT(m, "nickserv/sendpass")
 	MODULE_TRY_REQUEST_DEPENDENCY(m, "nickserv/setpass");
 
 	service_named_bind_command("nickserv", &ns_sendpass);
-Original file line number
+Diff line change
@@ Expand Up @@
     void _modinit(module_t *m)
     {
+    	MODULE_CONFLICT(m, "nickserv/sendpass_user")
     	service_named_bind_command("nickserv", &ns_sendpass);
     }
@@ Expand Down @@