X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-util.c;h=3d5eb7657c40b812e14b6a395e5e8a0629930710;hp=76d7270f66f73133550339c202b223ce3e9562eb;hb=977f6f4b3dfbdd32d7df5a774a4ed761d5d4b98f;hpb=aaff3d023f89522f56f7cd345b6849e1251a6a74

diff --git a/udev/udev-util.c b/udev/udev-util.c
index 76d7270f6..3d5eb7657 100644
--- a/udev/udev-util.c
+++ b/udev/udev-util.c
@@ -126,29 +126,33 @@ int util_unlink_secure(struct udev *udev, const char *filename)
 
 uid_t util_lookup_user(struct udev *udev, const char *user)
 {
+	char *endptr;
 	int buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
 	char buf[buflen];
 	struct passwd pwbuf;
 	struct passwd *pw;
-	uid_t uid = 0;
+	uid_t uid;
 
 	if (strcmp(user, "root") == 0)
 		return 0;
+	uid = strtoul(user, &endptr, 10);
+	if (endptr[0] == '\0')
+		return uid;
+
 	errno = 0;
 	getpwnam_r(user, &pwbuf, buf, buflen, &pw);
-	if (pw == NULL) {
-		if (errno == 0 || errno == ENOENT || errno == ESRCH)
-			err(udev, "specified user '%s' unknown\n", user);
-		else
-			err(udev, "error resolving user '%s': %m\n", user);
-	} else
-		uid = pw->pw_uid;
-
-	return uid;
+	if (pw != NULL)
+		return pw->pw_uid;
+	if (errno == 0 || errno == ENOENT || errno == ESRCH)
+		err(udev, "specified user '%s' unknown\n", user);
+	else
+		err(udev, "error resolving user '%s': %m\n", user);
+	return 0;
 }
 
 extern gid_t util_lookup_group(struct udev *udev, const char *group)
 {
+	char *endptr;
 	int buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
 	char buf[buflen];
 	struct group grbuf;
@@ -157,16 +161,19 @@ extern gid_t util_lookup_group(struct udev *udev, const char *group)
 
 	if (strcmp(group, "root") == 0)
 		return 0;
+	gid = strtoul(group, &endptr, 10);
+	if (endptr[0] == '\0')
+		return gid;
+
 	errno = 0;
 	getgrnam_r(group, &grbuf, buf, buflen, &gr);
-	if (gr == NULL) {
-		if (errno == 0 || errno == ENOENT || errno == ESRCH)
-			err(udev, "specified group '%s' unknown\n", group);
-		else
-			err(udev, "error resolving group '%s': %m\n", group);
-	} else
-		gid = gr->gr_gid;
-	return gid;
+	if (gr != NULL)
+		return gr->gr_gid;
+	if (errno == 0 || errno == ENOENT || errno == ESRCH)
+		err(udev, "specified group '%s' unknown\n", group);
+	else
+		err(udev, "error resolving group '%s': %m\n", group);
+	return 0;
 }
 
 /* handle "[<SUBSYSTEM>/<KERNEL>]<attribute>" format */
@@ -437,7 +444,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 			if (WEXITSTATUS(status) != 0)
 				err = -1;
 		} else {
-			err(udev, "'%s' abnormal exit\n", argv[0]);
+			err(udev, "'%s' abnormal exit\n", command);
 			err = -1;
 		}
 	}