From b59dca4eeb3073e793f2f42d8df58d480e3ff1c3 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 15 Nov 2013 18:49:56 +0600 Subject: [PATCH] Made it so public keys are stored in files with .pub extension It is an attempt to solve issues with missing permissions on pahabricator users. --- scripts/gitadmin/rebuild_gitadmin.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/gitadmin/rebuild_gitadmin.php b/scripts/gitadmin/rebuild_gitadmin.php index 7f307f86a5..dca9e7e686 100755 --- a/scripts/gitadmin/rebuild_gitadmin.php +++ b/scripts/gitadmin/rebuild_gitadmin.php @@ -53,7 +53,7 @@ function handleSingleUserPHID( $key->getKeyType().' '. $key->getKeyBody().' '. $key->getKeyComment()."\n"; - file_put_contents("$keydir/$member", $full_key_content); + file_put_contents("$keydir/$member.pub", $full_key_content); } } return $members; @@ -121,7 +121,8 @@ function removeUnusedPublicKeys($keydir, $used_keys) { $files = scandir($keydir); foreach ($files as $file) { if (startswith($file, "PHAB")) { - if (!array_key_exists($file, $used_keys)) { + $member = basename($file, '.pub'); + if (!array_key_exists($member, $used_keys)) { unlink("$keydir/$file"); } }