aboutsummaryrefslogtreecommitdiff
path: root/networking/ftpd.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-03-22 14:11:12 +0000
committerRon Yorston <rmy@pobox.com>2012-03-22 14:11:12 +0000
commit67758035a4fe040c6ac69b39d61bcd6bddd7b827 (patch)
treea4a1db7f54c16d12fabe2626b8f1e235cd694e9e /networking/ftpd.c
parent811c449748d5bd0505f8510e5582892f94ac0cda (diff)
parentb83c9704128dd106071184e4b00335a3b8486857 (diff)
downloadbusybox-w32-67758035a4fe040c6ac69b39d61bcd6bddd7b827.tar.gz
busybox-w32-67758035a4fe040c6ac69b39d61bcd6bddd7b827.tar.bz2
busybox-w32-67758035a4fe040c6ac69b39d61bcd6bddd7b827.zip
Merge commit 'b83c9704128dd106071184e4b00335a3b8486857' into merge
Diffstat (limited to 'networking/ftpd.c')
-rw-r--r--networking/ftpd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/ftpd.c b/networking/ftpd.c
index b59135667..fae634ec4 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -433,7 +433,7 @@ bind_for_passive_mode(void)
433 G.pasv_listen_fd = fd = xsocket(G.local_addr->u.sa.sa_family, SOCK_STREAM, 0); 433 G.pasv_listen_fd = fd = xsocket(G.local_addr->u.sa.sa_family, SOCK_STREAM, 0);
434 setsockopt_reuseaddr(fd); 434 setsockopt_reuseaddr(fd);
435 435
436 set_nport(G.local_addr, 0); 436 set_nport(&G.local_addr->u.sa, 0);
437 xbind(fd, &G.local_addr->u.sa, G.local_addr->len); 437 xbind(fd, &G.local_addr->u.sa, G.local_addr->len);
438 xlisten(fd, 1); 438 xlisten(fd, 1);
439 getsockname(fd, &G.local_addr->u.sa, &G.local_addr->len); 439 getsockname(fd, &G.local_addr->u.sa, &G.local_addr->len);
@@ -542,7 +542,7 @@ handle_port(void)
542 G.port_addr = xdotted2sockaddr(raw, port); 542 G.port_addr = xdotted2sockaddr(raw, port);
543#else 543#else
544 G.port_addr = get_peer_lsa(STDIN_FILENO); 544 G.port_addr = get_peer_lsa(STDIN_FILENO);
545 set_nport(G.port_addr, htons(port)); 545 set_nport(&G.port_addr->u.sa, htons(port));
546#endif 546#endif
547 WRITE_OK(FTP_PORTOK); 547 WRITE_OK(FTP_PORTOK);
548} 548}