Fix for broken handling off BusyBox's own pwd/grp implementations

[Parts of this patch may overlap with my other two patches]

12 files changed, 98 insertions, 14 deletions

diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index ed4503caf..29e3d8673 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -16,9 +16,9 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <unistd.h>
-#include "pwd.h"
 
 #include "busybox.h"
+#include "pwd.h"
 
 static int start = 0;
 static int stop = 0;
diff --git a/include/grp.h b/include/grp.h
index 191c2d4e5..12fecd02e 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -1,14 +1,16 @@
 #ifndef __CONFIG_GRP_H
 #define __CONFIG_GRP_H
 
-#if defined USE_SYSTEM_PWD_GRP
-#include <grp.h>
+#if !defined CONFIG_USE_BB_PWD_GRP
+#include_next <grp.h>
+
 #else
 
 #include <sys/types.h>
 #include <features.h>
 #include <stdio.h>
 
+
 /* The group structure */
 struct group
 {
diff --git a/include/pwd.h b/include/pwd.h
index 2fd0ab06e..178e9e97a 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -1,8 +1,9 @@
 #ifndef __CONFIG_PWD_H
 #define __CONFIG_PWD_H
 
-#if defined USE_SYSTEM_PWD_GRP
-#include <pwd.h>
+#if !defined CONFIG_USE_BB_PWD_GRP
+#include_next <pwd.h>
+
 #else
 
 #include <sys/types.h>
diff --git a/include/shadow.h b/include/shadow.h
new file mode 100644
index 000000000..44e4b5878
--- /dev/null
+++ b/include/shadow.h
@@ -0,0 +1,81 @@
+/*
+ * Copyright 1988 - 1994, Julianne Frances Haugh <jockgrrl@austin.rr.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Julianne F. Haugh nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef __CONFIG_SHADOW_H
+#define __CONFIG_SHADOW_H
+
+#if !defined CONFIG_USE_BB_SHADOW
+#include_next <shadow.h>
+
+#else
+
+/*
+ * This information is not derived from AT&T licensed sources.  Posted
+ * to the USENET 11/88, and updated 11/90 with information from SVR4.
+ *
+ *      $Id: shadow.h,v 1.1 2002/06/04 20:10:10 sandman Exp $
+ */
+
+typedef long sptime;
+
+/*
+ * Shadow password security file structure.
+ */
+
+struct spwd {
+        char *sp_namp;                          /* login name */
+        char *sp_pwdp;                          /* encrypted password */
+        sptime sp_lstchg;                       /* date of last change */
+        sptime sp_min;                          /* minimum number of days between changes */
+        sptime sp_max;                          /* maximum number of days between changes */
+        sptime sp_warn;                         /* number of days of warning before password
+                                                                   expires */
+        sptime sp_inact;                        /* number of days after password expires
+                                                                   until the account becomes unusable. */
+        sptime sp_expire;                       /* days since 1/1/70 until account expires */
+        unsigned long sp_flag;          /* reserved for future use */
+};
+
+/*
+ * Shadow password security file functions.
+ */
+
+#include <stdio.h>                              /* for FILE */
+
+struct spwd *getspent(void);
+struct spwd *sgetspent(const char *);
+struct spwd *fgetspent(FILE *);
+void setspent(void);
+void endspent(void);
+int putspent(const struct spwd *, FILE *);
+struct spwd *getspnam(const char *name);
+
+#endif                                                  /* CONFIG_USE_BB_SHADOW */
+
+#endif                                                  /* __CONFIG_SHADOW_H */
diff --git a/init/start_stop_daemon.c b/init/start_stop_daemon.c
index ed4503caf..29e3d8673 100644
--- a/init/start_stop_daemon.c
+++ b/init/start_stop_daemon.c
@@ -16,9 +16,9 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <unistd.h>
-#include "pwd.h"
 
 #include "busybox.h"
+#include "pwd.h"
 
 static int start = 0;
 static int stop = 0;
diff --git a/libbb/my_getgrgid.c b/libbb/my_getgrgid.c
index 27b671922..bf2067e46 100644
--- a/libbb/my_getgrgid.c
+++ b/libbb/my_getgrgid.c
@@ -21,9 +21,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "libbb.h"
 #include "pwd.h"
 #include "grp.h"
-#include "libbb.h"
 
 
 /* gets a groupname given a gid */
diff --git a/libbb/my_getgrnam.c b/libbb/my_getgrnam.c
index dbacf5192..f21d482c6 100644
--- a/libbb/my_getgrnam.c
+++ b/libbb/my_getgrnam.c
@@ -21,9 +21,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "libbb.h"
 #include "pwd.h"
 #include "grp.h"
-#include "libbb.h"
 
 
 /* returns a gid given a group name */
diff --git a/libbb/my_getpwnam.c b/libbb/my_getpwnam.c
index 90277040e..db7f4a65f 100644
--- a/libbb/my_getpwnam.c
+++ b/libbb/my_getpwnam.c
@@ -21,9 +21,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "libbb.h"
 #include "pwd.h"
 #include "grp.h"
-#include "libbb.h"
 
 
 /* returns a uid given a username */
diff --git a/libbb/my_getpwnamegid.c b/libbb/my_getpwnamegid.c
index 9c45580b5..4866b9717 100644
--- a/libbb/my_getpwnamegid.c
+++ b/libbb/my_getpwnamegid.c
@@ -21,9 +21,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "libbb.h"
 #include "pwd.h"
 #include "grp.h"
-#include "libbb.h"
 
 
 
diff --git a/libbb/my_getpwuid.c b/libbb/my_getpwuid.c
index 49bc8fb49..5236c7df3 100644
--- a/libbb/my_getpwuid.c
+++ b/libbb/my_getpwuid.c
@@ -21,9 +21,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "libbb.h"
 #include "pwd.h"
 #include "grp.h"
-#include "libbb.h"
 
 
 
diff --git a/networking/netstat.c b/networking/netstat.c
index b083b0dd4..6e7cc5e7b 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -29,9 +29,9 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <unistd.h>
-#include <pwd.h>
 #include "inet_common.h"
 #include "busybox.h"
+#include "pwd.h"
 
 #ifdef CONFIG_ROUTE
 extern void displayroutes(int noresolve, int netstatfmt);
diff --git a/shell/ash.c b/shell/ash.c
index f3b641d53..d834cc02a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -68,6 +68,7 @@
 #include <sys/times.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include "busybox.h"
 #include "pwd.h"
 
 
@@ -82,7 +83,6 @@
 #include <termios.h>
 #endif
 
-#include "busybox.h"
 #include "cmdedit.h"
 
 /*
@@ -12442,7 +12442,7 @@ findvar(struct var **vpp, const char *name)
 /*
  * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
  * This file contains code for the times builtin.
- * $Id: ash.c,v 1.50 2002/05/14 23:22:06 sandman Exp $
+ * $Id: ash.c,v 1.51 2002/06/04 20:10:15 sandman Exp $
  */
 static int timescmd (int argc, char **argv)
 {