agent: Return -EINPROGRESS when request passphrase calls an agent

As a result of returning -EINPROGRESS, the code in service.c can be
simplified.

diff --git a/src/agent.c b/src/agent.c
index cca9ebc..a9c2a33 100644 (file)
--- a/src/agent.c
+++ b/src/agent.c
@@ -480,7 +480,7 @@ int __connman_agent_request_passphrase_input(struct connman_service *service,
 
        dbus_message_unref(message);
 
-       return -EIO;
+       return -EINPROGRESS;
 }
 
 int __connman_agent_request_login_input(struct connman_service *service,

diff --git a/src/service.c b/src/service.c
index 01e01f2..caecc22 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -5260,10 +5260,8 @@ int __connman_service_connect(struct connman_service *service)
 
        if (service->userconnect == TRUE) {
                if (err == -ENOKEY || err == -EPERM) {
-                       if (__connman_agent_request_passphrase_input(service,
-                                                       request_input_cb,
-                                                       NULL) == -EIO)
-                               return -EINPROGRESS;
+                       return __connman_agent_request_passphrase_input(service,
+                                       request_input_cb, NULL);
                }
                reply_pending(service, -err);
        }