diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/applets.src.h | 1 | ||||
-rw-r--r-- | include/libbb.h | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/applets.src.h b/include/applets.src.h index cb36628b5..b80c4f4e8 100644 --- a/include/applets.src.h +++ b/include/applets.src.h | |||
@@ -342,7 +342,6 @@ IF_BB_SYSCTL(APPLET(sysctl, BB_DIR_SBIN, BB_SUID_DROP)) | |||
342 | IF_SYSLOGD(APPLET(syslogd, BB_DIR_SBIN, BB_SUID_DROP)) | 342 | IF_SYSLOGD(APPLET(syslogd, BB_DIR_SBIN, BB_SUID_DROP)) |
343 | IF_TAC(APPLET_NOEXEC(tac, tac, BB_DIR_USR_BIN, BB_SUID_DROP, tac)) | 343 | IF_TAC(APPLET_NOEXEC(tac, tac, BB_DIR_USR_BIN, BB_SUID_DROP, tac)) |
344 | IF_TAIL(APPLET(tail, BB_DIR_USR_BIN, BB_SUID_DROP)) | 344 | IF_TAIL(APPLET(tail, BB_DIR_USR_BIN, BB_SUID_DROP)) |
345 | IF_TASKSET(APPLET(taskset, BB_DIR_USR_BIN, BB_SUID_DROP)) | ||
346 | /* IF_TC(APPLET(tc, BB_DIR_SBIN, BB_SUID_DROP)) */ | 345 | /* IF_TC(APPLET(tc, BB_DIR_SBIN, BB_SUID_DROP)) */ |
347 | IF_TCPSVD(APPLET_ODDNAME(tcpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, tcpsvd)) | 346 | IF_TCPSVD(APPLET_ODDNAME(tcpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, tcpsvd)) |
348 | IF_TEE(APPLET(tee, BB_DIR_USR_BIN, BB_SUID_DROP)) | 347 | IF_TEE(APPLET(tee, BB_DIR_USR_BIN, BB_SUID_DROP)) |
diff --git a/include/libbb.h b/include/libbb.h index f5ecc025f..21a56d78f 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -403,8 +403,8 @@ const char *bb_basename(const char *name) FAST_FUNC; | |||
403 | char *last_char_is(const char *s, int c) FAST_FUNC; | 403 | char *last_char_is(const char *s, int c) FAST_FUNC; |
404 | const char* endofname(const char *name) FAST_FUNC; | 404 | const char* endofname(const char *name) FAST_FUNC; |
405 | 405 | ||
406 | void ndelay_on(int fd) FAST_FUNC; | 406 | int ndelay_on(int fd) FAST_FUNC; |
407 | void ndelay_off(int fd) FAST_FUNC; | 407 | int ndelay_off(int fd) FAST_FUNC; |
408 | void close_on_exec_on(int fd) FAST_FUNC; | 408 | void close_on_exec_on(int fd) FAST_FUNC; |
409 | void xdup2(int, int) FAST_FUNC; | 409 | void xdup2(int, int) FAST_FUNC; |
410 | void xmove_fd(int, int) FAST_FUNC; | 410 | void xmove_fd(int, int) FAST_FUNC; |
@@ -1332,6 +1332,7 @@ int sd_listen_fds(void); | |||
1332 | #define SETUP_ENV_NO_CHDIR (1 << 4) | 1332 | #define SETUP_ENV_NO_CHDIR (1 << 4) |
1333 | void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC; | 1333 | void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC; |
1334 | void nuke_str(char *str) FAST_FUNC; | 1334 | void nuke_str(char *str) FAST_FUNC; |
1335 | int check_password(const struct passwd *pw, const char *plaintext) FAST_FUNC; | ||
1335 | int ask_and_check_password_extended(const struct passwd *pw, int timeout, const char *prompt) FAST_FUNC; | 1336 | int ask_and_check_password_extended(const struct passwd *pw, int timeout, const char *prompt) FAST_FUNC; |
1336 | int ask_and_check_password(const struct passwd *pw) FAST_FUNC; | 1337 | int ask_and_check_password(const struct passwd *pw) FAST_FUNC; |
1337 | /* Returns a malloced string */ | 1338 | /* Returns a malloced string */ |