projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udhcpc: add support for DHCP option 212 (RFC 5969)
[oweals/busybox.git]
/
networking
/
ftpd.c
diff --git
a/networking/ftpd.c
b/networking/ftpd.c
index b5913566700e835bf2f1dbbed4c53ab1b071136d..e38138c0a85b1b4d8ef0e753597ab323c5113ae9 100644
(file)
--- a/
networking/ftpd.c
+++ b/
networking/ftpd.c
@@
-22,7
+22,6
@@
//usage: " 21 stream tcp nowait root ftpd ftpd /files/to/serve\n"
//usage: "It also can be ran from tcpsvd:\n"
//usage: " tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n"
//usage: " 21 stream tcp nowait root ftpd ftpd /files/to/serve\n"
//usage: "It also can be ran from tcpsvd:\n"
//usage: " tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n"
-//usage: "\nOptions:"
//usage: "\n -w Allow upload"
//usage: "\n -v Log errors to stderr. -vv: verbose log"
//usage: "\n -S Log errors to syslog. -SS: verbose log"
//usage: "\n -w Allow upload"
//usage: "\n -v Log errors to stderr. -vv: verbose log"
//usage: "\n -S Log errors to syslog. -SS: verbose log"
@@
-433,7
+432,7
@@
bind_for_passive_mode(void)
G.pasv_listen_fd = fd = xsocket(G.local_addr->u.sa.sa_family, SOCK_STREAM, 0);
setsockopt_reuseaddr(fd);
G.pasv_listen_fd = fd = xsocket(G.local_addr->u.sa.sa_family, SOCK_STREAM, 0);
setsockopt_reuseaddr(fd);
- set_nport(
G.local_addr
, 0);
+ set_nport(
&G.local_addr->u.sa
, 0);
xbind(fd, &G.local_addr->u.sa, G.local_addr->len);
xlisten(fd, 1);
getsockname(fd, &G.local_addr->u.sa, &G.local_addr->len);
xbind(fd, &G.local_addr->u.sa, G.local_addr->len);
xlisten(fd, 1);
getsockname(fd, &G.local_addr->u.sa, &G.local_addr->len);
@@
-542,7
+541,7
@@
handle_port(void)
G.port_addr = xdotted2sockaddr(raw, port);
#else
G.port_addr = get_peer_lsa(STDIN_FILENO);
G.port_addr = xdotted2sockaddr(raw, port);
#else
G.port_addr = get_peer_lsa(STDIN_FILENO);
- set_nport(
G.port_addr
, htons(port));
+ set_nport(
&G.port_addr->u.sa
, htons(port));
#endif
WRITE_OK(FTP_PORTOK);
}
#endif
WRITE_OK(FTP_PORTOK);
}