aboutsummaryrefslogtreecommitdiff
path: root/networking/inetd.c
diff options
context:
space:
mode:
Diffstat (limited to 'networking/inetd.c')
-rw-r--r--networking/inetd.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/networking/inetd.c b/networking/inetd.c
index da6551174..3cd2b11f0 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -504,7 +504,7 @@ static void register_rpc(servtab_t *sep)
504 504
505 if (bb_getsockname(sep->se_fd, (struct sockaddr *) &ir_sin, sizeof(ir_sin)) < 0) { 505 if (bb_getsockname(sep->se_fd, (struct sockaddr *) &ir_sin, sizeof(ir_sin)) < 0) {
506//TODO: verify that such failure is even possible in Linux kernel 506//TODO: verify that such failure is even possible in Linux kernel
507 bb_perror_msg("getsockname"); 507 bb_simple_perror_msg("getsockname");
508 return; 508 return;
509 } 509 }
510 510
@@ -544,7 +544,7 @@ static void bump_nofile(void)
544 } 544 }
545 545
546 if (setrlimit(RLIMIT_NOFILE, &rl) < 0) { 546 if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
547 bb_perror_msg("setrlimit"); 547 bb_simple_perror_msg("setrlimit");
548 return; 548 return;
549 } 549 }
550 550
@@ -599,7 +599,7 @@ static void prepare_socket_fd(servtab_t *sep)
599 599
600 fd = socket(sep->se_family, sep->se_socktype, 0); 600 fd = socket(sep->se_family, sep->se_socktype, 0);
601 if (fd < 0) { 601 if (fd < 0) {
602 bb_perror_msg("socket"); 602 bb_simple_perror_msg("socket");
603 return; 603 return;
604 } 604 }
605 setsockopt_reuseaddr(fd); 605 setsockopt_reuseaddr(fd);
@@ -815,7 +815,7 @@ static NOINLINE servtab_t *parse_one_line(void)
815 n = bb_strtou(p, &p, 10); 815 n = bb_strtou(p, &p, 10);
816 if (n > INT_MAX) { 816 if (n > INT_MAX) {
817 bad_ver_spec: 817 bad_ver_spec:
818 bb_error_msg("bad rpc version"); 818 bb_simple_error_msg("bad rpc version");
819 goto parse_err; 819 goto parse_err;
820 } 820 }
821 sep->se_rpcver_lo = sep->se_rpcver_hi = n; 821 sep->se_rpcver_lo = sep->se_rpcver_hi = n;
@@ -829,7 +829,7 @@ static NOINLINE servtab_t *parse_one_line(void)
829 if (*p != '\0') 829 if (*p != '\0')
830 goto bad_ver_spec; 830 goto bad_ver_spec;
831#else 831#else
832 bb_error_msg("no support for rpc services"); 832 bb_simple_error_msg("no support for rpc services");
833 goto parse_err; 833 goto parse_err;
834#endif 834#endif
835 } 835 }
@@ -1235,7 +1235,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
1235 if (argv[0]) 1235 if (argv[0])
1236 config_filename = argv[0]; 1236 config_filename = argv[0];
1237 if (config_filename == NULL) 1237 if (config_filename == NULL)
1238 bb_error_msg_and_die("non-root must specify config file"); 1238 bb_simple_error_msg_and_die("non-root must specify config file");
1239 if (!(opt & 2)) 1239 if (!(opt & 2))
1240 bb_daemonize_or_rexec(0, argv - optind); 1240 bb_daemonize_or_rexec(0, argv - optind);
1241 else 1241 else
@@ -1304,7 +1304,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
1304 ready_fd_cnt = select(maxsock + 1, &readable, NULL, NULL, NULL); 1304 ready_fd_cnt = select(maxsock + 1, &readable, NULL, NULL, NULL);
1305 if (ready_fd_cnt < 0) { 1305 if (ready_fd_cnt < 0) {
1306 if (errno != EINTR) { 1306 if (errno != EINTR) {
1307 bb_perror_msg("select"); 1307 bb_simple_perror_msg("select");
1308 sleep(1); 1308 sleep(1);
1309 } 1309 }
1310 continue; 1310 continue;
@@ -1405,7 +1405,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
1405 pid = vfork(); 1405 pid = vfork();
1406 1406
1407 if (pid < 0) { /* fork error */ 1407 if (pid < 0) { /* fork error */
1408 bb_perror_msg("vfork"+1); 1408 bb_simple_perror_msg("vfork"+1);
1409 sleep(1); 1409 sleep(1);
1410 restore_sigmask(&omask); 1410 restore_sigmask(&omask);
1411 maybe_close(new_udp_fd); 1411 maybe_close(new_udp_fd);
@@ -1488,7 +1488,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
1488 } 1488 }
1489 if (real_uid != 0 && real_uid != pwd->pw_uid) { 1489 if (real_uid != 0 && real_uid != pwd->pw_uid) {
1490 /* a user running private inetd */ 1490 /* a user running private inetd */
1491 bb_error_msg("non-root must run services as himself"); 1491 bb_simple_error_msg("non-root must run services as himself");
1492 goto do_exit1; 1492 goto do_exit1;
1493 } 1493 }
1494 if (pwd->pw_uid != real_uid) { 1494 if (pwd->pw_uid != real_uid) {
@@ -1502,7 +1502,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
1502 } 1502 }
1503 if (rlim_ofile.rlim_cur != rlim_ofile_cur) 1503 if (rlim_ofile.rlim_cur != rlim_ofile_cur)
1504 if (setrlimit(RLIMIT_NOFILE, &rlim_ofile) < 0) 1504 if (setrlimit(RLIMIT_NOFILE, &rlim_ofile) < 0)
1505 bb_perror_msg("setrlimit"); 1505 bb_simple_perror_msg("setrlimit");
1506 1506
1507 /* closelog(); - WRONG. we are after vfork, 1507 /* closelog(); - WRONG. we are after vfork,
1508 * this may confuse syslog() internal state. 1508 * this may confuse syslog() internal state.