GitLab

Change-Id: Iede478bc19d5979417492d172288e6b1267ca5f1

Change-Id: I4683e60ae455b68496aff88734a065ca50c56ef2

Bug: 2325838
Change-Id: I2e1df5a71aead40063f82cc0dda222f370ad4043

Merge commit '6e2a095b'

* commit '6e2a095b':
  pppd: Implement ip-up-vpn to modify routing table when vpn is up.

Merge commit 'dffa1806'

* commit 'dffa1806':
  pppd: Remove the UID check to allow running as a non-root user.

It is safe because it will not work without proper capabilities.
Allowing privileged options is also safe for the same reason.

Merge commit '12f72b25'

* commit '12f72b25':
  Few changes to pppd for VPN.

1. Remove TARGET_OUT_OPTIONAL_EXECUTABLES from Android.mk
   since pppd is now required by VPN, no longer optinoal.
2. Avoid creating pid files.
3. Use linkname as a suffix of program names which allows
   different users to run different set of scripts. E.g.
   if linkname is "vpn", "/etc/ppp/ip-up-vpn" is executed.

Merge commit '821c6079'

* commit '821c6079':
  Fix few minor things in pppd.

1. Undo some changes about running scripts.
2. Move android logging from logit() to log_write().
3. Remove all syslog() related calls.

Merge commit 'af399d90'

* commit 'af399d90':
  pppd: Enable MPPE in Android.mk.

Merge commit '0d2480fe'

* commit '0d2480fe':
  Add system property for ip-up script to get system properties.

Merge commit 'a4d7bac2'

* commit 'a4d7bac2':
  Remove the eng tag, the VPN will need pppd in user build.

Merge commit '673ef9b9'

* commit '673ef9b9':
  Bind the logging to logit() since pppd uses special expressions such as "%I"

Merge commit 'a263473d'

* commit 'a263473d':
  1. Add a new option 'pppox <n>' to support PPPoX sockets. Note that using this

which __android_log_vprint() does not understand.

   will make all terminal-specific options unrecognized. (see tty.c)
2. Remove libssl and ipxcp.c from Android.mk. We do not need them.

Merge commit 'e7f221f1'

* commit 'e7f221f1':
  This change is for enabling the pppd for vpn authentication and setup.

It includes:
  1. Enable the CHAPMS authentication for talking to MS vpn server.
  2. Reuse the message digest/hashing functions in openssl instead of
     the md4, md5 and sha1 functions in the package to save the space.
  3. Enable the execution the ip-up/ip-down script on Android.

Update: add comment and replace tab with spaces.