diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-09-26 10:35:55 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-09-26 10:35:55 +0000 |
commit | ee5dce336597c76d674b570ed2c85041d50b6339 (patch) | |
tree | cd7ea0e60aff3fa129899319446dd3cce7b3ae39 /include/libbb.h | |
parent | f1980f67d3b005090a31b7465d219e8ca19c5736 (diff) | |
download | busybox-w32-ee5dce336597c76d674b570ed2c85041d50b6339.tar.gz busybox-w32-ee5dce336597c76d674b570ed2c85041d50b6339.tar.bz2 busybox-w32-ee5dce336597c76d674b570ed2c85041d50b6339.zip |
libpwdgrp: make it coexist with <pwd.h>, <grp.h> and <shadow.h>.
allows to get rid of hacks in libbb.h (extra declaration of setgroups -
now it comes from grp.h as intended).
Diffstat (limited to 'include/libbb.h')
-rw-r--r-- | include/libbb.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/libbb.h b/include/libbb.h index 951ff2f1a..5b92574dd 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -69,21 +69,15 @@ | |||
69 | #include <dmalloc.h> | 69 | #include <dmalloc.h> |
70 | #endif | 70 | #endif |
71 | 71 | ||
72 | #if !ENABLE_USE_BB_PWD_GRP | 72 | #include <pwd.h> |
73 | # include <pwd.h> | 73 | #include <grp.h> |
74 | # include <grp.h> | ||
75 | #endif | ||
76 | #if ENABLE_FEATURE_SHADOWPASSWDS | 74 | #if ENABLE_FEATURE_SHADOWPASSWDS |
77 | # if !ENABLE_USE_BB_SHADOW | 75 | # include <shadow.h> |
78 | # include <shadow.h> | ||
79 | # endif | ||
80 | #endif | 76 | #endif |
81 | 77 | ||
82 | /* Some libc's forget to declare these, do it ourself */ | 78 | /* Some libc's forget to declare these, do it ourself */ |
83 | 79 | ||
84 | extern char **environ; | 80 | extern char **environ; |
85 | /* Set the group set for the current user to GROUPS (N of them). */ | ||
86 | int setgroups(size_t n, const gid_t *groups); | ||
87 | #if defined(__GLIBC__) && __GLIBC__ < 2 | 81 | #if defined(__GLIBC__) && __GLIBC__ < 2 |
88 | int vdprintf(int d, const char *format, va_list ap); | 82 | int vdprintf(int d, const char *format, va_list ap); |
89 | #endif | 83 | #endif |