Fix stripcr and password-stripping.

svn path=/trunk/; revision=857

3 files changed, 5 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 19686272..54c9e35d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@
 
 ------------------------------------------------------------------------------
 
+pl 3.3.2 (Mon Feb  3 12:59:33 EST 1997):
+* Minor fixes to stripcr and password-shrouding logic.
+
 pl 3.3.1 (Sun Feb  2 02:17:07 EST 1997):
 * Fix incorrect stripcr processing
 * Unapply a patch that broke error logging to files.
diff --git a/driver.c b/driver.c
index 9cdf0939..a9f868b2 100644
--- a/driver.c
+++ b/driver.c
@@ -1479,7 +1479,7 @@ va_dcl
 	    *cp++ = '*';
 	    while (*sp)
 		*cp++ = *sp++;
-	    *sp = '\0';
+	    *cp = '\0';
 	}
 	buf[strlen(buf)-2] = '\0';
 	error(0, 0, "%s> %s", protocol->name, buf);
diff --git a/rcfile_y.y b/rcfile_y.y
index 693bcb9e..8f5f9e7c 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -301,6 +301,7 @@ static void prc_reset(void)
     save = current.server;
 
     memset(&current, '\0', sizeof(current));
+    current.stripcr = -1;
 
     current.server = save;
 }