emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpwdgrp: make it coexist with <pwd.h>, <grp.h> and <shadow.h>.

Browse Source 
allows to get rid of hacks in libbb.h (extra declaration of setgroups -
 now it comes from grp.h as intended).
This commit is contained in:
Denis Vlasenko
2008-09-26 10:35:55 +00:00
parent f1980f67d3
commit ee5dce3365
6 changed files with 44 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/shadow_.h
View File

@@ -19,32 +19,23 @@
/* Declaration of types and functions for shadow password suite */
#ifndef _SHADOW_H
#define _SHADOW_H 1
#ifndef BB_SHADOW_H
#define BB_SHADOW_H 1
#if __GNUC_PREREQ(4,1)
# pragma GCC visibility push(hidden)
#endif
/* This file is #included after #include <shadow.h>
* We will use libc-defined structures, but will #define finction names
* so that function calls are directed to bb_internal_XXX replacements
*/
/* Paths to the user database files */
#ifndef _PATH_SHADOW
#define _PATH_SHADOW "/etc/shadow"
#endif
/* 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 */
};
#define setspent bb_internal_setspent
#define endspent bb_internal_endspent
#define getspent bb_internal_getspent
@@ -61,9 +52,7 @@ struct spwd {
/* All function names below should be remapped by #defines above
* in order to not collide with libc names.
* In theory it isn't necessary, but I saw weird interactions at link time.
* Let's play safe */
* in order to not collide with libc names. */
/* Open database for reading */
@@ -76,26 +65,26 @@ extern void endspent(void);
extern struct spwd *getspent(void);
/* Get shadow entry matching NAME */
extern struct spwd *getspnam(__const char *__name);
extern struct spwd *getspnam(const char *__name);
/* Read shadow entry from STRING */
extern struct spwd *sgetspent(__const char *__string);
extern struct spwd *sgetspent(const char *__string);
/* Read next shadow entry from STREAM */
extern struct spwd *fgetspent(FILE *__stream);
/* Write line containing shadow password entry to stream */
extern int putspent(__const struct spwd *__p, FILE *__stream);
extern int putspent(const struct spwd *__p, FILE *__stream);
/* Reentrant versions of some of the functions above */
extern int getspent_r(struct spwd *__result_buf, char *__buffer,
size_t __buflen, struct spwd **__result);
extern int getspnam_r(__const char *__name, struct spwd *__result_buf,
extern int getspnam_r(const char *__name, struct spwd *__result_buf,
char *__buffer, size_t __buflen,
struct spwd **__result);
extern int sgetspent_r(__const char *__string, struct spwd *__result_buf,
extern int sgetspent_r(const char *__string, struct spwd *__result_buf,
char *__buffer, size_t __buflen,
struct spwd **__result);