[PATCH v4 7/8] vpn: Make sure we got an agent before asking user

Jukka Rissanen jukka.rissanen at linux.intel.com
Tue Sep 10 06:22:38 PDT 2013


---
 vpn/plugins/l2tp.c        | 2 +-
 vpn/plugins/openconnect.c | 2 +-
 vpn/plugins/pptp.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vpn/plugins/l2tp.c b/vpn/plugins/l2tp.c
index 3fa39d7..f07055c 100644
--- a/vpn/plugins/l2tp.c
+++ b/vpn/plugins/l2tp.c
@@ -574,7 +574,7 @@ static int request_input(struct vpn_provider *provider,
 
 	agent = connman_agent_get_info(dbus_sender, &agent_sender,
 							&agent_path);
-	if (!provider || !agent_path || !callback)
+	if (!provider || !agent || !agent_path || !callback)
 		return -ESRCH;
 
 	message = dbus_message_new_method_call(agent_sender, agent_path,
diff --git a/vpn/plugins/openconnect.c b/vpn/plugins/openconnect.c
index a19dba9..2b732ae 100644
--- a/vpn/plugins/openconnect.c
+++ b/vpn/plugins/openconnect.c
@@ -405,7 +405,7 @@ static int request_cookie_input(struct vpn_provider *provider,
 
 	agent = connman_agent_get_info(dbus_sender, &agent_sender,
 							&agent_path);
-	if (!provider || !agent_path)
+	if (!provider || !agent || !agent_path)
 		return -ESRCH;
 
 	message = dbus_message_new_method_call(agent_sender, agent_path,
diff --git a/vpn/plugins/pptp.c b/vpn/plugins/pptp.c
index 3ea4414..c8b75c7 100644
--- a/vpn/plugins/pptp.c
+++ b/vpn/plugins/pptp.c
@@ -366,7 +366,7 @@ static int request_input(struct vpn_provider *provider,
 
 	agent = connman_agent_get_info(dbus_sender, &agent_sender,
 							&agent_path);
-	if (!provider || !agent_path || !callback)
+	if (!provider || !agent || !agent_path || !callback)
 		return -ESRCH;
 
 	message = dbus_message_new_method_call(agent_sender, agent_path,
-- 
1.7.11.7




More information about the connman mailing list