diff options
author | Eric Andersen <andersen@codepoet.org> | 2003-07-03 10:07:04 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2003-07-03 10:07:04 +0000 |
commit | 9e48045e45df7e3e205575a4eb3dc39d634b05aa (patch) | |
tree | e8f993dffc34380fbcc54cc858c81da594bdb95b /include/libbb.h | |
parent | c48d49ad988a4163cff7f38ee4bd1f9886d0ed11 (diff) | |
download | busybox-w32-9e48045e45df7e3e205575a4eb3dc39d634b05aa.tar.gz busybox-w32-9e48045e45df7e3e205575a4eb3dc39d634b05aa.tar.bz2 busybox-w32-9e48045e45df7e3e205575a4eb3dc39d634b05aa.zip |
Patch from Russell Coker:
I've attached my latest SE Linux patch for busybox against the latest CVS
version of busybox.
Diffstat (limited to 'include/libbb.h')
-rw-r--r-- | include/libbb.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/include/libbb.h b/include/libbb.h index 7b3ac4b85..edb8a6ed4 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -39,6 +39,9 @@ | |||
39 | #include <features.h> | 39 | #include <features.h> |
40 | 40 | ||
41 | #include "config.h" | 41 | #include "config.h" |
42 | #ifdef CONFIG_SELINUX | ||
43 | #include <proc_secure.h> | ||
44 | #endif | ||
42 | 45 | ||
43 | #include "pwd_.h" | 46 | #include "pwd_.h" |
44 | #include "grp_.h" | 47 | #include "grp_.h" |
@@ -394,7 +397,11 @@ void bb_xasprintf(char **string_ptr, const char *format, ...) __attribute__ ((fo | |||
394 | 397 | ||
395 | #define FAIL_DELAY 3 | 398 | #define FAIL_DELAY 3 |
396 | extern void change_identity ( const struct passwd *pw ); | 399 | extern void change_identity ( const struct passwd *pw ); |
397 | extern void run_shell ( const char *shell, int loginshell, const char *command, const char **additional_args ); | 400 | extern void run_shell ( const char *shell, int loginshell, const char *command, const char **additional_args |
401 | #ifdef CONFIG_SELINUX | ||
402 | , security_id_t sid | ||
403 | #endif | ||
404 | ); | ||
398 | extern int run_parts(char **args, const unsigned char test_mode); | 405 | extern int run_parts(char **args, const unsigned char test_mode); |
399 | extern int restricted_shell ( const char *shell ); | 406 | extern int restricted_shell ( const char *shell ); |
400 | extern void setup_environment ( const char *shell, int loginshell, int changeenv, const struct passwd *pw ); | 407 | extern void setup_environment ( const char *shell, int loginshell, int changeenv, const struct passwd *pw ); |
@@ -425,7 +432,11 @@ typedef struct { | |||
425 | char short_cmd[16]; | 432 | char short_cmd[16]; |
426 | } procps_status_t; | 433 | } procps_status_t; |
427 | 434 | ||
428 | extern procps_status_t * procps_scan(int save_user_arg0); | 435 | extern procps_status_t * procps_scan(int save_user_arg0 |
436 | #ifdef CONFIG_SELINUX | ||
437 | , int use_selinux, security_id_t *sid | ||
438 | #endif | ||
439 | ); | ||
429 | extern unsigned short compare_string_array(const char *string_array[], const char *key); | 440 | extern unsigned short compare_string_array(const char *string_array[], const char *key); |
430 | 441 | ||
431 | extern int my_query_module(const char *name, int which, void **buf, size_t *bufsize, size_t *ret); | 442 | extern int my_query_module(const char *name, int which, void **buf, size_t *bufsize, size_t *ret); |