randomtest fixes

[oweals/busybox.git] / include / shadow_.h

diff --git a/include/shadow_.h b/include/shadow_.h
index 634dfb466de14ba7d943d7a2a70b7b0929f5ecc6..de126ddecc5cab6f5cf5fefcd74275009e04a0df 100644 (file)
--- a/include/shadow_.h
+++ b/include/shadow_.h
@@ -19,31 +19,48 @@
 
 /* Declaration of types and functions for shadow password suite */
 
-#if !ENABLE_USE_BB_SHADOW
-#include <shadow.h>
-#else
+#ifndef BB_SHADOW_H
+#define BB_SHADOW_H 1
 
-#ifndef _SHADOW_H
-#define _SHADOW_H      1
-
-/* Paths to the user database files */
-#ifndef _PATH_SHADOW
-#define _PATH_SHADOW "/etc/shadow"
-#endif
+PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
 /* Structure of the password file */
 struct spwd {
        char *sp_namp;          /* Login name */
        char *sp_pwdp;          /* Encrypted password */
-       long int sp_lstchg;     /* Date of last change */
-       long int sp_min;        /* Minimum number of days between changes */
-       long int sp_max;        /* Maximum number of days between changes */
-       long int sp_warn;       /* Number of days to warn user to change the password */
-       long int sp_inact;      /* Number of days the account may be inactive */
-       long int sp_expire;     /* Number of days since 1970-01-01 until account expires */
-       unsigned long int sp_flag;      /* Reserved */
+       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
+#define _PATH_SHADOW "/etc/shadow"
+#endif
+
+#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. */
+
+#ifdef UNUSED_FOR_NOW
 /* Open database for reading */
 extern void setspent(void);
 
@@ -54,26 +71,28 @@ 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);
+#endif
 
-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,
+#ifdef UNUSED_FOR_NOW
+extern int sgetspent_r(const char *__string, struct spwd *__result_buf,
                        char *__buffer, size_t __buflen,
                        struct spwd **__result);
 
@@ -85,6 +104,8 @@ extern int lckpwdf(void);
 
 /* Unlock password file */
 extern int ulckpwdf(void);
+#endif
+
+POP_SAVED_FUNCTION_VISIBILITY
 
 #endif /* shadow.h */
-#endif