From 3a6be99b027bf984428e12f2014845ca1541d876 Mon Sep 17 00:00:00 2001
From: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Date: Fri, 14 May 2010 14:41:00 -0300
Subject: [PATCH] obexd: Fix sending the wrong response code

When the backend implementation is not able to find the vCard we must
return the -ENOENT error, which is translated to the Not Found OBEX
response.
---
 obexd/plugins/phonebook-dummy.c   | 6 +++---
 obexd/plugins/phonebook-ebook.c   | 6 +++---
 obexd/plugins/phonebook-tracker.c | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/obexd/plugins/phonebook-dummy.c b/obexd/plugins/phonebook-dummy.c
index 019b797ef..b63b876d0 100644
--- a/obexd/plugins/phonebook-dummy.c
+++ b/obexd/plugins/phonebook-dummy.c
@@ -431,7 +431,7 @@ done:
 	if (!is_dir(absolute)) {
 		g_free(relative);
 		relative = NULL;
-		ret = -EBADR;
+		ret = -ENOENT;
 	}
 
 	g_free(absolute);
@@ -465,7 +465,7 @@ int phonebook_pull(const char *name, const struct apparam_field *params,
 	g_free(filename);
 	if (!is_dir(folder)) {
 		g_free(folder);
-		return -EBADR;
+		return -ENOENT;
 	}
 
 	dummy = g_new0(struct dummy_data, 1);
@@ -494,7 +494,7 @@ int phonebook_get_entry(const char *folder, const char *id,
 	if (fd < 0) {
 		int err = errno;
 		debug("open(): %s(%d)", strerror(err), err);
-		return -EBADR;
+		return -ENOENT;
 	}
 
 	dummy = g_new0(struct dummy_data, 1);
diff --git a/obexd/plugins/phonebook-ebook.c b/obexd/plugins/phonebook-ebook.c
index c3c22a2cc..4111b45a2 100644
--- a/obexd/plugins/phonebook-ebook.c
+++ b/obexd/plugins/phonebook-ebook.c
@@ -334,7 +334,7 @@ char *phonebook_set_folder(const char *current_folder,
 				strcmp("/telecom/pb", fullname) != 0) {
 			g_free(fullname);
 			fullname = NULL;
-			ret = -EBADR;
+			ret = -ENOENT;
 		}
 
 		break;
@@ -374,7 +374,7 @@ char *phonebook_set_folder(const char *current_folder,
 				strcmp(fullname, "/telecom/pb") != 0) {
 			g_free(fullname);
 			fullname = NULL;
-			ret = -EBADR;
+			ret = -ENOENT;
 		}
 
 		g_free(base);
@@ -425,7 +425,7 @@ int phonebook_get_entry(const char *folder, const char *id,
 
 	if (e_book_async_get_contact(ebook, id, ebook_entry_cb, data)) {
 		g_free(data);
-		return -EPERM;
+		return -ENOENT;
 	}
 
 	return 0;
diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c
index c8ae03b5c..cfb350e0f 100644
--- a/obexd/plugins/phonebook-tracker.c
+++ b/obexd/plugins/phonebook-tracker.c
@@ -614,7 +614,7 @@ done:
 	if (!folder_is_valid(path)) {
 		g_free(path);
 		path = NULL;
-		ret = -EBADR;
+		ret = -ENOENT;
 	} else
 		ret = 0;
 
-- 
2.47.3