From: hyunuktak <hyunuk.tak@samsung.com>
Date: Tue, 5 Jul 2016 06:08:44 +0000 (+0900)
Subject: Fixed some issues
X-Git-Tag: accepted/tizen/common/20160705.170548^0
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fconnman.git;a=commitdiff_plain;h=36491bda01888633c150676417a7e9de7686a795

Fixed some issues

Removed to set autoconnect when 4way handshake failed
Release passphrase of service when indicate error occurred for invalid
key

Change-Id: Id748ddcd21ad896f0d8e91ce4711a4c9c0df6d96
Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>
---

diff --git a/packaging/connman.spec b/packaging/connman.spec
index d0b2b2c..e2ef631 100755
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -4,7 +4,7 @@
 
 Name:           connman
 Version:        1.29
-Release:        13
+Release:        14
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net
diff --git a/plugins/wifi.c b/plugins/wifi.c
index cc5f242..4050bce 100755
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -2509,11 +2509,6 @@ static bool handle_4way_handshake_failure(GSupplicantInterface *interface,
 	wifi->retries = 0;
 	connman_network_set_error(network, CONNMAN_NETWORK_ERROR_INVALID_KEY);
 
-#if defined TIZEN_EXT
-	/* not retry autoconnect in case of invalid-key error */
-	__connman_service_set_autoconnect(service, false);
-#endif
-
 	return false;
 }
 
diff --git a/src/connman.h b/src/connman.h
index e3296a7..56f9dd9 100755
--- a/src/connman.h
+++ b/src/connman.h
@@ -699,8 +699,6 @@ bool __connman_service_wps_enabled(struct connman_service *service);
 #if defined TIZEN_EXT
 void __connman_service_set_storage_reload(struct connman_service *service,
 						bool storage_reload);
-void __connman_service_set_autoconnect(struct connman_service *service,
-						bool autoconnect);
 #endif
 int __connman_service_set_favorite(struct connman_service *service,
 						bool favorite);
diff --git a/src/service.c b/src/service.c
index 69fefe7..f77f033 100755
--- a/src/service.c
+++ b/src/service.c
@@ -5930,21 +5930,6 @@ void __connman_service_set_search_domains(struct connman_service *service,
 	searchdomain_add_all(service);
 }
 
-#if defined TIZEN_EXT
-void __connman_service_set_autoconnect(struct connman_service *service,
-						bool autoconnect)
-{
-	if (service == NULL)
-		return;
-
-	if (service->autoconnect != autoconnect) {
-		DBG("updated autoconnect flag (%d)", autoconnect);
-		service->autoconnect = autoconnect;
-		service_save(service);
-	}
-}
-#endif
-
 static void service_complete(struct connman_service *service)
 {
 	reply_pending(service, EIO);
@@ -6647,6 +6632,11 @@ int __connman_service_indicate_error(struct connman_service *service,
 				service->error == CONNMAN_SERVICE_ERROR_CONNECT_FAILED)
 			__connman_service_disconnect_default(service);
 
+		if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
+				service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY) {
+			g_free(service->passphrase);
+			service->passphrase = NULL;
+		}
 #endif
 
 	__connman_service_ipconfig_indicate_state(service,