Restrict shrouding to during authentication phase.

svn path=/trunk/; revision=3248

1 files changed, 5 insertions, 1 deletions

diff --git a/driver.c b/driver.c
index df38f286..d33acfd1 100644
--- a/driver.c
+++ b/driver.c
@@ -1814,6 +1814,10 @@ const int maxfetch;		/* maximum number of messages to fetch */
 		strcpy(shroud, ctl->password);
 
 	    ok = (protocol->getauth)(mailserver_socket, ctl, buf);
+
+	    /* prevent shrouding later on -- it might backfire */
+	    shroud[0] = '\0';
+
 	    if (ok != 0)
 	    {
 		if (ok == PS_LOCKBUSY)
@@ -2617,7 +2621,7 @@ va_dcl
     {
 	char *cp;
 
-	if (shroud && shroud[0] && (cp = strstr(buf, shroud)))
+	if (shroud[0] && (cp = strstr(buf, shroud)))
 	{
 	    char	*sp;