diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:28 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:57:28 +0000 |
| commit | c968dc2f44b02858606af3d07aed189b735ecb76 (patch) | |
| tree | c961ae77f5620050bd384e275ef9028a3ca80b3d /methods/ftp.cc | |
| parent | f0ec51c2bc1cb671bc9f834c1b0921feaf1338a4 (diff) | |
Reordered some things to make dante happier. Closes: #92757
Author: jgg
Date: 2001-04-10 04:51:50 GMT
Reordered some things to make dante happier. Closes: #92757
Diffstat (limited to 'methods/ftp.cc')
| -rw-r--r-- | methods/ftp.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/methods/ftp.cc b/methods/ftp.cc index 4f9410bfc..89f144fe5 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: ftp.cc,v 1.26 2001/03/24 22:34:55 jgg Exp $ +// $Id: ftp.cc,v 1.27 2001/04/10 04:51:50 jgg Exp $ /* ###################################################################### FTP Aquire Method - This is the FTP aquire method for APT. @@ -153,6 +153,10 @@ bool FTPConn::Open(pkgAcqMethod *Owner) RotateDNS(); if (Connect(Host,Port,"ftp",21,ServerFd,TimeOut,Owner) == false) return false; + + // Login must be before getpeername otherwise dante won't work. + Owner->Status("Logging in"); + bool Res = Login(); // Get the remote server's address PeerAddrLen = sizeof(PeerAddr); @@ -164,8 +168,7 @@ bool FTPConn::Open(pkgAcqMethod *Owner) if (getsockname(ServerFd,(sockaddr *)&ServerAddr,&ServerAddrLen) != 0) return _error->Errno("getsockname","Unable to determine the local name"); - Owner->Status("Logging in"); - return Login(); + return Res; } /*}}}*/ // FTPConn::Login - Login to the remote server /*{{{*/ |