commit 570e1f790b3f449115b2f8ce276675007289f7ec
author Kenny Root <kroot@google.com> Fri Apr 12 11:42:15 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 12 11:42:15 2013 -0700
tree baaaf371ba857b1507ef740264d8f6d162945b67
parent 019f42fb8d0533d7801357d10fefef46d6882548
parent aae26fc0e58c99ac8e0df69b913523e81fa15d66

am aae26fc0: keystore: fix bug in clear_uid

* commit 'aae26fc0e58c99ac8e0df69b913523e81fa15d66':
  keystore: fix bug in clear_uid

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 482e21b..84f5794 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -2078,7 +2078,7 @@
                 }
             }
 
-            if (unlinkat(dirfd(dir), filename.string(), 0) && errno != ENOENT) {
+            if (unlinkat(dirfd(dir), file->d_name, 0) && errno != ENOENT) {
                 rc = ::SYSTEM_ERROR;
                 ALOGW("couldn't unlink %s", filename.string());
             }