52a426744
Mike Frysinger
2009-07-09
Subject
restore shadow.h independence
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/libbb.h+6 -1
| @@ -76,7 +76,12 @@ | |
| #include <pwd.h> | |
| #include <grp.h> | |
| #if ENABLE_FEATURE_SHADOWPASSWDS | |
| - | # include <shadow.h> |
| + | # if !ENABLE_USE_BB_SHADOW |
| + | /* If using busybox's shadow implementation, do not include the shadow.h |
| + | * header as the toolchain may not provide it at all. |
| + | */ |
| + | # include <shadow.h> |
| + | # endif |
| #endif | |
| /* Some libc's forget to declare these, do it ourself */ | |
include/shadow_.h+12 -4
| @@ -24,10 +24,18 @@ | |
| PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN | |
| - | /* This file is #included after #include <shadow.h> |
| - | * We will use libc-defined structures, but will #define function names |
| - | * so that function calls are directed to bb_internal_XXX replacements |
| - | */ |
| + | /* Structure of the password file */ |
| + | struct spwd { |
| + | char *sp_namp; /* Login name */ |
| + | char *sp_pwdp; /* Encrypted password */ |
| + | long sp_lstchg; /* Date of last change */ |
| + | long sp_min; /* Minimum number of days between changes */ |
| + | long sp_max; /* Maximum number of days between changes */ |
| + | long sp_warn; /* Number of days to warn user to change the password */ |
| + | long sp_inact; /* Number of days the account may be inactive */ |
| + | long sp_expire; /* Number of days since 1970-01-01 until account expires */ |
| + | unsigned long sp_flag; /* Reserved */ |
| + | }; |
| /* Paths to the user database files */ | |
| #ifndef _PATH_SHADOW | |