Fixed a problem with NNTP authentication failure handling (need to

[claws.git] / src / nntp.c

diff --git a/src/nntp.c b/src/nntp.c
index c1b5162a18c2b45b7508adfbf88838f2f40e9253..1bf5931979c39b922632c519f09249e22f25a7c4 100644 (file)
--- a/src/nntp.c
+++ b/src/nntp.c
@@ -232,6 +232,9 @@ gint nntp_mode(NNTPSockInfo *sock, gboolean stream)
 {
        gint ok;
 
+       if (sock->auth_failed)
+               return NN_AUTHREQ; /* force reconnection */
+
        ok = nntp_gen_command(sock, NULL, "MODE %s",
                              stream ? "STREAM" : "READER");
 
@@ -310,15 +313,21 @@ static gint nntp_gen_command(NNTPSockInfo *sock, gchar *argbuf,
 
        nntp_gen_send(sock, "%s", buf);
        ok = nntp_ok(sock, argbuf);
-       if (ok == NN_AUTHREQ && sock->userid && sock->passwd) {
+       if (ok == NN_AUTHREQ) {
+               if (!sock->userid || !sock->passwd) {
+                       sock->auth_failed = TRUE;
+                       return ok;
+               }
                nntp_gen_send(sock, "AUTHINFO USER %s", sock->userid);
                ok = nntp_ok(sock, NULL);
                if (ok == NN_AUTHCONT) {
                        nntp_gen_send(sock, "AUTHINFO PASS %s", sock->passwd);
                        ok = nntp_ok(sock, NULL);
                }
-               if (ok != NN_SUCCESS)
+               if (ok != NN_SUCCESS) {
+                       sock->auth_failed = TRUE;
                        return ok;
+               }
                nntp_gen_send(sock, "%s", buf);
                ok = nntp_ok(sock, argbuf);
        }