From: chleun.moon <chleun.moon@samsung.com>
Date: Mon, 14 Nov 2016 01:04:19 +0000 (+0900)
Subject: Merge from tizen_3.0
X-Git-Tag: submit/tizen/20161114.043131^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=540bbf21a409ddd56cd198277ae040557547d3d1;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git

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>
---

540bbf21a409ddd56cd198277ae040557547d3d1
diff --cc packaging/net-config.spec
index e07cd5b,f384165..01e01e9
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@@ -144,8 -147,8 +147,8 @@@ ln -sf %{_unitdir}/net-config.service %
  
  %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 --cc resources/usr/lib/systemd/system/net-config.service
index 26685b4,26685b4..4eccf02
--- a/resources/usr/lib/systemd/system/net-config.service
+++ b/resources/usr/lib/systemd/system/net-config.service
@@@ -8,8 -8,8 +8,8 @@@ Type=forkin
  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