Re: lftp 4.5.6 (stable) and 4.6.0

On Tue, Oct 14, 2014 at 01:57:58PM +0200, Juan Simón wrote:
> Error to compile lftp-4.6 on Ubuntu 14.04 64 bits with './configure
> --with-modules --without-gnutls --without-openssl':
> Making all in m4
> Making all in doc
> Making all in lib
> Making all in src
> ftpclass.cc: In member function 'virtual int Ftp::Do()':
> ftpclass.cc:1614:22: error: 'PROT' is not a member of 'Ftp::Expect'
>        || expect->Has(Expect::PROT))

My bad. Please see the attached patch.

-- 
   Alexander.

_______________________________________________
lftp mailing list
[email protected]
http://univ.uniyar.ac.ru/mailman/listinfo/lftp

diff --git a/src/ftpclass.cc b/src/ftpclass.cc
index 130704d..bc148bc 100644
--- a/src/ftpclass.cc
+++ b/src/ftpclass.cc
@@ -1610,12 +1610,12 @@ int   Ftp::Do()
 
       if(expect->Has(Expect::FEAT)
       || expect->Has(Expect::OPTS_UTF8)
-      || expect->Has(Expect::LANG)
-      || expect->Has(Expect::PROT))
+      || expect->Has(Expect::LANG))
 	 goto usual_return;
 
 #if USE_SSL
-      if(expect->Has(Expect::CCC))
+      if(expect->Has(Expect::CCC)
+      || expect->Has(Expect::PROT))
 	 goto usual_return;
 #endif // USE_SSL