Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/include/shadow_.h

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/include/shadow_.h (modified) (6 diffs)

branches/2.2.9/mindi-busybox/include/shadow_.h

@@ -20 +20 @@
 /* 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 */
@@ -47 +38 @@
 };
 
+/* Paths to the user database files */
+#ifndef _PATH_SHADOW
+#define _PATH_SHADOW "/etc/shadow"
+#endif
 
 #define setspent    bb_internal_setspent
@@ -64 +59 @@
 
 /* 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. */
 
-
+#ifdef UNUSED_FOR_NOW
 /* Open database for reading */
 extern void setspent(void);
@@ -79 +72 @@
 
 /* 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 */
@@ -88 +81 @@
 
 /* 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);
@@ -110 +105 @@
 /* Unlock password file */
 extern int ulckpwdf(void);
+#endif
+
+POP_SAVED_FUNCTION_VISIBILITY
 
 #endif /* shadow.h */
-#endif