Merge pull request #34548 from SimonPilkington/fix-creds-cat

creds: fix cat with encrypted credentials
2024-09-27 20:51:57 +02:00
parent e996663475 bb322e4340
commit 6fd58537e5
3 changed files with 13 additions and 4 deletions
@@ -434,10 +434,14 @@ static int verb_cat(int argc, char **argv, void *userdata) {
                        if (!d) /* Not set */
                                continue;

+                        ReadFullFileFlags flags = READ_FULL_FILE_SECURE|READ_FULL_FILE_WARN_WORLD_READABLE;
+                        if (encrypted)
+                                flags |= READ_FULL_FILE_UNBASE64;
+
                        r = read_full_file_full(
                                        dirfd(d), *cn,
                                        UINT64_MAX, SIZE_MAX,
-                                        READ_FULL_FILE_SECURE|READ_FULL_FILE_WARN_WORLD_READABLE,
+                                        flags,
                                        NULL,
                                        (char**) &data, &size);
                        if (r == -ENOENT) /* Not found */