From 299ad32f98f8081aa084bc2f311f1373f95626ff Mon Sep 17 00:00:00 2001
From: Stephen Bennett <spb@exherbo.org>
Date: Fri, 29 Aug 2008 14:45:22 -0500
Subject: [PATCH 1/4] If auth_user and server password were given and not used,
 use auth_user as an account name in the nickserv identify command

---
 doc/sgml/oper-guide/charybdis-oper-guide.sgml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/sgml/oper-guide/charybdis-oper-guide.sgml b/doc/sgml/oper-guide/charybdis-oper-guide.sgml
index 2c9c1a9..6dd8a17 100644
--- a/doc/sgml/oper-guide/charybdis-oper-guide.sgml
+++ b/doc/sgml/oper-guide/charybdis-oper-guide.sgml
@@ -5,6 +5,7 @@
 <!ENTITY cmodes SYSTEM "cmodes.sgml">
 <!ENTITY ucommands SYSTEM "ucommands.sgml">
 <!ENTITY commands SYSTEM "commands.sgml">
+<!ENTITY extensions SYSTEM "extensions.sgml">
 <!ENTITY config SYSTEM "config.sgml">
 ]>
 <book id="charybdis-oper-guide">
@@ -37,6 +38,7 @@
   &cmodes;
   &ucommands;
   &commands;
+  &extensions;
   &oprivs;
   &config;
 </book>

From 645103ac52e1ad2c9ce032f140a3897b319b3de9 Mon Sep 17 00:00:00 2001
From: Stephen Bennett <spb@exherbo.org>
Date: Fri, 29 Aug 2008 14:45:30 -0500
Subject: [PATCH 2/4] If auth_user and server password were given and not used,
 use auth_user as an account name in the nickserv identify command

---
 src/s_user.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/s_user.c b/src/s_user.c
index 01a21e8..adbcea6 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -649,11 +649,21 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 			else
 				identifyservice_p = NULL;
 			if (identifyservice_p != NULL)
-				sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s",
-						get_id(source_p, identifyservice_p),
-						ConfigFileEntry.identifyservice,
-						ConfigFileEntry.identifycommand,
-						source_p->localClient->passwd);
+			{
+				if (!EmptyString(source_p->localClient->auth_user))
+					sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s %s",
+							get_id(source_p, identifyservice_p),
+							ConfigFileEntry.identifyservice,
+							ConfigFileEntry.identifycommand,
+							source_p->localClient->auth_user,
+							source_p->localClient->passwd);
+				else
+					sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s",
+							get_id(source_p, identifyservice_p),
+							ConfigFileEntry.identifyservice,
+							ConfigFileEntry.identifycommand,
+							source_p->localClient->passwd);
+			}
 		}
 		memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
 		rb_free(source_p->localClient->passwd);

From 016746cfc222a0df1fc8892e0930ab9c2790b69e Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@atheme.org>
Date: Fri, 29 Aug 2008 14:46:19 -0500
Subject: [PATCH 3/4] Backed out changeset 7f24e5f3fb86

---
 doc/sgml/oper-guide/charybdis-oper-guide.sgml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/sgml/oper-guide/charybdis-oper-guide.sgml b/doc/sgml/oper-guide/charybdis-oper-guide.sgml
index 6dd8a17..2c9c1a9 100644
--- a/doc/sgml/oper-guide/charybdis-oper-guide.sgml
+++ b/doc/sgml/oper-guide/charybdis-oper-guide.sgml
@@ -5,7 +5,6 @@
 <!ENTITY cmodes SYSTEM "cmodes.sgml">
 <!ENTITY ucommands SYSTEM "ucommands.sgml">
 <!ENTITY commands SYSTEM "commands.sgml">
-<!ENTITY extensions SYSTEM "extensions.sgml">
 <!ENTITY config SYSTEM "config.sgml">
 ]>
 <book id="charybdis-oper-guide">
@@ -38,7 +37,6 @@
   &cmodes;
   &ucommands;
   &commands;
-  &extensions;
   &oprivs;
   &config;
 </book>

From 1d53b4283b109ad1fb261a6f25fe20abac016cb6 Mon Sep 17 00:00:00 2001
From: Stephen Bennett <spb@exherbo.org>
Date: Fri, 29 Aug 2008 14:47:51 -0500
Subject: [PATCH 4/4]  don't set an empty password or auth_user

---
 modules/m_pass.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/m_pass.c b/modules/m_pass.c
index 0cc0747..b66de73 100644
--- a/modules/m_pass.c
+++ b/modules/m_pass.c
@@ -83,9 +83,9 @@ mr_pass(struct Client *client_p, struct Client *source_p, int parc, const char *
 		auth_user = NULL;
 	}
 	
-	client_p->localClient->passwd = rb_strndup(pass, PASSWDLEN);
+	client_p->localClient->passwd = *pass ? rb_strndup(pass, PASSWDLEN) : NULL;
 	
-	if(auth_user)
+	if(auth_user && *auth_user)
 		client_p->localClient->auth_user = rb_strndup(auth_user, PASSWDLEN);
 
 	/* These are for servers only */