From cb04ff5c68c1363837d8cd9f2170bdf64625b872 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 30 Dec 2006 21:11:57 +0000 Subject: fixdep.c: avoit doing memcmp in most cases uidgid_get.c: add forgotten copyright notice pwd/grp/shadow: avoid collisions with libc names --- include/shadow_.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'include/shadow_.h') diff --git a/include/shadow_.h b/include/shadow_.h index 634dfb4..fb2153c 100644 --- a/include/shadow_.h +++ b/include/shadow_.h @@ -20,11 +20,13 @@ /* Declaration of types and functions for shadow password suite */ #if !ENABLE_USE_BB_SHADOW + #include + #else #ifndef _SHADOW_H -#define _SHADOW_H 1 +#define _SHADOW_H 1 /* Paths to the user database files */ #ifndef _PATH_SHADOW @@ -44,6 +46,28 @@ struct spwd { unsigned long int sp_flag; /* Reserved */ }; + +#define setspent bb_internal_setspent +#define endspent bb_internal_endspent +#define getspent bb_internal_getspent +#define getspnam bb_internal_getspnam +#define sgetspent bb_internal_sgetspent +#define fgetspent bb_internal_fgetspent +#define putspent bb_internal_putspent +#define getspent_r bb_internal_getspent_r +#define getspnam_r bb_internal_getspnam_r +#define sgetspent_r bb_internal_sgetspent_r +#define fgetspent_r bb_internal_fgetspent_r +#define lckpwdf bb_internal_lckpwdf +#define ulckpwdf bb_internal_ulckpwdf + + +/* 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 */ + + /* Open database for reading */ extern void setspent(void); -- cgit v1.1