From 0a90a6c4833582c4b2a87170e84b7eee88f27c90 Mon Sep 17 00:00:00 2001 From: Douglas Freed Date: Sat, 20 Apr 2013 23:23:00 -0400 Subject: [PATCH] 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 #145 --- modules/nickserv/sendpass.c | 1 + modules/nickserv/sendpass_user.c | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/nickserv/sendpass.c b/modules/nickserv/sendpass.c index 6c86bd2231..4f9425e723 100644 --- 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 index 371611db5a..6cee3b545a 100644 --- 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);