} 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;
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));
}
}
}
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:
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:
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) {