summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-03-17 15:46:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-17 15:46:19 +0000
commit8299ff701b66caf513e6cc8807b413bf44b8c2f6 (patch)
tree67ff4da785ba80b62e0b8d0a51d1ac7f566667db
parenta4961e66b539d69b7656d93db05371b20efc8f3b (diff)
parent0aff05eb8c23eefb770eb1ecd93e1d39dbab52f5 (diff)
downloadsystem_core-8299ff701b66caf513e6cc8807b413bf44b8c2f6.zip
system_core-8299ff701b66caf513e6cc8807b413bf44b8c2f6.tar.gz
system_core-8299ff701b66caf513e6cc8807b413bf44b8c2f6.tar.bz2
Merge "init: 64-bit build issue" into klp-volantis-dev
-rw-r--r--init/property_service.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/init/property_service.c b/init/property_service.c
index ff22677..db5a45b 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -540,8 +540,9 @@ static void load_persistent_properties()
|| (sb.st_uid != 0)
|| (sb.st_gid != 0)
|| (sb.st_nlink != 1)) {
- ERROR("skipping insecure property file %s (uid=%lu gid=%lu nlink=%d mode=%o)\n",
- entry->d_name, sb.st_uid, sb.st_gid, sb.st_nlink, sb.st_mode);
+ ERROR("skipping insecure property file %s (uid=%u gid=%u nlink=%d mode=%o)\n",
+ entry->d_name, (unsigned int)sb.st_uid, (unsigned int)sb.st_gid,
+ sb.st_nlink, sb.st_mode);
close(fd);
continue;
}