aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2015-01-27 09:52:18 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2015-01-27 09:52:18 +0100
commit1ecfe811fe2f70380170ef7d820e8150054e88ca (patch)
tree2ecabb7c7b054ae8146942d08f361380473fb0db /networking
parent6968e081230fb6434a2a6f0eed39d538ea982f3f (diff)
downloadbusybox-w32-1_23_1.tar.gz
busybox-w32-1_23_1.tar.bz2
busybox-w32-1_23_1.zip
Apply post-1.23.0 patches, bump version to 1.23.11_23_1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r--networking/ftpd.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/networking/ftpd.c b/networking/ftpd.c
index 6adcb1dee..0c10e1f25 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -1174,8 +1174,13 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
1174 1174
1175 //umask(077); - admin can set umask before starting us 1175 //umask(077); - admin can set umask before starting us
1176 1176
1177 /* Signals. We'll always take -EPIPE rather than a rude signal, thanks */ 1177 /* Signals */
1178 signal(SIGPIPE, SIG_IGN); 1178 bb_signals(0
1179 /* We'll always take EPIPE rather than a rude signal, thanks */
1180 + (1 << SIGPIPE)
1181 /* LIST command spawns chilren. Prevent zombies */
1182 + (1 << SIGCHLD)
1183 , SIG_IGN);
1179 1184
1180 /* Set up options on the command socket (do we need these all? why?) */ 1185 /* Set up options on the command socket (do we need these all? why?) */
1181 setsockopt(STDIN_FILENO, IPPROTO_TCP, TCP_NODELAY, &const_int_1, sizeof(const_int_1)); 1186 setsockopt(STDIN_FILENO, IPPROTO_TCP, TCP_NODELAY, &const_int_1, sizeof(const_int_1));