ircd/packet.c: make function definition consistent with declaration (#301)

[solanum.git] / modules / m_pass.c

diff --git a/modules/m_pass.c b/modules/m_pass.c
index d26e640a363513b84406a5644f6b55b13b8b4b14..d0009de8f78035ec2a7d3b60ecd5a4dcc90af656 100644 (file)
--- a/modules/m_pass.c
+++ b/modules/m_pass.c
@@ -20,13 +20,11 @@
  *  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_pass.c 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #include "stdinc.h"
 #include "client.h"            /* client struct */
-#include "irc_string.h"
+#include "match.h"
 #include "send.h"              /* sendto_one */
 #include "numeric.h"           /* ERR_xxx */
 #include "ircd.h"              /* me */
@@ -37,42 +35,57 @@
 #include "hash.h"
 #include "s_conf.h"
 
-static int mr_pass(struct Client *, struct Client *, int, const char **);
+static const char pass_desc[] = "Provides the PASS command to authenticate clients and servers";
+
+static void mr_pass(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message pass_msgtab = {
-       "PASS", 0, 0, 0, MFLG_SLOW | MFLG_UNREG,
+       "PASS", 0, 0, 0, 0,
        {{mr_pass, 2}, mg_reg, mg_ignore, mg_ignore, mg_ignore, mg_reg}
 };
 
 mapi_clist_av1 pass_clist[] = { &pass_msgtab, NULL };
-DECLARE_MODULE_AV1(pass, NULL, NULL, pass_clist, NULL, NULL, "$Revision: 3550 $");
+
+DECLARE_MODULE_AV2(pass, NULL, NULL, pass_clist, NULL, NULL, NULL, NULL, pass_desc);
 
 /*
  * m_pass() - Added Sat, 4 March 1989
  *
  *
  * mr_pass - PASS message handler
- *      parv[0] = sender prefix
  *      parv[1] = password
  *      parv[2] = "TS" if this server supports TS.
  *      parv[3] = optional TS version field -- needed for TS6
  */
-static int
-mr_pass(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mr_pass(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-       if(client_p->localClient->passwd)
+       char *auth_user, *pass, *buf;
+       buf = LOCAL_COPY(parv[1]);
+
+       if(client_p->localClient->passwd || client_p->localClient->auth_user)
+               return;
+
+       if ((pass = strchr(buf, ':')) != NULL)
        {
-               memset(client_p->localClient->passwd, 0,
-                       strlen(client_p->localClient->passwd));
-               MyFree(client_p->localClient->passwd);
+               *pass++ = '\0';
+               auth_user = buf;
        }
+       else
+       {
+               pass = buf;
+               auth_user = NULL;
+       }
+
+       client_p->localClient->passwd = *pass ? rb_strndup(pass, PASSWDLEN) : NULL;
 
-       DupNString(client_p->localClient->passwd, parv[1], PASSWDLEN);
+       if(auth_user && *auth_user)
+               client_p->localClient->auth_user = rb_strndup(auth_user, PASSWDLEN);
 
        /* These are for servers only */
-       if(parc > 2 && client_p->user == NULL)
+       if(parc > 2 && client_p->user == NULL && client_p->preClient != NULL)
        {
-               /* 
+               /*
                 * It looks to me as if orabidoo wanted to have more
                 * than one set of option strings possible here...
                 * i.e. ":AABBTS" as long as TS was the last two chars
@@ -83,21 +96,16 @@ mr_pass(struct Client *client_p, struct Client *source_p, int parc, const char *
                if(irccmp(parv[2], "TS") == 0 && client_p->tsinfo == 0)
                        client_p->tsinfo = TS_DOESTS;
 
-               /* kludge, if we're not using ts6, dont ever mark a server
-                * as TS6 capable, that way we'll never send them TS6 data.
-                */
                if(parc == 5 && atoi(parv[3]) >= 6)
                {
                        /* only mark as TS6 if the SID is valid.. */
                        if(IsDigit(parv[4][0]) && IsIdChar(parv[4][1]) &&
                           IsIdChar(parv[4][2]) && parv[4][3] == '\0' &&
-                          EmptyString(client_p->id))
+                          EmptyString(client_p->preClient->id))
                        {
                                client_p->localClient->caps |= CAP_TS6;
-                               strcpy(client_p->id, parv[4]);
+                               rb_strlcpy(client_p->preClient->id, parv[4], sizeof(client_p->preClient->id));
                        }
                }
        }
-
-       return 0;
 }