adopt dbus cynara check

 - remove cynara library dependancy

Change-Id: Ie6e4815b3bdf350c7475735880d779ddec603945

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e28f71..cb011aa 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,9 +21,6 @@ pkg_check_modules(pkgs REQUIRED
        aul
        appsvc
        capi-appfw-app-manager
-       cynara-client
-       cynara-creds-gdbus
-       cynara-session
 )
 
 FOREACH(flag ${pkgs_CFLAGS})

diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec
index 7477ad2..94055d8 100644 (file)
--- a/packaging/tel-plugin-dbus_tapi.spec
+++ b/packaging/tel-plugin-dbus_tapi.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 67
+%define patchlevel 68
 
 Name:           tel-plugin-dbus_tapi
 Version:        %{major}.%{minor}.%{patchlevel}
@@ -21,9 +21,6 @@ BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(tcore)
-BuildRequires:  pkgconfig(cynara-client)
-BuildRequires:  pkgconfig(cynara-creds-gdbus)
-BuildRequires:  pkgconfig(cynara-session)
 
 
 Requires(post): /sbin/ldconfig

diff --git a/packaging/telephony.conf b/packaging/telephony.conf
index 71eaf30..3411164 100644 (file)
--- a/packaging/telephony.conf
+++ b/packaging/telephony.conf
@@ -4,12 +4,173 @@
         <policy user="root">
                 <allow own="org.tizen.telephony"/>
                 <allow send_destination="org.tizen.telephony"/>
-                <allow receive_sender="org.tizen.telephony"/>
         </policy>
 
         <policy context="default">
-                <allow send_destination="org.tizen.telephony"/>
-                <allow receive_sender="org.tizen.telephony"/>
+                <allow send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Manager"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.freedesktop.DBus.Properties" send_member="Get" privilege="http://tizen.org/privilege/telephony"/>
+
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Phonebook" send_member="GetInitStatus" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Phonebook" send_member="GetCount" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Phonebook" send_member="GetInfo" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Phonebook" send_member="GetUsimMetaInfo" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Phonebook" send_member="ReadRecord" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Phonebook" send_member="UpdateRecord" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Phonebook" send_member="DeleteRecord" privilege="http://tizen.org/privilege/telephony.admin"/>
+
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="ActivateBarring" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="DeactivateBarring" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="ChangeBarringPassword" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="GetBarringStatus" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="RegisterForwarding" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="DeregisterForwarding" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="ActivateForwarding" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="DeactivateForwarding" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="GetForwardingStatus" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="ActivateWaiting" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="DeactivateWaiting" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="GetWaitingStatus" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="SetCLIStatus" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="GetCLIStatus" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Ss" send_member="SendUSSD" privilege="http://tizen.org/privilege/telephony.admin"/>
+
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.OEM" send_member="SendOemData" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.OEM" send_member="SendOemDataWithResponse" privilege="http://tizen.org/privilege/telephony.admin"/>
+
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="Dial" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="Answer" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="End" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="StartContDtmf" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="StopContDtmf" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="SendBurstDtmf" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="Active" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="Hold" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="Swap" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="Join" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="Split" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="Transfer" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="Deflect" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="GetPrivacyMode" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="SetPrivacyMode" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="GetStatus" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="GetStatusAll" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="SetSoundPath" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="GetSoundVolumeLevel" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="SetSoundVolumeLevel" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="GetSoundMuteStatus" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="SetSoundMuteStatus" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="SetSoundRecording" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="SetSoundEqualization" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="SetSoundNoiseReduction" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="SetSoundClockStatus" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="SetPreferredVoiceSubscription" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="GetPreferredVoiceSubscription" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="Modify" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Call" send_member="ConfirmModify" privilege="http://tizen.org/privilege/telephony.admin"/>
+
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="Search" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="SearchCancel" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="SetSelectionMode" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetSelectionMode" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="SetServiceDomain" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetServiceDomain" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="SetBand" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetBand" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="SetMode" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetMode" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="SetPreferredPlmn" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetPreferredPlmn" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetServingNetwork" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetNgbrCellInfo" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="SetEmergencyCallbackMode" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="SetRoamingPreference" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetRoamingPreference" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="SetDefaultDataSubscription" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetDefaultDataSubscription" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="SetDefaultSubscription" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Network" send_member="GetDefaultSubscription" privilege="http://tizen.org/privilege/telephony"/>
+
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="SendMsg" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="ReadMsg" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="SaveMsg" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="DeleteMsg" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="GetMsgCount" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="GetSca" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="SetSca" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="GetCbConfig" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="SetCbConfig" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="SetMemStatus" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="GetPrefBearer" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="SetPrefBearer" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="SetDeliveryReport" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="SetMsgStatus" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="GetSmsParams" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="SetSmsParams" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="GetSmsParamCnt" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.sms" send_member="GetSmsReadyStatus" privilege="http://tizen.org/privilege/telephony"/>
+
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.SAT" send_member="GetMainMenuInfo" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.SAT" send_member="SendUiDisplayStatus" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.SAT" send_member="SendUserConfirm" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.SAT" send_member="SelectMenu" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.SAT" send_member="DownloadEvent" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.SAT" send_member="SendAppExecResult" privilege="http://tizen.org/privilege/telephony.admin"/>
+
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Modem" send_member="SetPower" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Modem" send_member="SetFlightMode" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Modem" send_member="GetFlightMode" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Modem" send_member="GetVersion" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Modem" send_member="GetSerialNumber" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Modem" send_member="GetIMEI" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Modem" send_member="SetDunPinCtrl" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Modem" send_member="GetDeviceInfo" privilege="http://tizen.org/privilege/telephony"/>
+
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetInitStatus" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetCardType" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetIMSI" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetECC" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetICCID" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetLanguage" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="SetLanguage" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetCallForwarding" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="SetCallForwarding" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetMessageWaiting" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="SetMessageWaiting" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetMailbox" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="SetMailbox" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetCPHSInfo" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetServiceTable" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetMSISDN" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetOplmnwact" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetSpn" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetCphsNetName" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetGID" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="Authentication" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="VerifySec" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="VerifyPUK" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="ChangePIN" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="DisableFacility" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="EnableFacility" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetFacility" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetLockInfo" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="TransferAPDU" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetATR" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetFields" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="SetPowerstate" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetImpi" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetImpu" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetDomain" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetPcscf" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetAppList" privilege="http://tizen.org/privilege/telephony"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sim" send_member="GetIsimServiceTable" privilege="http://tizen.org/privilege/telephony"/>
+
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sap" send_member="Connect" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sap" send_member="Disconnect" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sap" send_member="GetStatus" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sap" send_member="GetATR" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sap" send_member="TransferAPDU" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sap" send_member="SetProtocol" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sap" send_member="SetPower" privilege="http://tizen.org/privilege/telephony.admin"/>
+                <check send_destination="org.tizen.telephony" send_interface="org.tizen.telephony.Sap" send_member="GetCardReaderStatus" privilege="http://tizen.org/privilege/telephony.admin"/>
         </policy>
 </busconfig>
-

diff --git a/src/dtapi_call.c b/src/dtapi_call.c
index a9f6109..817f7ed 100644 (file)
--- a/src/dtapi_call.c
+++ b/src/dtapi_call.c
@@ -39,13 +39,8 @@ static gboolean on_call_dial(TelephonyCall *call,
 {
        struct treq_call_dial req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
 
        memset(&req, 0x0, sizeof(req));
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
-
        req.type = call_type;
        req.ecc = call_ecc;
 
@@ -69,10 +64,6 @@ static gboolean on_call_answer(TelephonyCall *call,
 {
        struct treq_call_answer req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        req.handle = call_handle;
        req.type = answer_type;
@@ -99,10 +90,6 @@ static gboolean on_call_end(TelephonyCall *call,
 {
        struct treq_call_end req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        req.handle = call_handle;
        req.type = end_type;
@@ -128,10 +115,6 @@ static gboolean on_call_start_cont_dtmf(TelephonyCall *call,
 {
        struct treq_call_start_cont_dtmf  req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(req));
 
@@ -151,10 +134,6 @@ static gboolean on_call_stop_cont_dtmf(TelephonyCall *call,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        dbg("[%s] Stop DTMF", GET_CP_NAME(invocation));
 
@@ -172,10 +151,6 @@ static gboolean on_call_send_burst_dtmf(TelephonyCall *call,
 {
        struct treq_call_send_burst_dtmf req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(req));
 
@@ -210,10 +185,6 @@ static gboolean on_call_active(TelephonyCall *call,
 {
        struct treq_call_active req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        req.handle = call_handle;
 
@@ -233,10 +204,6 @@ static gboolean on_call_hold(TelephonyCall *call,
 {
        struct treq_call_hold req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        req.handle = call_handle;
 
@@ -256,10 +223,6 @@ static gboolean on_call_swap(TelephonyCall *call,
 {
        struct treq_call_swap req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        req.handle = call_handle;
 
@@ -279,10 +242,6 @@ static gboolean on_call_join(TelephonyCall *call,
 {
        struct treq_call_join req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        req.handle = call_handle;
 
@@ -302,10 +261,6 @@ static gboolean on_call_split(TelephonyCall *call,
 {
        struct treq_call_split req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        req.handle = call_handle;
 
@@ -325,10 +280,6 @@ static gboolean on_call_transfer(TelephonyCall *call,
 {
        struct treq_call_transfer req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        req.handle = call_handle;
 
@@ -348,10 +299,6 @@ static gboolean on_call_deflect(TelephonyCall *call,
 {
        struct treq_call_deflect req = {0};
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        if (call_number)
                g_strlcpy(req.number, call_number, MAX_CALL_DIAL_NUM_LEN);
@@ -371,10 +318,6 @@ static gboolean on_call_get_privacy_mode(TelephonyCall *call,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, call, invocation,
@@ -390,10 +333,6 @@ static gboolean on_call_set_privacy_mode(TelephonyCall *call,
 {
        struct treq_call_set_voice_privacy_mode req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
-               return TRUE;
 
        req.privacy_mode = privacy_mode;
 
@@ -415,8 +354,6 @@ static gboolean on_call_get_status(TelephonyCall *call,
        TcorePlugin *plugin = 0;
        CoreObject *call_co = NULL;
        CallObject *call_obj = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
        gchar call_number[MAX_CALL_NUMBER_LEN];
        gint call_type;
        gboolean call_direction;
@@ -424,9 +361,6 @@ static gboolean on_call_get_status(TelephonyCall *call,
        gboolean call_multiparty_state;
        gboolean is_volte_call;
 
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "r"))
-               return TRUE;
-
        plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
        call_co = tcore_plugin_ref_core_object(plugin, CORE_OBJECT_TYPE_CALL);
        call_obj = tcore_call_object_find_by_handle(call_co, call_handle);
@@ -473,7 +407,6 @@ static gboolean on_call_get_status_all(TelephonyCall *call,
 
        GVariant *gv = NULL;
        GVariantBuilder b;
-       cynara *p_cynara = ctx->p_cynara;
 
        gint call_id;
        gint handle;
@@ -486,9 +419,6 @@ static gboolean on_call_get_status_all(TelephonyCall *call,
 
        int len, i;
 
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "r"))
-               return TRUE;
-
        plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
        call_co = tcore_plugin_ref_core_object(plugin, CORE_OBJECT_TYPE_CALL);
 
@@ -592,10 +522,6 @@ static gboolean on_call_set_sound_path(TelephonyCall *call,
 {
        struct treq_call_set_sound_path req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
-               return TRUE;
 
        req.path = sound_path;
        req.extra_volume_on = extra_volume_on;
@@ -618,10 +544,6 @@ static gboolean on_call_get_sound_volume_level(TelephonyCall *call,
        struct treq_call_get_sound_volume_level req;
        struct custom_data *ctx = user_data;
        TReturn ret;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "r"))
-               return TRUE;
 
        req.device = sound_device;
        req.sound = sound_type;
@@ -657,10 +579,6 @@ static gboolean on_call_set_sound_volume_level(TelephonyCall *call,
 {
        struct treq_call_set_sound_volume_level req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
-               return TRUE;
 
        req.device = sound_device;
        req.sound = sound_type;
@@ -682,10 +600,6 @@ static gboolean on_call_get_sound_mute_status(TelephonyCall *call,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, call, invocation,
@@ -701,10 +615,6 @@ static gboolean on_call_set_sound_mute_status(TelephonyCall *call,
 {
        struct treq_call_set_sound_mute_status req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
-               return TRUE;
 
        req.path = path;
        req.status = status;
@@ -729,10 +639,6 @@ static gboolean on_call_set_sound_recording(TelephonyCall *call,
 {
        struct custom_data *ctx = user_data;
        struct treq_call_set_sound_recording req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
-               return TRUE;
 
        req.state = (gboolean)recording_state;
 
@@ -754,10 +660,6 @@ static gboolean on_call_set_sound_equalization(TelephonyCall *call,
 {
        struct custom_data *ctx = user_data;
        struct treq_call_set_sound_equalization req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
-               return TRUE;
 
        req.mode = eq_mode;
        req.direction = (enum telephony_call_sound_direction)eq_direction;
@@ -781,10 +683,6 @@ static gboolean on_call_set_sound_noise_reduction(TelephonyCall *call,
 {
        struct custom_data *ctx = user_data;
        struct treq_call_set_sound_noise_reduction req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
-               return TRUE;
 
        req.status = (gboolean)nr_state;
 
@@ -804,10 +702,6 @@ static gboolean on_call_set_sound_clock_status(TelephonyCall *call,
 {
        struct custom_data *ctx = user_data;
        struct treq_call_set_sound_clock_status req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
-               return TRUE;
 
        req.status = clock_status;
 
@@ -828,10 +722,6 @@ static gboolean on_call_set_preferred_voice_subscription(TelephonyCall *call,
 {
        struct custom_data *ctx = user_data;
        struct treq_call_set_preferred_voice_subscription req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "w"))
-               return TRUE;
 
        req.preferred_subs = preferred_subscription;
 
@@ -854,10 +744,6 @@ static gboolean on_call_get_preferred_voice_subscription(TelephonyCall *call,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, call, invocation,
@@ -873,10 +759,6 @@ static gboolean on_call_modify(TelephonyCall *call,
 {
        struct custom_data *ctx = user_data;
        struct treq_call_modify req = {0};
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        req.handle = call_handle;
        req.call_type = call_type;
@@ -901,10 +783,6 @@ static gboolean on_call_confirm_modify(TelephonyCall *call,
 {
        struct custom_data *ctx = user_data;
        struct treq_call_confirm_modify req = {0};
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_CALL, "x"))
-               return TRUE;
 
        req.handle = call_handle;
        req.confirm_type = confirm_type;

diff --git a/src/dtapi_common.c b/src/dtapi_common.c
index 0fff804..9b3f979 100644 (file)
--- a/src/dtapi_common.c
+++ b/src/dtapi_common.c
@@ -33,17 +33,9 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <cynara-creds-gdbus.h>
-#include <cynara-session.h>
-
 #include "generated-code.h"
 #include "dtapi_common.h"
 
-#define PERM_WRITE     "w"
-#define PERM_EXECUTE   "x"
-#define TELEPHONY_PRIVILEGE            "http://tizen.org/privilege/telephony"
-#define TELEPHONY_ADMIN_PRIVILEGE      "http://tizen.org/privilege/telephony.admin"
-
 static void _free_hook(UserRequest *ur)
 {
        struct dbus_request_info *user_info;
@@ -88,85 +80,6 @@ UserRequest *dbus_plugin_macro_user_request_new(struct custom_data *ctx,
        return ur;
 }
 
-gboolean check_access_control(cynara *p_cynara, GDBusMethodInvocation *invoc, const char *label, const char *perm)
-{
-       GDBusConnection *conn;
-       const char *sender_unique_name;
-       pid_t pid;
-       int ret;
-       int result = FALSE;
-       /* For cynara */
-       gchar *client_smack = NULL;
-       char *client_session = NULL;
-       gchar *uid_string = NULL;
-       const char *privilege = NULL;
-
-       if (!p_cynara) {
-               warn("access control denied (fail to get cynara handle)");
-               goto OUT;
-       }
-
-       conn = g_dbus_method_invocation_get_connection(invoc);
-       if (!conn) {
-               warn("access control denied (no connection info)");
-               goto OUT;
-       }
-
-       sender_unique_name = g_dbus_method_invocation_get_sender(invoc);
-
-       /* Get PID */
-       ret = cynara_creds_gdbus_get_pid(conn, sender_unique_name, &pid);
-       if (ret != CYNARA_API_SUCCESS) {
-               warn("access control denied (fail to get pid). ret = %d", ret);
-               goto OUT;
-       }
-
-       /* Get UID */
-       ret = cynara_creds_gdbus_get_user(conn, sender_unique_name, USER_METHOD_DEFAULT, &uid_string);
-       if (ret != CYNARA_API_SUCCESS) {
-               warn("access control denied (fail to get uid for cynara). ret = %d", ret);
-               goto OUT;
-       }
-
-       /* Get Smack label */
-       ret = cynara_creds_gdbus_get_client(conn, sender_unique_name, CLIENT_METHOD_DEFAULT, &client_smack);
-       if (ret != CYNARA_API_SUCCESS) {
-               warn("access control denied (fail to get smack for cynara). ret = %d", ret);
-               goto OUT;
-       }
-
-       dbg("sender: %s pid = %u uid = %s smack = %s", sender_unique_name, pid, uid_string, client_smack);
-
-       client_session = cynara_session_from_pid(pid);
-       if (!client_session) {
-               warn("access control denied (fail to get cynara client session)");
-               goto OUT;
-       }
-
-       if (g_strrstr(perm, PERM_WRITE) == NULL && g_strrstr(perm, PERM_EXECUTE) == NULL)
-               privilege = TELEPHONY_PRIVILEGE;
-       else
-               privilege = TELEPHONY_ADMIN_PRIVILEGE;
-
-       ret = cynara_check(p_cynara, client_smack, client_session, uid_string, privilege);
-       if (ret != CYNARA_API_ACCESS_ALLOWED)
-               warn("pid(%u) access (%s - %s) denied(%d)", pid, label, perm, ret);
-       else
-               result = TRUE;
-OUT:
-       if (result == FALSE) {
-               g_dbus_method_invocation_return_error(invoc,
-                               G_DBUS_ERROR,
-                               G_DBUS_ERROR_ACCESS_DENIED,
-                               "No access rights");
-       }
-       free(client_session);
-       g_free(client_smack);
-       g_free(uid_string);
-
-       return result;
-}
-
 enum dbus_tapi_sim_slot_id get_sim_slot_id_by_cp_name(const char *cp_name)
 {
        if (g_str_has_suffix(cp_name , "0"))

diff --git a/src/dtapi_common.h b/src/dtapi_common.h
index b65ca5f..a1c6b5b 100644 (file)
--- a/src/dtapi_common.h
+++ b/src/dtapi_common.h
@@ -24,8 +24,6 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#include <cynara-client.h>
-
 #include "type/sim.h"
 
 #include "generated-code.h"
@@ -70,8 +68,6 @@ struct custom_data {
 
        gboolean name_acquired;
        guint owner_id;
-
-       cynara *p_cynara;
 };
 
 struct dbus_request_info {
@@ -91,7 +87,6 @@ void dtapi_deinit(TcorePlugin *p);
 
 char *dbus_plugin_get_cp_name_by_object_path(const char *object_path);
 UserRequest *dbus_plugin_macro_user_request_new(struct custom_data *ctx, void *object, GDBusMethodInvocation *invocation);
-gboolean check_access_control (cynara *p_cynara, GDBusMethodInvocation *invoc, const char *label, const char *perm);
 
 gboolean dbus_plugin_util_load_xml(char *docname, char *groupname, void **i_doc, void **i_root_node);
 void dbus_plugin_util_unload_xml(void **i_doc, void **i_root_node);

diff --git a/src/dtapi_main.c b/src/dtapi_main.c
index 1a75b57..b901fb4 100644 (file)
--- a/src/dtapi_main.c
+++ b/src/dtapi_main.c
@@ -664,25 +664,13 @@ gboolean dtapi_init(TcorePlugin *p)
        Communicator *comm;
        struct custom_data *data;
        guint id;
-       cynara *p_cynara = NULL;
 
        dbg("Enter");
 
-       /* Initialize cynara handle */
-       if (CYNARA_API_SUCCESS == cynara_initialize(&p_cynara, NULL)) {
-               dbg("cynara handle is successfully initialized.");
-       } else {
-               err("Failed to initialize cynara handle.");
-               return FALSE;
-       }
-
        data = calloc(1, sizeof(struct custom_data));
-       if (!data) {
-               cynara_finish(p_cynara);
+       if (!data)
                return FALSE;
-       }
 
-       data->p_cynara = p_cynara;
        data->plugin = p;
 
        comm = tcore_communicator_new(p, "dbus", &dbus_ops);
@@ -744,11 +732,6 @@ void dtapi_deinit(TcorePlugin *p)
        }
        g_slist_free(data->cached_data);
 
-       if (data->p_cynara) {
-               cynara_finish(data->p_cynara);
-               data->p_cynara = NULL;
-       }
-
        free(data);
 
        tcore_server_remove_communicator(s, comm);

diff --git a/src/dtapi_modem.c b/src/dtapi_modem.c
index 13290e7..c99b348 100644 (file)
--- a/src/dtapi_modem.c
+++ b/src/dtapi_modem.c
@@ -36,10 +36,6 @@ static gboolean on_modem_set_power(TelephonyModem *modem,
 {
        struct custom_data *ctx = user_data;
        enum tcore_request_command command;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_MODEM, "x"))
-               return TRUE;
 
        switch (mode) {
        case MODEM_STATE_ONLINE:
@@ -76,10 +72,6 @@ static gboolean on_modem_set_flight_mode(TelephonyModem *modem,
 {
        struct treq_modem_set_flightmode req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_MODEM, "w"))
-               return TRUE;
 
        req.enable = enable;
 
@@ -95,10 +87,6 @@ static gboolean on_modem_get_flight_mode(TelephonyModem *modem,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_MODEM, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, modem, invocation,
@@ -112,10 +100,6 @@ static gboolean on_modem_get_version(TelephonyModem *modem,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_MODEM, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, modem, invocation,
@@ -129,10 +113,6 @@ static gboolean on_modem_get_serial_number(TelephonyModem *modem,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_MODEM, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, modem, invocation,
@@ -146,10 +126,6 @@ static gboolean on_modem_get_imei(TelephonyModem *modem,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_MODEM, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, modem, invocation,
@@ -165,10 +141,6 @@ static gboolean on_modem_set_dun_pin_ctrl(TelephonyModem *modem,
 {
        struct treq_modem_set_dun_pin_control req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_MODEM, "x"))
-               return TRUE;
 
        req.signal = signal;
        req.status = status;
@@ -185,10 +157,6 @@ static gboolean on_modem_get_device_info(TelephonyModem *modem,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_MODEM, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, modem, invocation,

diff --git a/src/dtapi_network.c b/src/dtapi_network.c
index e9e53bc..4bd30aa 100644 (file)
--- a/src/dtapi_network.c
+++ b/src/dtapi_network.c
@@ -462,10 +462,6 @@ static gboolean on_network_search(TelephonyNetwork *network,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "x"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -479,10 +475,6 @@ static gboolean on_network_search_cancel(TelephonyNetwork *network,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "x"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -496,10 +488,6 @@ static gboolean on_network_get_selection_mode(TelephonyNetwork *network,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -515,10 +503,6 @@ static gboolean on_network_set_selection_mode(TelephonyNetwork *network,
 {
        struct treq_network_set_plmn_selection_mode req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_network_set_plmn_selection_mode));
 
@@ -548,10 +532,6 @@ static gboolean on_network_set_service_domain(TelephonyNetwork *network,
 {
        struct treq_network_set_service_domain req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
-               return TRUE;
 
        req.domain = domain;
 
@@ -567,10 +547,6 @@ static gboolean on_network_get_service_domain(TelephonyNetwork *network,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -586,10 +562,6 @@ static gboolean on_network_set_band(TelephonyNetwork *network,
 {
        struct treq_network_set_band req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
-               return TRUE;
 
        req.mode = mode;
        req.band = band;
@@ -606,10 +578,6 @@ static gboolean on_network_get_band(TelephonyNetwork *network,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -624,10 +592,6 @@ static gboolean on_network_set_mode(TelephonyNetwork *network,
 {
        struct treq_network_set_mode req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
-               return TRUE;
 
        req.mode = mode;
 
@@ -643,10 +607,6 @@ static gboolean on_network_get_mode(TelephonyNetwork *network,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -662,10 +622,6 @@ static gboolean on_network_set_preferred_plmn(TelephonyNetwork *network,
 {
        struct treq_network_set_preferred_plmn req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
-               return TRUE;
 
        req.operation = mode;
        req.ef_index = ef_index;
@@ -688,10 +644,6 @@ static gboolean on_network_get_preferred_plmn(TelephonyNetwork *network,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -705,10 +657,6 @@ static gboolean on_network_get_serving_network(TelephonyNetwork *network,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -722,10 +670,6 @@ static gboolean on_network_get_neighboring_cell_info(TelephonyNetwork *network,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -739,10 +683,6 @@ static gboolean on_network_set_default_data_subscription(TelephonyNetwork *netwo
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -756,10 +696,6 @@ static gboolean on_network_get_default_data_subscription(TelephonyNetwork *netwo
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -773,10 +709,6 @@ static gboolean on_network_set_default_subs(TelephonyNetwork *network,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -790,10 +722,6 @@ static gboolean on_network_get_default_subs(TelephonyNetwork *network,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,
@@ -808,10 +736,6 @@ static gboolean on_network_set_emergency_callback_mode(TelephonyNetwork *network
 {
        struct treq_network_set_emergency_callback_mode req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
-               return TRUE;
 
        req.mode = mode;
 
@@ -828,10 +752,6 @@ static gboolean on_network_set_roaming_preference(TelephonyNetwork *network,
 {
        struct treq_network_set_roaming_preference req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "w"))
-               return TRUE;
 
        req.roam_pref = roam_pref;
 
@@ -847,10 +767,6 @@ static gboolean on_network_get_roaming_preference(TelephonyNetwork *network,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_NETWORK, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, network, invocation,

diff --git a/src/dtapi_oem.c b/src/dtapi_oem.c
index 45a0440..9f9f1f9 100644 (file)
--- a/src/dtapi_oem.c
+++ b/src/dtapi_oem.c
@@ -89,10 +89,6 @@ static gboolean send_oem_data(TelephonyOEM *oem,
        gint result = 1;
        guchar *decoded_data = NULL;
        gsize length;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_MODEM, "w"))
-               return TRUE;
 
        ur = MAKE_UR(ctx, oem, invocation);
 

diff --git a/src/dtapi_phonebook.c b/src/dtapi_phonebook.c
index 98a027d..9d10fe0 100644 (file)
--- a/src/dtapi_phonebook.c
+++ b/src/dtapi_phonebook.c
@@ -87,10 +87,6 @@ static gboolean on_phonebook_get_init_status(TelephonyPhonebook *phonebook,
        gboolean pb_status = FALSE;
        struct tel_phonebook_support_list *list = NULL;
        CoreObject *co_pb = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "r"))
-               return TRUE;
 
        DBUS_PBM_GET_CO_PBM(invocation, co_pb, ctx->server);
        pb_status = tcore_phonebook_get_status(co_pb);
@@ -144,10 +140,6 @@ static gboolean on_phonebook_get_count(TelephonyPhonebook *phonebook,
        struct treq_phonebook_get_count req;
        CoreObject *co_pb = NULL;
        gboolean pb_status = FALSE;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "r"))
-               return TRUE;
 
        DBUS_PBM_GET_CO_PBM(invocation, co_pb, ctx->server);
        pb_status = tcore_phonebook_get_status(co_pb);
@@ -181,10 +173,6 @@ static gboolean on_phonebook_get_info(TelephonyPhonebook *phonebook,
        struct treq_phonebook_get_info req;
        CoreObject *co_pb = NULL;
        gboolean pb_status = FALSE;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "r"))
-               return TRUE;
 
        DBUS_PBM_GET_CO_PBM(invocation, co_pb, ctx->server);
        pb_status = tcore_phonebook_get_status(co_pb);
@@ -219,10 +207,6 @@ static gboolean on_phonebook_get_usim_info(TelephonyPhonebook *phonebook,
        struct custom_data *ctx = user_data;
        CoreObject *co_pb = NULL;
        gboolean pb_status = FALSE;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "r"))
-               return TRUE;
 
        DBUS_PBM_GET_CO_PBM(invocation, co_pb, ctx->server);
 
@@ -259,10 +243,6 @@ static gboolean on_phonebook_read_record(TelephonyPhonebook *phonebook,
        struct treq_phonebook_read_record req;
        CoreObject *co_pb = NULL;
        gboolean pb_status = FALSE;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "r"))
-               return TRUE;
 
        DBUS_PBM_GET_CO_PBM(invocation, co_pb, ctx->server);
        pb_status = tcore_phonebook_get_status(co_pb);
@@ -312,10 +292,6 @@ static gboolean on_phonebook_update_record(TelephonyPhonebook *phonebook,
        CoreObject *co_pb = NULL;
        gboolean pb_status = FALSE;
        int temp_len = 0;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "x"))
-               return TRUE;
 
        DBUS_PBM_GET_CO_PBM(invocation, co_pb, ctx->server);
        pb_status = tcore_phonebook_get_status(co_pb);
@@ -423,10 +399,6 @@ static gboolean on_phonebook_delete_record(TelephonyPhonebook *phonebook,
        struct treq_phonebook_delete_record req;
        CoreObject *co_pb = NULL;
        gboolean pb_status = FALSE;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_PHONEBOOK, "x"))
-               return TRUE;
 
        DBUS_PBM_GET_CO_PBM(invocation, co_pb, ctx->server);
        pb_status = tcore_phonebook_get_status(co_pb);

diff --git a/src/dtapi_sap.c b/src/dtapi_sap.c
index aaea860..49db673 100644 (file)
--- a/src/dtapi_sap.c
+++ b/src/dtapi_sap.c
@@ -33,10 +33,6 @@ static gboolean on_sap_connect(TelephonySap *sap,
 {
        struct custom_data *ctx = user_data;
        struct treq_sap_req_connect req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SAP, "x"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_sap_req_connect));
 
@@ -54,10 +50,6 @@ static gboolean on_sap_disconnect(TelephonySap *sap,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SAP, "x"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, sap, invocation,
@@ -71,10 +63,6 @@ static gboolean on_sap_get_status(TelephonySap *sap,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SAP, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, sap, invocation,
@@ -88,10 +76,6 @@ static gboolean on_sap_get_atr(TelephonySap *sap,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SAP, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, sap, invocation,
@@ -110,13 +94,9 @@ static gboolean on_sap_transfer_apdu(TelephonySap *sap,
        GVariant *inner_gv = NULL;
        guchar rt_i;
        int i = 0;
-       cynara *p_cynara = ctx->p_cynara;
 
        dbg("Func Entrance");
 
-       if (!check_access_control(p_cynara, invocation, AC_SAP, "x"))
-               return TRUE;
-
        memset(&req, 0x0, sizeof(struct treq_sap_transfer_apdu));
 
        inner_gv = g_variant_get_variant(req_apdu);
@@ -148,10 +128,6 @@ static gboolean on_sap_set_protocol(TelephonySap *sap,
 {
        struct custom_data *ctx = user_data;
        struct treq_sap_set_protocol req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SAP, "w"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_sap_set_protocol));
 
@@ -170,10 +146,6 @@ static gboolean on_sap_set_power(TelephonySap *sap,
 {
        struct custom_data *ctx = user_data;
        struct treq_sap_set_power req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SAP, "w"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_sap_set_power));
 
@@ -191,10 +163,6 @@ static gboolean on_sap_get_card_reader_status(TelephonySap *sap,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SAP, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, sap, invocation,

diff --git a/src/dtapi_sat.c b/src/dtapi_sat.c
index 4362580..4f76633 100644 (file)
--- a/src/dtapi_sat.c
+++ b/src/dtapi_sat.c
@@ -106,10 +106,6 @@ static gboolean on_sat_get_main_menu_info(TelephonySAT *sat,
        GVariant *icon_id = NULL;
        GVariant *icon_list = NULL;
 #endif
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SAT, "r"))
-               return TRUE;
 
        main_menu = __sat_get_main_menu(ctx, GET_CP_NAME(invocation));
        if (!main_menu) {
@@ -150,10 +146,6 @@ static gboolean on_sat_send_display_status(TelephonySAT *sat,
        struct custom_data *ctx = user_data;
        gboolean result = FALSE;
        gint out_param = 0;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
-               return TRUE;
 
        cp_name = GET_CP_NAME(invocation);
        plg = tcore_server_find_plugin(ctx->server, cp_name);
@@ -186,15 +178,11 @@ static gboolean on_sat_send_user_confirm(TelephonySAT *sat,
        TcorePlugin *plg = NULL;
        char *cp_name;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
 
        gboolean result = FALSE;
        gint out_param = 0;
        GVariant *confirm_data = NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
-               return TRUE;
-
        cp_name = GET_CP_NAME(invocation);
        plg = tcore_server_find_plugin(ctx->server, cp_name);
        if (!plg) {
@@ -229,14 +217,10 @@ static gboolean on_sat_send_app_exec_result(TelephonySAT *sat,
        TcorePlugin *plg = NULL;
        char *cp_name;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
 
        gboolean result = FALSE;
        gint out_param = 0;
 
-       if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
-               return TRUE;
-
        cp_name = GET_CP_NAME(invocation);
        plg = tcore_server_find_plugin(ctx->server, cp_name);
        if (!plg) {
@@ -267,10 +251,6 @@ static gboolean on_sat_select_menu(TelephonySAT *sat,
 {
        struct custom_data *ctx = user_data;
        struct treq_sat_envelop_cmd_data req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_sat_envelop_cmd_data));
 
@@ -295,12 +275,7 @@ static gboolean on_sat_download_event(TelephonySAT *sat,
 {
        gboolean b_event = FALSE;
        struct custom_data *ctx = user_data;
-
        struct treq_sat_envelop_cmd_data req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SAT, "x"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_sat_envelop_cmd_data));
 

diff --git a/src/dtapi_sim.c b/src/dtapi_sim.c
index f099a14..0a1eca0 100644 (file)
--- a/src/dtapi_sim.c
+++ b/src/dtapi_sim.c
@@ -395,10 +395,6 @@ static gboolean on_sim_get_init_status(TelephonySim *sim,
        enum tel_sim_status sim_status = SIM_STATUS_UNKNOWN;
        gboolean sim_changed = FALSE;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
 
@@ -420,10 +416,6 @@ static gboolean on_sim_get_card_type(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        enum tel_sim_type sim_type = SIM_TYPE_UNKNOWN;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_CARD_TYPE, co_sim);
@@ -449,10 +441,6 @@ static gboolean on_sim_get_imsi(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        struct tel_sim_imsi *imsi;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_IMSI, co_sim);
@@ -479,10 +467,6 @@ static gboolean on_sim_get_ecc(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct tel_sim_ecc_list *ecc_list = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_ECC, co_sim);
@@ -538,10 +522,6 @@ static gboolean on_sim_get_iccid(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct tel_sim_iccid* iccid = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_ICCID, co_sim);
@@ -571,10 +551,6 @@ static gboolean on_sim_get_language(TelephonySim *sim,
 {
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_LANGUAGE, co_sim);
@@ -594,10 +570,6 @@ static gboolean on_sim_set_language(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct treq_sim_set_language req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "w"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, SET_LANGUAGE, co_sim);
@@ -624,10 +596,6 @@ static gboolean on_sim_get_call_forwarding(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        TReturn ret;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_CALL_FORWARDING, co_sim);
@@ -658,10 +626,6 @@ static gboolean on_sim_set_call_forwarding(TelephonySim *sim,
        CoreObject *co_sim = NULL;
        struct treq_sim_set_callforwarding req;
        TReturn ret;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "w"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, SET_CALL_FORWARDING, co_sim);
@@ -713,10 +677,6 @@ static gboolean on_sim_get_message_waiting(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        TReturn ret;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_MESSAGE_WAITING, co_sim);
@@ -747,10 +707,6 @@ static gboolean on_sim_set_message_waiting(TelephonySim *sim,
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_set_messagewaiting req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "w"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, SET_MESSAGE_WAITING, co_sim);
@@ -804,10 +760,6 @@ static gboolean on_sim_get_mailbox(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        TReturn ret;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_MAILBOX, co_sim);
@@ -836,10 +788,6 @@ static gboolean on_sim_set_mailbox(TelephonySim *sim,
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_set_mailbox req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "w"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, SET_MAILBOX, co_sim);
@@ -890,10 +838,6 @@ static gboolean on_sim_get_cphsinfo(TelephonySim *sim,
 {
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_CPHS_INFO, co_sim);
@@ -913,10 +857,6 @@ static gboolean on_sim_get_service_table(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct tel_sim_service_table *svct = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_SVCT, co_sim);
@@ -986,10 +926,6 @@ static gboolean on_sim_get_msisdn(TelephonySim *sim,
        CoreObject *co_sim = NULL;
        struct tel_sim_msisdn_list *msisdn_list = NULL;
        gboolean read_from_modem = FALSE;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_MSISDN, co_sim);
@@ -1070,10 +1006,6 @@ static gboolean on_sim_get_oplmnwact(TelephonySim *sim,
 {
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_OPLMWACT, co_sim);
@@ -1093,10 +1025,6 @@ static gboolean on_sim_get_spn(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct tel_sim_spn* spn = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_SPN, co_sim);
@@ -1129,10 +1057,6 @@ static gboolean on_sim_get_cphs_netname(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct tel_sim_cphs_netname *cphs_netname = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_CPHS_NET_NAME, co_sim);
@@ -1168,10 +1092,6 @@ static gboolean on_sim_get_gid(TelephonySim *sim,
 {
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_GID, co_sim);
@@ -1198,10 +1118,6 @@ static gboolean on_sim_authentication(TelephonySim *sim,
        TReturn ret;
        CoreObject *co_sim = NULL;
        struct treq_sim_req_authentication req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, AUTHENTICATION, co_sim);
@@ -1283,10 +1199,6 @@ static gboolean on_sim_verify_sec(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct treq_sim_verify_pins req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, VERIFY_SEC, co_sim);
@@ -1318,10 +1230,6 @@ static gboolean on_sim_verify_puk(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct treq_sim_verify_puks req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, VERIFY_PUK, co_sim);
@@ -1355,10 +1263,6 @@ static gboolean on_sim_change_pin(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct treq_sim_change_pins req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, CHANGE_PIN, co_sim);
@@ -1391,10 +1295,6 @@ static gboolean on_sim_disable_facility(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        struct treq_sim_disable_facility req;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, DISABLE_FACILITY, co_sim);
@@ -1463,10 +1363,6 @@ static gboolean on_sim_enable_facility(TelephonySim *sim, GDBusMethodInvocation
        struct custom_data *ctx = user_data;
        struct treq_sim_enable_facility req;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, ENABLE_FACILITY, co_sim);
@@ -1534,10 +1430,6 @@ static gboolean on_sim_get_facility(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        struct treq_sim_get_facility_status req;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_FACILITY, co_sim);
@@ -1599,10 +1491,6 @@ static gboolean on_sim_get_lock_info(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct treq_sim_get_lock_info req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_LOCK_INFO, co_sim);
@@ -1667,10 +1555,6 @@ static gboolean on_sim_transfer_apdu(TelephonySim *sim,
        guchar rt_i;
        CoreObject *co_sim = NULL;
        int i = 0;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "x"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, TRANSFER_APDU, co_sim);
@@ -1705,10 +1589,6 @@ static gboolean on_sim_get_atr(TelephonySim *sim,
 {
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_ATR, co_sim);
@@ -1730,10 +1610,6 @@ static gboolean on_sim_get_fields(TelephonySim *sim,
        CoreObject *co_sim = NULL;
        GVariantBuilder b;
        GVariant *gv_fields = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
 
@@ -1782,10 +1658,6 @@ static gboolean on_sim_set_power_state(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        struct treq_sim_set_powerstate req;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "w"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, SET_POWERSTATE, co_sim);
@@ -1810,10 +1682,6 @@ static gboolean on_sim_get_impi(TelephonySim *sim,
 {
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_IMPI, co_sim);
@@ -1831,10 +1699,6 @@ static gboolean on_sim_get_impu(TelephonySim *sim,
 {
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_IMPU, co_sim);
@@ -1852,10 +1716,6 @@ static gboolean on_sim_get_domain(TelephonySim *sim,
 {
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_DOMAIN, co_sim);
@@ -1873,10 +1733,6 @@ static gboolean on_sim_get_pcscf(TelephonySim *sim,
 {
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_PCSCF, co_sim);
@@ -1895,10 +1751,6 @@ static gboolean on_sim_get_app_list(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        CoreObject *co_sim = NULL;
        unsigned char app_list = 0;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_APP_LIST, co_sim);
@@ -1917,10 +1769,6 @@ static gboolean on_sim_get_isim_service_table(TelephonySim *sim,
        struct custom_data *ctx = user_data;
        struct tel_sim_ist *ist = NULL;
        CoreObject *co_sim = NULL;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SIM, "r"))
-               return TRUE;
 
        DBUS_SIM_GET_COSIM(invocation, co_sim, ctx->server);
        DBUS_SIM_CHECK_SIM_STATUS(invocation, GET_ISIM_SERVICE_TABLE, co_sim);

diff --git a/src/dtapi_sms.c b/src/dtapi_sms.c
index dfb7fac..4537afb 100644 (file)
--- a/src/dtapi_sms.c
+++ b/src/dtapi_sms.c
@@ -41,15 +41,11 @@ static gboolean on_sms_send_msg(TelephonySms *sms,
        struct treq_sms_send_msg req;
        struct custom_data *ctx = user_data;
        enum tcore_request_command command;
-       cynara *p_cynara = ctx->p_cynara;
 
        int i = 0;
        GVariantIter *iter = NULL;
        GVariant *inner_gv = NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "x"))
-               return TRUE;
-
        memset(&req, 0x0, sizeof(struct treq_sms_send_msg));
 
        if (SMS_NETTYPE_3GPP == format) {
@@ -103,10 +99,6 @@ static gboolean on_sms_read_msg(TelephonySms *sms,
 {
        struct treq_sms_read_msg req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
-               return TRUE;
 
        req.index = msg_index;
 
@@ -125,15 +117,10 @@ static gboolean on_sms_save_msg(TelephonySms *sms,
 {
        struct treq_sms_save_msg req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
        int i = 0;
        GVariantIter *iter = NULL;
        GVariant *inner_gv = NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "w"))
-               return TRUE;
-
        if (SMS_NETTYPE_3GPP == format) {
                req.msgDataPackage.format = SMS_NETTYPE_3GPP;
        } else if (SMS_NETTYPE_3GPP2 == format) {
@@ -185,10 +172,6 @@ static gboolean on_sms_delete_msg(TelephonySms *sms,
 {
        struct treq_sms_delete_msg req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "x"))
-               return TRUE;
 
        req.index = msg_index;
 
@@ -204,10 +187,6 @@ static gboolean on_sms_get_msg_count(TelephonySms *sms,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, sms, invocation,
@@ -222,10 +201,6 @@ static gboolean on_sms_get_sca(TelephonySms *sms,
 {
        struct treq_sms_get_sca req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
-               return TRUE;
 
        req.index = msg_index;
 
@@ -244,10 +219,6 @@ static gboolean on_sms_set_sca(TelephonySms *sms,
        gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "w"))
-               return TRUE;
 
        if ((sca_length <= 0)
                        || (sca_length > (SMS_MAX_SMS_SERVICE_CENTER_ADDR + 1))) {
@@ -296,10 +267,6 @@ static gboolean on_sms_get_cb_config(TelephonySms *sms,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, sms, invocation,
@@ -317,7 +284,6 @@ static gboolean on_sms_set_cb_config(TelephonySms *sms,
 {
        struct treq_sms_set_cb_config req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
 
        GVariant *value = NULL;
        GVariant *inner_gv = NULL;
@@ -326,9 +292,6 @@ static gboolean on_sms_set_cb_config(TelephonySms *sms,
        const gchar *key = NULL;
        int i = 0;
 
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "w"))
-               return TRUE;
-
        req.net3gppType = network_type;
        req.cbEnabled = enable_cb;
        req.msgIdMaxCount = msg_id_max_cnt;
@@ -372,10 +335,6 @@ static gboolean on_sms_set_mem_status(TelephonySms *sms,
 {
        struct treq_sms_set_mem_status req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "w"))
-               return TRUE;
 
        req.memory_status = memory_status;
 
@@ -391,10 +350,6 @@ static gboolean on_sms_get_pref_bearer(TelephonySms *sms,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, sms, invocation,
@@ -410,10 +365,6 @@ static gboolean on_sms_set_pref_bearer(TelephonySms *sms,
 {
        struct treq_sms_set_pref_bearer req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "w"))
-               return TRUE;
 
        req.svc = bearer_type;
 
@@ -433,7 +384,6 @@ static gboolean on_sms_set_delivery_report(TelephonySms *sms,
 {
        struct treq_sms_set_delivery_report req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
 
        guchar *decoded_sca = NULL;
        guchar *decoded_tpdu = NULL;
@@ -441,9 +391,6 @@ static gboolean on_sms_set_delivery_report(TelephonySms *sms,
        gsize decoded_sca_len = 0;
        gsize decoded_tpdu_len = 0;
 
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "w"))
-               return TRUE;
-
        memset(&req, 0, sizeof(struct treq_sms_set_delivery_report));
 
        if (SMS_NETTYPE_3GPP == format) {
@@ -512,10 +459,6 @@ static gboolean on_sms_set_msg_status(TelephonySms *sms,
 {
        struct treq_sms_set_msg_status req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "w"))
-               return TRUE;
 
        req.index = msg_index;
        req.msgStatus = msg_status;
@@ -534,10 +477,6 @@ static gboolean on_sms_get_sms_params(TelephonySms *sms,
 {
        struct treq_sms_get_params req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
-               return TRUE;
 
        req.index = msg_index;
 
@@ -561,15 +500,11 @@ static gboolean on_sms_set_sms_params(TelephonySms *sms,
 {
        struct treq_sms_set_params req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
 
        int i = 0;
        GVariantIter *iter = NULL;
        GVariant *inner_gv = NULL;
 
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "w"))
-               return TRUE;
-
        memset(&req, 0x0, sizeof(struct treq_sms_set_params));
 
        req.params.recordIndex = record_index;
@@ -633,10 +568,6 @@ static gboolean on_sms_get_sms_param_cnt(TelephonySms *sms,
        GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
-               return TRUE;
 
        /* Dispatch request */
        dtapi_dispatch_request(ctx, sms, invocation,
@@ -653,10 +584,6 @@ static gboolean on_sms_get_sms_ready_status(TelephonySms *sms,
        CoreObject *co_sms = NULL;
        TcorePlugin *plugin = NULL;
        gboolean ready_status = FALSE;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SMS, "r"))
-               return TRUE;
 
        plugin = tcore_server_find_plugin(ctx->server, GET_CP_NAME(invocation));
        co_sms = tcore_plugin_ref_core_object(plugin, CORE_OBJECT_TYPE_SMS);

diff --git a/src/dtapi_ss.c b/src/dtapi_ss.c
index 3403976..dd08ac5 100644 (file)
--- a/src/dtapi_ss.c
+++ b/src/dtapi_ss.c
@@ -136,10 +136,6 @@ static gboolean on_ss_activate_barring(TelephonySs *ss,
        struct treq_ss_barring req;
        struct custom_data *ctx = user_data;
        char buf[MAX_SS_BARRING_PASSWORD_LEN + 1];
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "x"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_barring));
 
@@ -170,10 +166,6 @@ static gboolean on_ss_deactivate_barring(TelephonySs *ss,
        struct treq_ss_barring req;
        struct custom_data *ctx = user_data;
        char buf[MAX_SS_BARRING_PASSWORD_LEN + 1];
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "x"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_barring));
 
@@ -204,10 +196,6 @@ static gboolean on_ss_change_barring_password(TelephonySs *ss,
 {
        struct treq_ss_barring_change_password req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "x"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_barring_change_password));
 
@@ -230,10 +218,6 @@ static gboolean on_ss_get_barring_status(TelephonySs *ss,
 {
        struct treq_ss_barring req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "r"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_barring));
 
@@ -260,10 +244,6 @@ static gboolean on_ss_register_forwarding(TelephonySs *ss,
 {
        struct treq_ss_forwarding req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_forwarding));
 
@@ -295,10 +275,6 @@ static gboolean on_ss_deregister_forwarding(TelephonySs *ss,
 {
        struct treq_ss_forwarding req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_forwarding));
 
@@ -330,10 +306,6 @@ static gboolean on_ss_activate_forwarding(TelephonySs *ss,
 {
        struct treq_ss_forwarding req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_forwarding));
 
@@ -365,10 +337,6 @@ static gboolean on_ss_deactivate_forwarding(TelephonySs *ss,
 {
        struct treq_ss_forwarding req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_forwarding));
 
@@ -398,10 +366,6 @@ static gboolean on_ss_get_forwarding_status(TelephonySs *ss,
 {
        struct treq_ss_forwarding req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "r"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_forwarding));
 
@@ -424,10 +388,6 @@ static gboolean on_ss_activate_waiting(TelephonySs *ss,
 {
        struct treq_ss_waiting req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_waiting));
 
@@ -449,10 +409,6 @@ static gboolean on_ss_deactivate_waiting(TelephonySs *ss,
 {
        struct treq_ss_waiting req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_waiting));
 
@@ -474,10 +430,6 @@ static gboolean on_ss_get_waiting_status(TelephonySs *ss,
 {
        struct treq_ss_waiting req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "r"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_waiting));
 
@@ -499,10 +451,6 @@ static gboolean on_ss_set_cli_status(TelephonySs *ss,
 {
        struct treq_ss_set_cli req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "w"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_set_cli));
 
@@ -526,10 +474,6 @@ static gboolean on_ss_get_cli_status(TelephonySs *ss,
 {
        struct treq_ss_cli req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "r"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_cli));
 
@@ -553,10 +497,6 @@ static gboolean on_ss_send_ussd(TelephonySs *ss,
 {
        struct treq_ss_ussd req;
        struct custom_data *ctx = user_data;
-       cynara *p_cynara = ctx->p_cynara;
-
-       if (!check_access_control(p_cynara, invocation, AC_SS, "x"))
-               return TRUE;
 
        memset(&req, 0x0, sizeof(struct treq_ss_ussd));