X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..8ee12f0c437eec8aa42af7b350c7e2a3ccafedbc:/modules/m_pass.c?ds=sidebyside

diff --git a/modules/m_pass.c b/modules/m_pass.c
index 1cfe2844..b66de738 100644
--- a/modules/m_pass.c
+++ b/modules/m_pass.c
@@ -21,12 +21,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_pass.c 1291 2006-05-05 19:00:19Z jilles $
+ *  $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 */
@@ -45,7 +45,7 @@ struct Message pass_msgtab = {
 };
 
 mapi_clist_av1 pass_clist[] = { &pass_msgtab, NULL };
-DECLARE_MODULE_AV1(pass, NULL, NULL, pass_clist, NULL, NULL, "$Revision: 1291 $");
+DECLARE_MODULE_AV1(pass, NULL, NULL, pass_clist, NULL, NULL, "$Revision: 3550 $");
 
 /*
  * m_pass() - Added Sat, 4 March 1989
@@ -60,14 +60,33 @@ DECLARE_MODULE_AV1(pass, NULL, NULL, pass_clist, NULL, NULL, "$Revision: 1291 $"
 static int
 mr_pass(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));
-		MyFree(client_p->localClient->passwd);
+		rb_free(client_p->localClient->passwd);
 	}
 
-	DupNString(client_p->localClient->passwd, parv[1], PASSWDLEN);
+	client_p->localClient->passwd = rb_strndup(parv[1], PASSWDLEN);
+	
+	if ((pass = strchr(buf, ':')) != NULL)
+	{
+		*pass++ = '\0'; 
+		auth_user = buf; 
+	}
+	else
+	{
+		pass = buf;
+		auth_user = NULL;
+	}
+	
+	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)
@@ -86,7 +105,7 @@ mr_pass(struct Client *client_p, struct Client *source_p, int parc, const char *
 		/* 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(ServerInfo.use_ts6 && parc == 5 && atoi(parv[3]) >= 6)
+		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]) &&