package/makedevs: use the rooted /etc/passwd and /etc/group
Currently, makedevs will query the host's /etc/passwd and /etc/group to resolve usernames and group names. This is inherently flawed, as we can never guarantee that the UIDs will be the same on the target as on the host, or even whether a particular user does exist on the host. This is because getpwnam() and getgrnam() will forcibly read the system's /etc/passwd and /etc/group, and there is no way to tell them to look anywhere else. However, we can use fgetpwent() and fgetgrent() instead, for which we can pass a FILE* stream to read from to get the entries. This means we must implement the scanning-loop ourselves, but fortunately, that's pretty trivial to do. [Peter: swap errno / return value check, use bb_perror_msg_and_die, code style] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
3f28a38e1a
commit
95dda394d9
@ -40,6 +40,8 @@ const char *bb_applet_name;
|
||||
uid_t recursive_uid;
|
||||
gid_t recursive_gid;
|
||||
unsigned int recursive_mode;
|
||||
#define PASSWD_PATH "etc/passwd" /* MUST be relative */
|
||||
#define GROUP_PATH "etc/group" /* MUST be relative */
|
||||
|
||||
void bb_verror_msg(const char *s, va_list p)
|
||||
{
|
||||
@ -255,10 +257,20 @@ char *bb_get_chomped_line_from_file(FILE *file)
|
||||
long my_getpwnam(const char *name)
|
||||
{
|
||||
struct passwd *myuser;
|
||||
FILE *stream;
|
||||
|
||||
myuser = getpwnam(name);
|
||||
if (myuser==NULL)
|
||||
bb_error_msg_and_die("unknown user name: %s", name);
|
||||
stream = bb_xfopen(PASSWD_PATH, "r");
|
||||
while(1) {
|
||||
errno = 0;
|
||||
myuser = fgetpwent(stream);
|
||||
if (myuser == NULL)
|
||||
bb_error_msg_and_die("unknown user name: %s", name);
|
||||
if (errno)
|
||||
bb_perror_msg_and_die("fgetpwent");
|
||||
if (!strcmp(name, myuser->pw_name))
|
||||
break;
|
||||
}
|
||||
fclose(stream);
|
||||
|
||||
return myuser->pw_uid;
|
||||
}
|
||||
@ -266,12 +278,22 @@ long my_getpwnam(const char *name)
|
||||
long my_getgrnam(const char *name)
|
||||
{
|
||||
struct group *mygroup;
|
||||
FILE *stream;
|
||||
|
||||
mygroup = getgrnam(name);
|
||||
if (mygroup==NULL)
|
||||
bb_error_msg_and_die("unknown group name: %s", name);
|
||||
stream = bb_xfopen(GROUP_PATH, "r");
|
||||
while(1) {
|
||||
errno = 0;
|
||||
mygroup = fgetgrent(stream);
|
||||
if (mygroup == NULL)
|
||||
bb_error_msg_and_die("unknown group name: %s", name);
|
||||
if (errno)
|
||||
bb_perror_msg_and_die("fgetgrent");
|
||||
if (!strcmp(name, mygroup->gr_name))
|
||||
break;
|
||||
}
|
||||
fclose(stream);
|
||||
|
||||
return (mygroup->gr_gid);
|
||||
return mygroup->gr_gid;
|
||||
}
|
||||
|
||||
unsigned long get_ug_id(const char *s, long (*my_getxxnam)(const char *))
|
||||
|
Loading…
Reference in New Issue
Block a user