Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-05-28 21:41:30 +00:00
Code Issues Projects Releases Wiki Activity

move passwd, shadow, group and gshadow path definitions to libbb.h

Browse Source 
...and define them only if the used libc doesn't.

Signed-off-by: Tito Ragusa <farmatito@tiscali.it>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Tito Ragusa 2011-01-16 23:39:45 +01:00 committed by Denys Vlasenko
parent e8d0a1450a
commit ad3d72f082
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/libbb.h
View File

@ -68,6 +68,19 @@
# include <shadow.h>
# endif
#endif
/* Just in case libc doesn't define some of these... */
#ifndef _PATH_PASSWD
#define _PATH_PASSWD "/etc/passwd"
#endif
#ifndef _PATH_GROUP
#define _PATH_GROUP "/etc/group"
#endif
#ifndef _PATH_SHADOW
#define _PATH_SHADOW "/etc/shadow"
#endif
#ifndef _PATH_GSHADOW
#define _PATH_GSHADOW "/etc/gshadow"
#endif
#if defined __FreeBSD__ || defined __OpenBSD__
# include <netinet/in.h>
# include <arpa/inet.h>
@ -1604,10 +1617,10 @@ extern const char bb_path_wtmp_file[];
* get the list of currently mounted filesystems */
#define bb_path_mtab_file IF_FEATURE_MTAB_SUPPORT("/etc/mtab")IF_NOT_FEATURE_MTAB_SUPPORT("/proc/mounts")
#define bb_path_passwd_file "/etc/passwd"
#define bb_path_shadow_file "/etc/shadow"
#define bb_path_gshadow_file "/etc/gshadow"
#define bb_path_group_file "/etc/group"
#define bb_path_passwd_file _PATH_PASSWD
#define bb_path_group_file _PATH_GROUP
#define bb_path_shadow_file _PATH_SHADOW
#define bb_path_gshadow_file _PATH_GSHADOW
#define bb_path_motd_file "/etc/motd"

5
include/shadow_.h
View File

@ -37,11 +37,6 @@ 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
#define getspent bb_internal_getspent

10
libpwdgrp/pwd_grp.c
View File

@ -20,16 +20,6 @@
#include "libbb.h"
#include <assert.h>
#ifndef _PATH_SHADOW
#define _PATH_SHADOW "/etc/shadow"
#endif
#ifndef _PATH_PASSWD
#define _PATH_PASSWD "/etc/passwd"
#endif
#ifndef _PATH_GROUP
#define _PATH_GROUP "/etc/group"
#endif
/**********************************************************************/
/* Sizes for statically allocated buffers. */