# HG changeset patch
# User masneyb
# Date 1066006206 0
# Node ID de030cbd432c7149553dd4ac529df8c843564c5e
# Parent  470759f49ba2eaa54983bb3a3fc404d08148ec0f
2003-10-12 Brian Masney <masneyb@gftp.org>

        * lib/rfc959.c - when logging in to the server, if a 5xx code is
        returned, don't attempt to log in again.

diff -r 470759f49ba2 -r de030cbd432c ChangeLog
--- a/ChangeLog	Mon Oct 13 00:41:18 2003 +0000
+++ b/ChangeLog	Mon Oct 13 00:50:06 2003 +0000
@@ -1,4 +1,7 @@
 2003-10-12 Brian Masney <masneyb@gftp.org>
+	* lib/rfc959.c - when logging in to the server, if a 5xx code is 
+	returned, don't attempt to log in again.
+
 	* src/gtk/bookmarks.c - disconnect from the site before we parse the
 	bookmarks (from Aurelien Jarno <lists@aurel32.net>)
 
@@ -1551,7 +1554,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.147 2003/10/13 00:41:17 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.148 2003/10/13 00:50:05 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 470759f49ba2 -r de030cbd432c lib/rfc959.c
--- a/lib/rfc959.c	Mon Oct 13 00:41:18 2003 +0000
+++ b/lib/rfc959.c	Mon Oct 13 00:50:06 2003 +0000
@@ -480,6 +480,7 @@
       g_free (tempstr);
       if (resp < 0)
         return (GFTP_ERETRYABLE);
+
       if (resp == '3')
 	{
 	  tempstr = g_strconcat ("PASS ", request->password, "\r\n", NULL);
@@ -488,6 +489,7 @@
           if (resp < 0)
             return (GFTP_ERETRYABLE);
         }
+
       if (resp == '3' && request->account)
 	{
 	  tempstr = g_strconcat ("ACCT ", request->account, "\r\n", NULL);
@@ -501,7 +503,11 @@
   if (resp != '2')
     {
       gftp_disconnect (request);
-      return (GFTP_ERETRYABLE);
+
+      if (resp == '5')
+        return (GFTP_EFATAL);
+      else
+        return (GFTP_ERETRYABLE);
     }
 
   if ((ret = rfc959_syst (request)) < 0 && request->datafd < 0)