diff options
| -rw-r--r-- | gsupplicant/supplicant.c | 6 | ||||
| -rw-r--r-- | packaging/connman.spec | 8 | ||||
| -rwxr-xr-x | plugins/bluetooth.c | 2 | ||||
| -rw-r--r-- | src/connman.conf | 6 |
4 files changed, 14 insertions, 8 deletions
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index 4f6957b9..83acfc58 100644 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -5364,7 +5364,7 @@ static void interface_select_network_result(const char *error, #if defined TIZEN_EXT g_free(data->ssid->ssid); - g_free(data->ssid->passphrase); + g_free((char *)data->ssid->passphrase); #endif g_free(data->ssid); dbus_free(data); @@ -5453,7 +5453,7 @@ error: g_free(data->path); #if defined TIZEN_EXT g_free(data->ssid->ssid); - g_free(data->ssid->passphrase); + g_free((char *)data->ssid->passphrase); #endif g_free(data->ssid); g_free(data); @@ -6231,7 +6231,7 @@ done: callback_assoc_failed(decrypt_request_data.data->user_data); g_free(data->path); g_free(data->ssid->ssid); - g_free(data->ssid->passphrase); + g_free((char *)data->ssid->passphrase); g_free(data->ssid); dbus_free(data); } diff --git a/packaging/connman.spec b/packaging/connman.spec index 609059e8..53d99bbf 100644 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -5,7 +5,7 @@ Name: connman Version: 1.35 -Release: 28 +Release: 29 License: GPL-2.0+ Summary: Connection Manager Url: http://connman.net @@ -254,9 +254,9 @@ systemctl daemon-reload %attr(755,network_fw,network_fw) /%{_localstatedir}/lib/connman %attr(600,network_fw,network_fw) /%{_localstatedir}/lib/connman/settings %attr(644,root,root) %{_datadir}/dbus-1/system-services/net.connman.service -%{_sysconfdir}/dbus-1/system.d/* +%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/* %attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf -%{_sysconfdir}/dbus-1/system.d/*.conf +%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*.conf %attr(644,root,root) %{_libdir}/systemd/system/connman.service %attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/connman.service %if "%{?_lib}" == "lib64" @@ -311,7 +311,7 @@ systemctl daemon-reload %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/scripts %dir %{_libdir}/%{name}/plugins-vpn -%config %{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf +%attr(644,root,root) %config %{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf %{_datadir}/dbus-1/system-services/net.connman.vpn.service %license COPYING %attr(644,root,root) %{_libdir}/systemd/system/connman-vpn.service diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c index f89edfa0..76c15e59 100755 --- a/plugins/bluetooth.c +++ b/plugins/bluetooth.c @@ -917,7 +917,7 @@ static void bluetooth_tech_remove(struct connman_technology *technology) static int bluetooth_tech_set_tethering(struct connman_technology *technology, const char *identifier, const char *passphrase, - const char *bridge, bool enabled, bool hidden) + const char *bridge, bool enabled) { GHashTableIter hash_iter; gpointer key, value; diff --git a/src/connman.conf b/src/connman.conf index 6c6d23b6..e0922356 100644 --- a/src/connman.conf +++ b/src/connman.conf @@ -18,6 +18,11 @@ <check send_destination="net.connman" send_interface="net.connman.Manager" send_member="GetTechnologies" privilege="http://tizen.org/privilege/network.get" /> <check send_destination="net.connman" send_interface="net.connman.Manager" send_member="GetProperties" privilege="http://tizen.org/privilege/network.get" /> <check send_destination="net.connman" send_interface="net.connman.Manager" send_member="GetServices" privilege="http://tizen.org/privilege/network.get" /> + <check send_destination="net.connman" send_interface="net.connman.Manager" send_member="GetMeshPeers" privilege="http://tizen.org/privilege/network.get" /> + <check send_destination="net.connman" send_interface="net.connman.Manager" send_member="GetConnectedMeshPeers" privilege="http://tizen.org/privilege/network.get" /> + <check send_destination="net.connman" send_interface="net.connman.Manager" send_member="GetDisconnectedMeshPeers" privilege="http://tizen.org/privilege/network.get" /> + <check send_destination="net.connman" send_interface="net.connman.Manager" send_member="MeshAddPeer" privilege="http://tizen.org/privilege/network.set" /> + <check send_destination="net.connman" send_interface="net.connman.Manager" send_member="MeshRemovePeer" privilege="http://tizen.org/privilege/network.set" /> <check send_destination="net.connman" send_interface="net.connman.Service" send_member="Connect" privilege="http://tizen.org/privilege/network.set" /> <check send_destination="net.connman" send_interface="net.connman.Service" send_member="Disconnect" privilege="http://tizen.org/privilege/network.set" /> <check send_destination="net.connman" send_interface="net.connman.Service" send_member="SetProperty" privilege="http://tizen.org/privilege/network.profile" /> @@ -26,5 +31,6 @@ <check send_destination="net.connman" send_interface="net.connman.Service" send_member="PropertyChanged" privilege="http://tizen.org/privilege/network.get" /> <check send_destination="net.connman" send_interface="net.connman.Technology" send_member="Scan" privilege="http://tizen.org/privilege/network.set" /> <check send_destination="net.connman" send_interface="net.connman.Technology" send_member="SpecificScan" privilege="http://tizen.org/privilege/network.set" /> + <check send_destination="net.connman" send_interface="net.connman.Technology" send_member="MeshCommands" privilege="http://tizen.org/privilege/network.set" /> </policy> </busconfig> |