Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56286d6f authored by Chia-chi Yeh's avatar Chia-chi Yeh Committed by Android (Google) Code Review
Browse files

Merge "init: update permissions for VPN."

parents 1ac6ddeb 9bb4d411

init/property_service.c

+0 −2
Original line number Diff line number Diff line
@@ -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 },

rootdir/init.rc

+3 −4
Original line number Diff line number Diff line
@@ -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