]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
common: have read_secret_from_file return negative error codes
authorJeff Layton <jlayton@redhat.com>
Tue, 20 Aug 2019 18:48:01 +0000 (14:48 -0400)
committerNathan Cutler <ncutler@suse.com>
Thu, 14 Nov 2019 16:22:31 +0000 (17:22 +0100)
Allow the caller to try to determine what happened.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 496aa3f91bc21c087db3268860563402095d596a)

src/common/secret.c

index 8f92fb0a7f01bce100e69c6f99be4369cbe55abe..83fcf10df51daec7c00e82a65e88096cf3840fb2 100644 (file)
@@ -31,13 +31,13 @@ int read_secret_from_file(const char *filename, char *secret, size_t max_len)
   fd = open(filename, O_RDONLY);
   if (fd < 0) {
     perror("unable to read secretfile");
-    return -1;
+    return -errno;
   }
   len = safe_read(fd, secret, max_len);
   if (len <= 0) {
     perror("unable to read secret from file");
     close(fd);
-    return -1;
+    return len ? len : -ENODATA;
   }
   end = secret;
   while (end < secret + len && *end && *end != '\n' && *end != '\r')