From: Jeff Layton <jlayton@redhat.com>
Date: Tue, 20 Aug 2019 18:48:01 +0000 (-0400)
Subject: common: have read_secret_from_file return negative error codes
X-Git-Tag: v15.1.0~1529^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=496aa3f91bc21c087db3268860563402095d596a;p=ceph.git

common: have read_secret_from_file return negative error codes

Allow the caller to try to determine what happened.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/src/common/secret.c b/src/common/secret.c
index 8f92fb0a7f01..83fcf10df51d 100644
--- a/src/common/secret.c
+++ b/src/common/secret.c
@@ -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')