shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

[PATCH] don't lookup "root" in the userdb

Browse Source
This commit is contained in:
kay.sievers@vrfy.org 2005-03-10 02:46:26 +01:00 committed by Greg KH
parent 138068d690
commit 783272f045
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
udev_add.c
View File

@ -114,8 +114,8 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
char filename[PATH_SIZE];
char partitionname[PATH_SIZE];
struct name_entry *name_loop;
uid_t uid = 0;
gid_t gid = 0;
uid_t uid;
gid_t gid;
int tail;
int i;
@ -126,24 +126,30 @@ static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
if (strchr(udev->name, '/'))
create_path(filename);
if (udev->owner[0] != '\0') {
if (strcmp(udev->owner, "root") == 0)
uid = 0;
else {
char *endptr;
unsigned long id = strtoul(udev->owner, &endptr, 10);
unsigned long id;
id = strtoul(udev->owner, &endptr, 10);
if (endptr[0] == '\0')
uid = (uid_t) id;
else
uid = lookup_user(udev->owner);
}
if (udev->group[0] != '\0') {
if (strcmp(udev->group, "root") == 0)
gid = 0;
else {
char *endptr;
unsigned long id = strtoul(udev->group, &endptr, 10);
unsigned long id;
id = strtoul(udev->group, &endptr, 10);
if (endptr[0] == '\0')
gid = (gid_t) id;
else
gid = lookup_group(udev->group);
gid = lookup_user(udev->group);
}
if (!udev->test_run) {

4
udev_utils.c
View File

@ -85,8 +85,8 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
}
udev->mode = 0660;
strcpy(udev->owner, "0");
strcpy(udev->group, "0");
strcpy(udev->owner, "root");
strcpy(udev->group, "root");
return 0;
}