talons

commit 8521f0ae064f4ede288d069b4268088578b69d5e
parent 5efc6e385690ee4729fc6859a50813d1cdd7845a
Author: Ricardo Mones <mones@claws-mail.org>
Date:   Thu, 12 May 2011 14:51:47 +0000

2011-05-12 [mones]	3.7.9cvs21

	* src/etpan/nntp-thread.c
		Fix bug #2418 "NNTP authentication is broken"

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/etpan/nntp-thread.c
 | 
11
+++++++----

4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-12 [mones]	3.7.9cvs21
+
+	* src/etpan/nntp-thread.c
+		Fix bug #2418 "NNTP authentication is broken"
+
 2011-05-09 [pawel]	3.7.9cvs20
 
 	* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4172,3 +4172,4 @@
 ( cvs diff -u -r 1.115.2.237 -r 1.115.2.238 src/main.c;  ) > 3.7.9cvs18.patchset
 ( cvs diff -u -r 1.179.2.254 -r 1.179.2.255 src/imap.c;  cvs diff -u -r 1.149.2.103 -r 1.149.2.104 src/inc.c;  cvs diff -u -r 1.101.2.64 -r 1.101.2.65 src/news.c;  cvs diff -u -r 1.17.2.59 -r 1.17.2.60 src/send_message.c;  ) > 3.7.9cvs19.patchset
 ( cvs diff -u -r 1.274.2.323 -r 1.274.2.324 src/mainwindow.c;  cvs diff -u -r 1.52.2.82 -r 1.52.2.83 src/prefs_folder_item.c;  ) > 3.7.9cvs20.patchset
+( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/etpan/nntp-thread.c;  ) > 3.7.9cvs21.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=21
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
@@ -592,10 +592,13 @@ static void login_run(struct etpan_thread_op * op)
 	mailstream_debug = 0;
 #endif
 
-	r = newsnntp_authinfo_username(param->nntp, param->login);
-	if (r == NEWSNNTP_NO_ERROR || 
-	    r == NEWSNNTP_WARNING_REQUEST_AUTHORIZATION_PASSWORD) {
-		r = newsnntp_authinfo_password(param->nntp, param->password);
+	r = newsnntp_mode_reader(param->nntp);
+	if (r == NEWSNNTP_NO_ERROR) {
+		r = newsnntp_authinfo_username(param->nntp, param->login);
+		if (r == NEWSNNTP_NO_ERROR || 
+		    r == NEWSNNTP_WARNING_REQUEST_AUTHORIZATION_PASSWORD) {
+			r = newsnntp_authinfo_password(param->nntp, param->password);
+		}
 	}