X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fshadow_.h;h=98bd45d044f451927110ae35b06f8177a85dc77d;hb=db67a20595be279e7db9f5f8e27bd94534efb8d4;hp=92bcde86446075ffa3e4632b1da106eb8ddb9140;hpb=87468857f685863cd763ae361c2cb3be0ee53a68;p=oweals%2Fbusybox.git

diff --git a/include/shadow_.h b/include/shadow_.h
index 92bcde864..98bd45d04 100644
--- a/include/shadow_.h
+++ b/include/shadow_.h
@@ -19,19 +19,10 @@
 
 /* Declaration of types and functions for shadow password suite */
 
-#if !ENABLE_USE_BB_SHADOW
+#ifndef BB_SHADOW_H
+#define BB_SHADOW_H 1
 
-#include <shadow.h>
-
-#else
-
-#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 {
@@ -46,6 +37,10 @@ struct spwd {
 	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
@@ -63,9 +58,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 */
@@ -78,26 +71,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);
 
@@ -110,5 +103,6 @@ extern int lckpwdf(void);
 /* Unlock password file */
 extern int ulckpwdf(void);
 
+POP_SAVED_FUNCTION_VISIBILITY
+
 #endif /* shadow.h */
-#endif