modules: chase MsgBuf API change

[solanum.git] / modules / m_challenge.c

diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 9a00607a4b0789020a05e58cc2e36023b84f9a07..feee9084fcdf6c4f12db81f08b9c65d0ee38e395 100644 (file)
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -60,7 +60,7 @@
 static int     challenge_load(void)
 {
 #ifndef STATIC_MODULES
-       sendto_realops_snomask(SNO_GENERAL, L_ALL, 
+       sendto_realops_snomask(SNO_GENERAL, L_ALL,
                "Challenge module not loaded because OpenSSL is not available.");
        ilog(L_MAIN, "Challenge module not loaded because OpenSSL is not available.");
        return -1;
@@ -72,7 +72,7 @@ static int    challenge_load(void)
 DECLARE_MODULE_AV1(challenge, challenge_load, NULL, NULL, NULL, NULL, "$Revision: 3161 $");
 #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 = {
@@ -90,7 +90,7 @@ cleanup_challenge(struct Client *target_p)
 {
        if(target_p->localClient == NULL)
                return;
-       
+
        rb_free(target_p->localClient->challenge);
        rb_free(target_p->localClient->opername);
        target_p->localClient->challenge = NULL;
@@ -104,11 +104,11 @@ cleanup_challenge(struct Client *target_p)
  *
  */
 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 */
-       char chal_line[CHALLENGE_WIDTH]; 
+       char chal_line[CHALLENGE_WIDTH];
        unsigned char *b_response;
        size_t cnt;
        int len = 0;
@@ -140,10 +140,11 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
                                                     source_p->name, source_p->username,
                                                     source_p->host);
                        cleanup_challenge(source_p);
-                       return 0;                       
+                       return 0;
                }
 
-               b_response = rb_base64_decode((const unsigned char *)++parv[1], strlen(parv[1]), &len);
+               parv[1]++;
+               b_response = rb_base64_decode((const unsigned char *)parv[1], strlen(parv[1]), &len);
 
                if(len != SHA_DIGEST_LENGTH ||
                   memcmp(source_p->localClient->challenge, b_response, SHA_DIGEST_LENGTH))
@@ -166,8 +167,8 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
 
                rb_free(b_response);
 
-               oper_p = find_oper_conf(source_p->username, source_p->orighost, 
-                                       source_p->sockhost, 
+               oper_p = find_oper_conf(source_p->username, source_p->orighost,
+                                       source_p->sockhost,
                                        source_p->localClient->opername);
 
                if(oper_p == NULL)
@@ -191,14 +192,14 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
                oper_up(source_p, oper_p);
 
                ilog(L_OPERED, "OPER %s by %s!%s@%s (%s)",
-                    source_p->localClient->opername, source_p->name, 
+                    source_p->localClient->opername, source_p->name,
                     source_p->username, source_p->host, source_p->sockhost);
                return 0;
        }
 
        cleanup_challenge(source_p);
 
-       oper_p = find_oper_conf(source_p->username, source_p->orighost, 
+       oper_p = find_oper_conf(source_p->username, source_p->orighost,
                                source_p->sockhost, parv[1]);
 
        if(oper_p == NULL)
@@ -243,7 +244,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
                {
                        sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
                        ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- client certificate fingerprint mismatch",
-                            name, source_p->name,
+                            parv[1], source_p->name,
                             source_p->username, source_p->host, source_p->sockhost);
 
                        if(ConfigFileEntry.failed_oper_notice)
@@ -268,9 +269,9 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
                                chal += CHALLENGE_WIDTH - 1;
                        else
                                break;
-                       
+
                }
-               sendto_one(source_p, form_str(RPL_ENDOFRSACHALLENGE2), 
+               sendto_one(source_p, form_str(RPL_ENDOFRSACHALLENGE2),
                           me.name, source_p->name);
                rb_free(challenge);
                source_p->localClient->opername = rb_strdup(oper_p->name);