fix build without shadow support

2 files changed, 39 insertions, 50 deletions

diff --git a/include/libbb.h b/include/libbb.h
index ece1c9d91..6948695e9 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -51,9 +51,7 @@
 
 #include "pwd_.h"
 #include "grp_.h"
-#if ENABLE_FEATURE_SHADOWPASSWDS
 #include "shadow_.h"
-#endif
 
 /* Try to pull in PATH_MAX */
 #include <limits.h>
diff --git a/include/shadow_.h b/include/shadow_.h
index 177ee5f93..634dfb466 100644
--- a/include/shadow_.h
+++ b/include/shadow_.h
@@ -17,83 +17,74 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-/* Declaration of types and functions for shadow password suite.  */
+/* Declaration of types and functions for shadow password suite */
 
-#if !defined CONFIG_USE_BB_SHADOW
+#if !ENABLE_USE_BB_SHADOW
 #include <shadow.h>
 #else
 
 #ifndef _SHADOW_H
 #define _SHADOW_H	1
 
-#include <stdio.h>
-
-/* Paths to the user database files.  */
+/* Paths to the user database files */
 #ifndef _PATH_SHADOW
-#define	_PATH_SHADOW	"/etc/shadow"
+#define _PATH_SHADOW "/etc/shadow"
 #endif
-#define	SHADOW _PATH_SHADOW
-
-
-/* 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.  */
-};
 
+/* 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 */
+};
 
-/* Open database for reading.  */
-extern void setspent (void);
+/* Open database for reading */
+extern void setspent(void);
 
-/* Close database.  */
-extern void endspent (void);
+/* Close database */
+extern void endspent(void);
 
-/* Get next entry from database, perhaps after opening the file.  */
-extern struct spwd *getspent (void);
+/* Get next entry from database, perhaps after opening the file */
+extern struct spwd *getspent(void);
 
-/* Get shadow entry matching NAME.  */
-extern struct spwd *getspnam (__const char *__name);
+/* Get shadow entry matching NAME */
+extern struct spwd *getspnam(__const char *__name);
 
-/* Read shadow entry from STRING.  */
-extern struct spwd *sgetspent (__const char *__string);
+/* Read shadow entry from STRING */
+extern struct spwd *sgetspent(__const char *__string);
 
-/* Read next shadow entry from STREAM.  */
-extern struct spwd *fgetspent (FILE *__stream);
+/* 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);
+/* Write line containing shadow password entry to 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,
+/* 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);
 
-extern int fgetspent_r (FILE *__stream, struct spwd *__result_buf,
+extern int fgetspent_r(FILE *__stream, struct spwd *__result_buf,
 			char *__buffer, size_t __buflen,
 			struct spwd **__result);
-/* Protect password file against multi writers.  */
-extern int lckpwdf (void);
+/* Protect password file against multi writers */
+extern int lckpwdf(void);
 
-/* Unlock password file.  */
-extern int ulckpwdf (void);
+/* Unlock password file */
+extern int ulckpwdf(void);
 
 #endif /* shadow.h */
 #endif