vol_id: do not fail if unable to drop privileges

[elogind.git] / extras / volume_id / vol_id.c

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index e17e7abb0c7eaa6bac3633e70136af2a3c33f543..38950ee85f408b6ae349a1a2924fba9a49eee431 100644 (file)
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -154,7 +154,6 @@ int main(int argc, char *argv[])
        int skip_raid = 0;
        int probe_all = 0;
        const char *node;
-       struct passwd *pw;
        int fd;
        const char *label, *uuid, *type, *type_version, *usage;
        int retval;
@@ -237,16 +236,15 @@ int main(int argc, char *argv[])
        dbg("BLKGETSIZE64=%llu", (unsigned long long)size);
 
        /* try to drop all privileges before reading disk content */
-       pw = getpwnam ("nobody");
-       if (pw != NULL && pw->pw_uid > 0 && pw->pw_gid > 0) {
-               dbg("dropping privileges to %u:%u",
-                   (unsigned int)pw->pw_uid, (unsigned int)pw->pw_gid);
-               if (setgroups(0, NULL) != 0 ||
-                   setgid(pw->pw_gid) != 0 ||
-                   setuid(pw->pw_uid) != 0) {
-                       fprintf(stderr, "error dropping privileges: %s\n", strerror(errno));
-                       rc = 3;
-                       goto exit;
+       if (getuid() == 0) {
+               struct passwd *pw;
+
+               pw = getpwnam("nobody");
+               if (pw != NULL && pw->pw_uid > 0 && pw->pw_gid > 0) {
+                       if (setgroups(0, NULL) != 0 ||
+                           setgid(pw->pw_gid) != 0 ||
+                           setuid(pw->pw_uid) != 0)
+                               info("unable to drop privileges: %s\n", strerror(errno));
                }
        }