X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/f06c147c70cf72b40e4ec0ec3b5aca86662beb80..eb157882d544cef011402d332a3625330c62668d:/modules/m_pass.c

diff --git a/modules/m_pass.c b/modules/m_pass.c
index 1f4255e..c331e25 100644
--- a/modules/m_pass.c
+++ b/modules/m_pass.c
@@ -52,7 +52,6 @@ DECLARE_MODULE_AV1(pass, NULL, NULL, pass_clist, NULL, NULL, "$Revision: 3550 $"
  *
  *
  * 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
@@ -60,6 +59,9 @@ DECLARE_MODULE_AV1(pass, NULL, NULL, pass_clist, NULL, NULL, "$Revision: 3550 $"
 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,
@@ -68,6 +70,22 @@ mr_pass(struct Client *client_p, struct Client *source_p, int parc, const char *
 	}
 
 	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)
@@ -83,9 +101,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.. */