diff options
| author | Nick Kralevich <nnk@google.com> | 2010-10-21 11:50:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 11:50:55 -0700 |
| commit | 9a430d8c0e376160f287e50cdad99177e69ec384 (patch) | |
| tree | ffe9768e8153728914a31aa79ef8e76b1e7f7b47 /cmds | |
| parent | 33051ad1785a84ad5d814d6acf337b54d5fab36c (diff) | |
| parent | 62d0970c82f9a2c17aea67379c207a3f17556c46 (diff) | |
| download | frameworks_base-9a430d8c0e376160f287e50cdad99177e69ec384.zip frameworks_base-9a430d8c0e376160f287e50cdad99177e69ec384.tar.gz frameworks_base-9a430d8c0e376160f287e50cdad99177e69ec384.tar.bz2 | |
am 62d0970c: Merge "allow dumpstate to work for non-root users." into gingerbread
Merge commit '62d0970c82f9a2c17aea67379c207a3f17556c46' into gingerbread-plus-aosp
* commit '62d0970c82f9a2c17aea67379c207a3f17556c46':
allow dumpstate to work for non-root users.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/dumpstate/dumpstate.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c index 822f62d..0723f67 100644 --- a/cmds/dumpstate/dumpstate.c +++ b/cmds/dumpstate/dumpstate.c @@ -216,19 +216,21 @@ int main(int argc, char *argv[]) { fclose(cmdline); } - /* switch to non-root user and group */ - gid_t groups[] = { AID_LOG, AID_SDCARD_RW, AID_MOUNT }; - if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) { - LOGE("Unable to setgroups, aborting: %s\n", strerror(errno)); - return -1; - } - if (setgid(AID_SHELL) != 0) { - LOGE("Unable to setgid, aborting: %s\n", strerror(errno)); - return -1; - } - if (setuid(AID_SHELL) != 0) { - LOGE("Unable to setuid, aborting: %s\n", strerror(errno)); - return -1; + if (getuid() == 0) { + /* switch to non-root user and group */ + gid_t groups[] = { AID_LOG, AID_SDCARD_RW, AID_MOUNT }; + if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) { + LOGE("Unable to setgroups, aborting: %s\n", strerror(errno)); + return -1; + } + if (setgid(AID_SHELL) != 0) { + LOGE("Unable to setgid, aborting: %s\n", strerror(errno)); + return -1; + } + if (setuid(AID_SHELL) != 0) { + LOGE("Unable to setuid, aborting: %s\n", strerror(errno)); + return -1; + } } char path[PATH_MAX], tmp_path[PATH_MAX]; |