Merge pull request #161 from awilfox/av2desc

[solanum.git] / modules / m_challenge.c

diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 677dfcb209c62b52b119fce051d83b093ac3af10..51b4fa4ee4171a4af847026f7d498484f71c4305 100644 (file)
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_challenge.c 3161 2007-01-25 07:23:01Z nenolod $
  */
 
 #include "stdinc.h"
@@ -69,19 +67,26 @@ static int  challenge_load(void)
 #endif
 }
 
-DECLARE_MODULE_AV1(challenge, challenge_load, NULL, NULL, NULL, NULL, "$Revision: 3161 $");
+static const char challenge_desc[] = "Does nothing as OpenSSL was not enabled.";
+
+DECLARE_MODULE_AV2(challenge, challenge_load, NULL, NULL, NULL, NULL, NULL, NULL, challenge_desc);
 #else
 
-static int m_challenge(struct Client *, struct Client *, int, const char **);
+static int m_challenge(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 /* We have openssl support, so include /CHALLENGE */
 struct Message challenge_msgtab = {
-       "CHALLENGE", 0, 0, 0, MFLG_SLOW,
+       "CHALLENGE", 0, 0, 0, 0,
        {mg_unreg, {m_challenge, 2}, mg_ignore, mg_ignore, mg_ignore, {m_challenge, 2}}
 };
 
 mapi_clist_av1 challenge_clist[] = { &challenge_msgtab, NULL };
-DECLARE_MODULE_AV1(challenge, NULL, NULL, challenge_clist, NULL, NULL, "$Revision: 3161 $");
+
+static const char challenge_desc[] =
+       "Provides the challenge-response facility used for becoming an IRC operator";
+
+
+DECLARE_MODULE_AV2(challenge, NULL, NULL, challenge_clist, NULL, NULL, NULL, NULL, challenge_desc);
 
 static int generate_challenge(char **r_challenge, char **r_response, RSA * key);
 
@@ -101,10 +106,9 @@ cleanup_challenge(struct Client *target_p)
 /*
  * m_challenge - generate RSA challenge for wouldbe oper
  * parv[1] = operator to challenge for, or +response
- *
  */
 static int
-m_challenge(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_challenge(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct oper_conf *oper_p;
        char *challenge = NULL; /* to placate gcc */