commit 91217ca5cbbf3ca2a96d596713e79f072da2c491
author Android (Google) Code Review <android-gerrit@google.com> Thu Jul 02 14:24:58 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Jul 02 14:24:58 2009 -0700
tree 59a8a6d940db04b36049d5d2b4a87b55d9f97bdb
parent 79258b8b5a74d804f877a03095d553bdd129cd9f
parent 5c49135b032235f82560d5e55b0e4c547506516b

am 5c49135b: Merge change 5852 into donut

Merge commit '5c49135b032235f82560d5e55b0e4c547506516b'

* commit '5c49135b032235f82560d5e55b0e4c547506516b':
  rootdir: Modify init.rc to run mtpd/racoon as a non-root user.

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 18db10e..7b591fc 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -289,13 +289,17 @@
 service flash_recovery /system/bin/flash_image recovery /system/recovery.img
     oneshot
 
-service racoon /system/bin/racoon -F -f /etc/racoon/racoon.conf
+service racoon /system/bin/racoon
     socket racoon stream 600 system system
+    # racoon will setuid to vpn after getting necessary resources.
+    group net_admin keystore
     disabled
     oneshot
 
 service mtpd /system/bin/mtpd
     socket mtpd stream 600 system system
+    user vpn
+    group vpn net_admin net_raw
     disabled
     oneshot