Merge "init: update permissions for VPN."

This commit is contained in:
Chia-chi Yeh 2011-07-10 16:16:06 -07:00 committed by Android (Google) Code Review
commit 56286d6fdb
2 changed files with 3 additions and 6 deletions

View file

@ -75,8 +75,6 @@ struct {
{ "wlan.", AID_SYSTEM, 0 },
{ "dhcp.", AID_SYSTEM, 0 },
{ "dhcp.", AID_DHCP, 0 },
{ "vpn.", AID_SYSTEM, 0 },
{ "vpn.", AID_VPN, 0 },
{ "debug.", AID_SHELL, 0 },
{ "log.", AID_SHELL, 0 },
{ "service.adb.root", AID_SHELL, 0 },

View file

@ -144,9 +144,8 @@ on post-fs-data
mkdir /data/misc/bluetooth 0770 system system
mkdir /data/misc/keystore 0700 keystore keystore
mkdir /data/misc/keychain 0771 system system
mkdir /data/misc/vpn 0770 system system
mkdir /data/misc/vpn 0770 system vpn
mkdir /data/misc/systemkeys 0700 system system
mkdir /data/misc/vpn/profiles 0770 system system
# give system access to wpa_supplicant.conf for backup and restore
mkdir /data/misc/wifi 0770 wifi wifi
chmod 0660 /data/misc/wifi/wpa_supplicant.conf
@ -462,8 +461,8 @@ service flash_recovery /system/etc/install-recovery.sh
service racoon /system/bin/racoon
class main
socket racoon stream 600 system system
# racoon will setuid to vpn after getting necessary resources.
group net_admin
# IKE uses UDP port 500. Racoon will setuid to vpn after binding the port.
group vpn net_admin
disabled
oneshot