X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/40c1fd479952f47b9f3f5c4de660cd94ddd1a89a..0c23c0b1c526193bac9efb4decee564b2db16b0a:/modules/m_pass.c

diff --git a/modules/m_pass.c b/modules/m_pass.c
index 0cc0747b..36398055 100644
--- a/modules/m_pass.c
+++ b/modules/m_pass.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_pass.c 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #include "stdinc.h"
@@ -37,61 +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[])
 {
 	char *auth_user, *pass, *buf;
 	buf = LOCAL_COPY(parv[1]);
-	
-	if(client_p->localClient->passwd)
-	{
-		memset(client_p->localClient->passwd, 0,
-			strlen(client_p->localClient->passwd));
-		rb_free(client_p->localClient->passwd);
-	}
 
-	client_p->localClient->passwd = rb_strndup(parv[1], PASSWDLEN);
-	
+	if(client_p->localClient->passwd || client_p->localClient->auth_user)
+		return;
+
 	if ((pass = strchr(buf, ':')) != NULL)
 	{
-		*pass++ = '\0'; 
-		auth_user = buf; 
+		*pass++ = '\0';
+		auth_user = buf;
 	}
 	else
 	{
 		pass = buf;
 		auth_user = NULL;
 	}
-	
-	client_p->localClient->passwd = rb_strndup(pass, PASSWDLEN);
-	
-	if(auth_user)
+
+	client_p->localClient->passwd = *pass ? rb_strndup(pass, PASSWDLEN) : NULL;
+
+	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)
 	{
-		/* 
+		/*
 		 * 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
@@ -102,9 +96,6 @@ 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.. */
@@ -113,10 +104,8 @@ mr_pass(struct Client *client_p, struct Client *source_p, int parc, const char *
 			   EmptyString(client_p->id))
 			{
 				client_p->localClient->caps |= CAP_TS6;
-				strcpy(client_p->id, parv[4]);
+				rb_strlcpy(client_p->id, parv[4], sizeof(client_p->id));
 			}
 		}
 	}
-
-	return 0;
 }