Use rb_* versions of nonportable string functions

[solanum.git] / modules / m_oper.c

diff --git a/modules/m_oper.c b/modules/m_oper.c
index fdaef300d507f361d448637f722332a4ce6723b5..9afef1f8c2f71807e4c909298e617fa2208e80ff 100644 (file)
--- a/modules/m_oper.c
+++ b/modules/m_oper.c
@@ -20,13 +20,10 @@
  *  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_oper.c 1483 2006-05-27 18:58:12Z jilles $
  */
 
 #include "stdinc.h"
 #include "client.h"
-#include "common.h"
 #include "match.h"
 #include "ircd.h"
 #include "numeric.h"
@@ -41,25 +38,28 @@
 #include "packet.h"
 #include "cache.h"
 
-static int m_oper(struct Client *, struct Client *, int, const char **);
+static const char oper_desc[] = "Provides the OPER command to become an IRC operator";
+
+static void m_oper(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
+static bool match_oper_password(const char *password, struct oper_conf *oper_p);
 
 struct Message oper_msgtab = {
-       "OPER", 0, 0, 0, MFLG_SLOW,
+       "OPER", 0, 0, 0, 0,
        {mg_unreg, {m_oper, 3}, mg_ignore, mg_ignore, mg_ignore, {m_oper, 3}}
 };
 
 mapi_clist_av1 oper_clist[] = { &oper_msgtab, NULL };
-DECLARE_MODULE_AV1(oper, NULL, NULL, oper_clist, NULL, NULL, "$Revision: 1483 $");
 
-static int match_oper_password(const char *password, struct oper_conf *oper_p);
+DECLARE_MODULE_AV2(oper, NULL, NULL, oper_clist, NULL, NULL, NULL, NULL, oper_desc);
 
 /*
  * m_oper
  *      parv[1] = oper name
  *      parv[2] = oper password
  */
-static int
-m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_oper(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct oper_conf *oper_p;
        const char *name;
@@ -72,19 +72,19 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
        {
                sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
                send_oper_motd(source_p);
-               return 0;
+               return;
        }
 
        /* end the grace period */
        if(!IsFloodDone(source_p))
                flood_endgrace(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, name);
 
        if(oper_p == NULL)
        {
-               sendto_one(source_p, form_str(ERR_NOOPERHOST), me.name, source_p->name);
+               sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
                ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
                     name, source_p->name,
                     source_p->username, source_p->host, source_p->sockhost);
@@ -96,12 +96,12 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
                                             source_p->name, source_p->username, source_p->host);
                }
 
-               return 0;
+               return;
        }
 
        if(IsOperConfNeedSSL(oper_p) && !IsSSLClient(source_p))
        {
-               sendto_one(source_p, form_str(ERR_NOOPERHOST), me.name, source_p->name);
+               sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
                ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- requires SSL/TLS",
                     name, source_p->name,
                     source_p->username, source_p->host, source_p->sockhost);
@@ -112,14 +112,14 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
                                             "Failed OPER attempt - missing SSL/TLS by %s (%s@%s)",
                                             source_p->name, source_p->username, source_p->host);
                }
-               return 0;
+               return;
        }
 
        if (oper_p->certfp != NULL)
        {
-               if (source_p->certfp == NULL || strcasecmp(source_p->certfp, oper_p->certfp))
+               if (source_p->certfp == NULL || rb_strcasecmp(source_p->certfp, oper_p->certfp))
                {
-                       sendto_one(source_p, form_str(ERR_NOOPERHOST), me.name, source_p->name);
+                       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,
                             source_p->username, source_p->host, source_p->sockhost);
@@ -130,7 +130,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
                                                     "Failed OPER attempt - client certificate fingerprint mismatch by %s (%s@%s)",
                                                     source_p->name, source_p->username, source_p->host);
                        }
-                       return 0;
+                       return;
                }
        }
 
@@ -141,7 +141,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
                ilog(L_OPERED, "OPER %s by %s!%s@%s (%s)",
                     name, source_p->name, source_p->username, source_p->host,
                     source_p->sockhost);
-               return 0;
+               return;
        }
        else
        {
@@ -159,31 +159,29 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
                                             source_p->name, source_p->username, source_p->host);
                }
        }
-
-       return 0;
 }
 
 /*
  * match_oper_password
  *
  * inputs       - pointer to given password
- *              - pointer to Conf 
- * output       - YES or NO if match
+ *              - pointer to Conf
+ * output       - true if match, false otherwise
  * side effects - none
  */
-static int
+static bool
 match_oper_password(const char *password, struct oper_conf *oper_p)
 {
        const char *encr;
 
        /* passwd may be NULL pointer. Head it off at the pass... */
        if(EmptyString(oper_p->passwd))
-               return NO;
+               return false;
 
        if(IsOperConfEncrypted(oper_p))
        {
                /* use first two chars of the password they send in as salt */
-               /* If the password in the conf is MD5, and ircd is linked   
+               /* If the password in the conf is MD5, and ircd is linked
                 * to scrypt on FreeBSD, or the standard crypt library on
                 * glibc Linux, then this code will work fine on generating
                 * the proper encrypted hash for comparison.
@@ -196,8 +194,8 @@ match_oper_password(const char *password, struct oper_conf *oper_p)
        else
                encr = password;
 
-       if(strcmp(encr, oper_p->passwd) == 0)
-               return YES;
+       if(encr != NULL && strcmp(encr, oper_p->passwd) == 0)
+               return true;
        else
-               return NO;
+               return false;
 }