volume_id: fix linux_raid metadata version 1.0 detection

[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 cb1d455891a906341af0495895518f1ca854b0e0..38950ee85f408b6ae349a1a2924fba9a49eee431 100644 (file)
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -147,13 +147,13 @@ int main(int argc, char *argv[])
        } print = PRINT_EXPORT;
 
        struct volume_id *vid = NULL;
-       char label_safe[128];
-       char uuid_safe[128];
+       char label_safe[256];
+       char label_enc[256];
+       char uuid_enc[256];
        uint64_t size;
        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;
@@ -236,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));
                }
        }
 
@@ -274,9 +273,10 @@ int main(int argc, char *argv[])
        }
 
        set_str(label_safe, label, sizeof(label_safe));
-       replace_untrusted_chars(label_safe);
-       set_str(uuid_safe, uuid, sizeof(uuid_safe));
-       replace_untrusted_chars(uuid_safe);
+       replace_chars(label_safe, ALLOWED_CHARS_INPUT);
+
+       volume_id_encode_string(label, label_enc, sizeof(label_enc));
+       volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc));
 
        switch (print) {
        case PRINT_EXPORT:
@@ -284,8 +284,9 @@ int main(int argc, char *argv[])
                printf("ID_FS_TYPE=%s\n", type);
                printf("ID_FS_VERSION=%s\n", type_version);
                printf("ID_FS_UUID=%s\n", uuid);
-               printf("ID_FS_UUID_SAFE=%s\n", uuid_safe);
+               printf("ID_FS_UUID_ENC=%s\n", uuid_enc);
                printf("ID_FS_LABEL=%s\n", label);
+               printf("ID_FS_LABEL_ENC=%s\n", label_enc);
                printf("ID_FS_LABEL_SAFE=%s\n", label_safe);
                break;
        case PRINT_TYPE:
@@ -299,11 +300,11 @@ int main(int argc, char *argv[])
                printf("%s\n", label_safe);
                break;
        case PRINT_UUID:
-               if (uuid_safe[0] == '\0' || strcmp(usage, "raid") == 0) {
+               if (uuid_enc[0] == '\0' || strcmp(usage, "raid") == 0) {
                        rc = 4;
                        goto exit;
                }
-               printf("%s\n", uuid_safe);
+               printf("%s\n", uuid_enc);
                break;
        case PRINT_LABEL_RAW:
                if (label[0] == '\0' || strcmp(usage, "raid") == 0) {