From 9bb4d411e01c8e6330b5c27c489485592360576b Mon Sep 17 00:00:00 2001 From: Chia-chi Yeh Date: Fri, 8 Jul 2011 20:03:03 -0700 Subject: [PATCH] init: update permissions for VPN. VPN no longer uses system properties to keep network parameters. Besides, profiles are now stored and encrypted by keystore. Change-Id: I7575f04f350b7d8d5ba7008eb874a72180d057e8 --- init/property_service.c | 2 -- rootdir/init.rc | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/init/property_service.c b/init/property_service.c index d2f174d79..046b1204b 100644 --- a/init/property_service.c +++ b/init/property_service.c @@ -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 }, diff --git a/rootdir/init.rc b/rootdir/init.rc index 2cc81c6cb..3055bbbb3 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -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 @@ -461,8 +460,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