talons

commit 7171e2ab9565100e89086fc9c1fab58650e1db15
parent b8f9675a02e98096092368be8267f24627693e2b
Author: Michael Rasmussen <mir@datanom.net>
Date:   Sat, 13 Aug 2011 19:01:23 +0000

2011-08-13 [mir]	3.7.9cvs46

	* src/etpan/nntp-thread.c
	  Fix bug when NNTP server sends authentication warning
	  as part of the connection session. Privously etpan would
	  bail out for any return code other than NEWSNNTP_NO_ERROR
	  but as early as the connection session a return code like
	  NEWSNNTP_WARNING_REQUEST_AUTHORIZATION_USERNAME and
          NEWSNNTP_WARNING_REQUEST_AUTHORIZATION_PASSWORD should not
	  be considered as an error.

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

4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-13 [mir]	3.7.9cvs46
+
+	* src/etpan/nntp-thread.c
+	  Fix bug when NNTP server sends authentication warning
+	  as part of the connection session. Privously etpan would
+	  bail out for any return code other than NEWSNNTP_NO_ERROR
+	  but as early as the connection session a return code like
+	  NEWSNNTP_WARNING_REQUEST_AUTHORIZATION_USERNAME and
+          NEWSNNTP_WARNING_REQUEST_AUTHORIZATION_PASSWORD should not
+	  be considered as an error.
+
 2011-08-12 [paul]	3.7.9cvs45
 
 	* src/mimeview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4197,3 +4197,4 @@
 ( cvs diff -u -r 1.83.2.168 -r 1.83.2.169 src/mimeview.c;  ) > 3.7.9cvs43.patchset
 ( cvs diff -u -r 1.1.2.102 -r 1.1.2.103 src/gtk/quicksearch.c;  ) > 3.7.9cvs44.patchset
 ( cvs diff -u -r 1.83.2.169 -r 1.83.2.170 src/mimeview.c;  ) > 3.7.9cvs45.patchset
+( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/etpan/nntp-thread.c;  ) > 3.7.9cvs46.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=45
+EXTRA_VERSION=46
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
@@ -593,7 +593,9 @@ static void login_run(struct etpan_thread_op * op)
 #endif
 
 	r = newsnntp_mode_reader(param->nntp);
-	if (r == NEWSNNTP_NO_ERROR) {
+        if (r == NEWSNNTP_NO_ERROR ||
+	    r == NEWSNNTP_WARNING_REQUEST_AUTHORIZATION_USERNAME ||
+	    r == NEWSNNTP_WARNING_REQUEST_AUTHORIZATION_PASSWORD) {
 		r = newsnntp_authinfo_username(param->nntp, param->login);
 		if (r == NEWSNNTP_NO_ERROR || 
 		    r == NEWSNNTP_WARNING_REQUEST_AUTHORIZATION_PASSWORD) {