From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 13 Jan 2016 12:22:22 +0000 (+0200)
Subject: lib-imap-storage: imap_metadata_get*() returned 1 also when value wasn't found.
X-Git-Tag: 2.2.22.rc1~364
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bffa23c1beaa139d63ae033f9c1da5de05281565;p=thirdparty%2Fdovecot%2Fcore.git

lib-imap-storage: imap_metadata_get*() returned 1 also when value wasn't found.
---

diff --git a/src/lib-imap-storage/imap-metadata.c b/src/lib-imap-storage/imap-metadata.c
index 0128c6caaf..15330f9b36 100644
--- a/src/lib-imap-storage/imap-metadata.c
+++ b/src/lib-imap-storage/imap-metadata.c
@@ -164,9 +164,7 @@ int imap_metadata_get(struct imap_metadata_transaction *imtrans,
 		return 0;
 	if (imap_metadata_get_mailbox_transaction(imtrans) < 0)
 		return -1;
-	if (mailbox_attribute_get(imtrans->trans, type, key, value_r) < 0)
-		return -1;
-	return 1;
+	return mailbox_attribute_get(imtrans->trans, type, key, value_r);
 }
 
 int imap_metadata_get_stream(struct imap_metadata_transaction *imtrans,
@@ -180,9 +178,7 @@ int imap_metadata_get_stream(struct imap_metadata_transaction *imtrans,
 		return 0;
 	if (imap_metadata_get_mailbox_transaction(imtrans) < 0)
 		return -1;
-	if (mailbox_attribute_get_stream(imtrans->trans, type, key, value_r) < 0)
-		return -1;
-	return 1;
+	return mailbox_attribute_get_stream(imtrans->trans, type, key, value_r);
 }
 
 struct imap_metadata_iter {