[evolution-patches] 64023, nntp remembers password forever

[Not Zed <notzed ximian com>]

--

Michael Zucchi <notzed ximian com> "born to die, live to work, it's all downhill from here" Novell's Evolution and Free Software Developer

Index: camel/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.2249
diff -u -3 -r1.2249 ChangeLog
--- camel/ChangeLog	24 Aug 2004 14:02:21 -0000	1.2249
+++ camel/ChangeLog	27 Aug 2004 07:24:08 -0000
@@ -1,3 +1,10 @@
+2004-08-27  Not Zed  <NotZed Ximian com>
+
+	** See bug #64023.
+
+	* providers/nntp/camel-nntp-store.c (camel_nntp_try_authenticate):
+	forget the password if it was wrong.
+
 2004-08-23  Not Zed  <NotZed Ximian com>
 
 	** See bug #63189.
Index: camel/providers/nntp/camel-nntp-store.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/nntp/camel-nntp-store.c,v
retrieving revision 1.65
diff -u -3 -r1.65 camel-nntp-store.c
--- camel/providers/nntp/camel-nntp-store.c	10 Jun 2004 02:13:24 -0000	1.65
+++ camel/providers/nntp/camel-nntp-store.c	27 Aug 2004 07:24:08 -0000
@@ -1141,9 +1141,12 @@
 		ret = camel_nntp_raw_command(store, ex, &line, "authinfo pass %s", service->url->passwd);
 
 	if (ret != NNTP_AUTH_ACCEPTED) {
-		if (ret != -1)
+		if (ret != -1) {
+			/* Need to forget the password here since we have no context on it */
+			camel_session_forget_password(session, service, NULL, "password", ex);
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
 					     _("Cannot authenticate to server: %s"), line);
+		}
 		return -1;
 	}