Merge branch '1796_FTPFS_fail_active_mode'

* 1796_FTPFS_fail_active_mode:
  Minor fix for mc_log_mark() macro.
  Ticket #1796: FTPFS does not work in active mode
This commit is contained in:
Slava Zanko 2009-12-02 16:05:48 +02:00
commit 553bef687e
2 changed files with 2 additions and 2 deletions

View File

@ -11,7 +11,7 @@
events into a central log file that can be used for debugging.
*/
#define mc_log_mark() mc_log("%s:%d\n",__FILE,__LINE__)
#define mc_log_mark() mc_log("%s:%d\n",__FILE__,__LINE__)
extern void mc_log(const char *, ...)
__attribute__((__format__(__printf__,1,2)));

View File

@ -982,7 +982,7 @@ again:
memset (&data_addr, 0, sizeof (struct sockaddr_storage));
data_addrlen = sizeof (struct sockaddr_storage);
if (getpeername (SUP.sock, (struct sockaddr *) &data_addr, &data_addrlen) == -1)
if (getsockname (SUP.sock, (struct sockaddr *) &data_addr, &data_addrlen) == -1)
return -1;
switch (data_addr.ss_family) {