Snap for 10453563 from 7e036a35b97e10017097baccf25364398f5d62c8 to mainline-ipsec-releaseaml_ips_341611000aml_ips_341510000aml_ips_340914280aml_ips_340914200aml_ips_340914000

Change-Id: I496192f85814beb422a172da3659da506d097e42

3 files changed, 18 insertions, 9 deletions

diff --git a/METADATA b/METADATA
index c138456..78553e1 100644
--- a/METADATA
+++ b/METADATA
@@ -1,6 +1,19 @@
 name: "ppp"
-version: "2.4.7"
-
+description: "ppp (Paul's PPP Package) is an open source package which implements the Point-to-Point Protocol (PPP) on Linux and Solaris systems."
 third_party {
+  url {
+    type: HOMEPAGE
+    value: "https://ppp.samba.org/"
+  }
+  url {
+    type: ARCHIVE
+    value: "https://ftp.samba.org/pub/ppp/ppp-2.4.7.tar.gz"
+  }
+  version: "ppp-2.4.7"
   license_type: RESTRICTED
+  last_upgrade_date {
+    year: 2014
+    month: 12
+    day: 8
+  }
 }
diff --git a/README.version b/README.version
deleted file mode 100644
index 63223dc..0000000
--- a/README.version
+++ /dev/null
@@ -1,3 +0,0 @@
-URL: ftp://ftp.samba.org/pub/ppp/ppp-2.4.7.tar.gz
-Version: 2.4.7
-BugComponent: 36824
diff --git a/pppd/main.c b/pppd/main.c
index 09f5a53..df4e36c 100644
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -1735,10 +1735,9 @@ device_script(program, in, out, dont_wait)
     /* here we are executing in the child */
 
     setgid(getgid());
-    setuid(uid);
-    if (getuid() != uid) {
-	fprintf(stderr, "pppd: setuid failed\n");
-	exit(1);
+    if (setuid(uid) < 0) {
+        fprintf(stderr, "pppd: setuid failed: %s\n", strerror(errno));
+        exit(1);
     }
     update_system_environment();
 #if defined(__ANDROID__)