summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2019-10-12 15:26:23 -0400
committerAndrew Cady <d@jerkface.net>2019-10-12 15:26:23 -0400
commit95ccde94127220c6f4d350985aeca71ab89c2ec1 (patch)
tree372f675a61e3e8ae531a3a414bba3c5a777088ac
parentf7618a96c8d97a6e753ed50342a8dbe1c1d384de (diff)
Revert "Give useful error when kiki init is non-root."
This reverts commit 1da6145352f403a880890266ca79b57c992cb0dc.
-rw-r--r--kiki.hs14
1 files changed, 1 insertions, 13 deletions
diff --git a/kiki.hs b/kiki.hs
index 6b3d36e..5bd6951 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -43,7 +43,6 @@ import qualified Data.Map as Map
43import Control.Arrow (first,second) 43import Control.Arrow (first,second)
44import Data.Monoid ( (<>) ) 44import Data.Monoid ( (<>) )
45import Data.Binary.Put 45import Data.Binary.Put
46import System.Posix.User
47 46
48import CommandLine 47import CommandLine
49import Data.OpenPGP.Util (verify, fingerprint, GenerateKeyParams(..)) 48import Data.OpenPGP.Util (verify, fingerprint, GenerateKeyParams(..))
@@ -1312,8 +1311,6 @@ kiki "merge" [] = do
1312 , " don't write)." 1311 , " don't write)."
1313 , "" 1312 , ""
1314 , " --create=(rsa:SIZE|cmd:CMD)" 1313 , " --create=(rsa:SIZE|cmd:CMD)"
1315 , " Note: With --flow=spill, a dummy file name must still be"
1316 , " provided so that the command line can be parsed."
1317 , "" 1314 , ""
1318 , " --autosign[=no]" 1315 , " --autosign[=no]"
1319 , "" 1316 , ""
@@ -1536,16 +1533,7 @@ kiki "init" args | "--help" `elem` args = do
1536 , "" 1533 , ""
1537 ] ++ documentHomeDir ++ [""] ++ documentPassphraseFDFlag True True True 1534 ] ++ documentHomeDir ++ [""] ++ documentPassphraseFDFlag True True True
1538 1535
1539kiki "init" args = do 1536kiki "init" args = run args $ importAndRefresh <$> dashdashChroot <*> dashdashHomedir <*> dashdashCipher
1540 rootOK <- case runArgs ([],args) dashdashChroot of
1541 Left e -> hPutStrLn stderr (usageErrorMessage e) >> return False
1542 Right root -> if root "x" /= root "x"
1543 then return True
1544 else fmap (==0) $ getEffectiveUserID
1545 if rootOK
1546 then run args $ importAndRefresh <$> dashdashChroot <*> dashdashHomedir <*> dashdashCipher
1547 else do hPutStrLn stderr "Missing --chroot option. Permision denied."
1548 exitFailure
1549kiki "spawn" args | "--help" `elem` args = 1537kiki "spawn" args | "--help" `elem` args =
1550 putStr . unlines $ 1538 putStr . unlines $
1551 [ "kiki spawn [ --passphrase-fd=FD" 1539 [ "kiki spawn [ --passphrase-fd=FD"