Merge from tizen_3.0

Change attribute for daemon and set uid/gid into service
Added ntp enable feature when profile is ivi
Modified to get security info for ssid scan
Fixed coding rule issues

Change-Id: I16d5c2679626644399f715ece0264fef41321664
Signed-off-by: cheoleun <chleun.moon@samsung.com>

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index f384165..01e01e9 100755 (executable)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -147,8 +147,8 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 
 %files
 %manifest net-config.manifest
-%attr(500,root,root) %{_sbindir}/*
-%attr(644,root,root) %{_sysconfdir}/resolv.conf
+%attr(755,root,root) %{_sbindir}/*
+%attr(644,network_fw,network_fw) %{_sysconfdir}/resolv.conf
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/*
 #DBus DAC
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*

diff --git a/resources/usr/lib/systemd/system/net-config.service b/resources/usr/lib/systemd/system/net-config.service
index 26685b4..4eccf02 100755 (executable)
--- a/resources/usr/lib/systemd/system/net-config.service
+++ b/resources/usr/lib/systemd/system/net-config.service
@@ -8,8 +8,8 @@ Type=forking
 SmackProcessLabel=System
 ExecStart=/usr/sbin/net-config
 Restart=always
-CapabilityBoundingSet=~CAP_MAC_ADMIN
-CapabilityBoundingSet=~CAP_MAC_OVERRIDE
+User=network_fw
+Group=network_fw
 
 [Install]
 WantedBy=multi-user.target