emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
[Parts of this patch may overlap with my other two patches]
This commit is contained in:
Robert Griebl 2002-06-04 20:10:23 +00:00
parent c9aca4561d
commit ea1a63a201
12 changed files with 98 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debianutils/start_stop_daemon.c
View File

@ -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;

6
include/grp.h
View File

@ -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
{

5
include/pwd.h
View File

@ -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>

81
include/shadow.h Normal file
View File

@ -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 */

2
init/start_stop_daemon.c
View File

@ -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;

2
libbb/my_getgrgid.c
View File

@ -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 */

2
libbb/my_getgrnam.c
View File

@ -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 */

2
libbb/my_getpwnam.c
View File

@ -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 */

2
libbb/my_getpwnamegid.c
View File

@ -21,9 +21,9 @@
#include <stdio.h>
#include <string.h>
#include "libbb.h"
#include "pwd.h"
#include "grp.h"
#include "libbb.h"

2
libbb/my_getpwuid.c
View File

@ -21,9 +21,9 @@
#include <stdio.h>
#include <string.h>
#include "libbb.h"
#include "pwd.h"
#include "grp.h"
#include "libbb.h"

2
networking/netstat.c
View File

@ -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);

4
shell/ash.c
View File

@ -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)
{