diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 01:01:23 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 01:01:23 +0000 |
commit | 0c1e4b967a38426028a2c232453f34106071a723 (patch) | |
tree | b30a8127787df3331689292791ebfed219a91dee | |
parent | 27cdaec6c734ce19231c4677480b25767e10cd10 (diff) | |
parent | 7e036a35b97e10017097baccf25364398f5d62c8 (diff) | |
download | ppp-aml_cbr_341311010.tar.gz |
Snap for 10447354 from 7e036a35b97e10017097baccf25364398f5d62c8 to mainline-cellbroadcast-releaseaml_cbr_341710000aml_cbr_341610000aml_cbr_341510010aml_cbr_341410010aml_cbr_341311010aml_cbr_341110000aml_cbr_341011000aml_cbr_340914000android14-mainline-cellbroadcast-release
Change-Id: I6c8e8bb698424e48b69da2704c334182343f680c
-rw-r--r-- | METADATA | 17 | ||||
-rw-r--r-- | README.version | 3 | ||||
-rw-r--r-- | pppd/main.c | 7 |
3 files changed, 18 insertions, 9 deletions
@@ -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__) |