mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
move passwd, shadow, group and gshadow path definitions to libbb.h
...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:
parent
e8d0a1450a
commit
ad3d72f082
@ -68,6 +68,19 @@
|
|||||||
# include <shadow.h>
|
# include <shadow.h>
|
||||||
# endif
|
# endif
|
||||||
#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__
|
#if defined __FreeBSD__ || defined __OpenBSD__
|
||||||
# include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
# include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
@ -1604,10 +1617,10 @@ extern const char bb_path_wtmp_file[];
|
|||||||
* get the list of currently mounted filesystems */
|
* 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_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_passwd_file _PATH_PASSWD
|
||||||
#define bb_path_shadow_file "/etc/shadow"
|
#define bb_path_group_file _PATH_GROUP
|
||||||
#define bb_path_gshadow_file "/etc/gshadow"
|
#define bb_path_shadow_file _PATH_SHADOW
|
||||||
#define bb_path_group_file "/etc/group"
|
#define bb_path_gshadow_file _PATH_GSHADOW
|
||||||
|
|
||||||
#define bb_path_motd_file "/etc/motd"
|
#define bb_path_motd_file "/etc/motd"
|
||||||
|
|
||||||
|
@ -37,11 +37,6 @@ struct spwd {
|
|||||||
unsigned long sp_flag; /* Reserved */
|
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 setspent bb_internal_setspent
|
||||||
#define endspent bb_internal_endspent
|
#define endspent bb_internal_endspent
|
||||||
#define getspent bb_internal_getspent
|
#define getspent bb_internal_getspent
|
||||||
|
@ -20,16 +20,6 @@
|
|||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
#include <assert.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. */
|
/* Sizes for statically allocated buffers. */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user