aboutsummaryrefslogtreecommitdiff
path: root/cmd/fscrypt/commands.go
diff options
context:
space:
mode:
authorJoseph Richey <joerichey@google.com>2017-09-01 02:23:53 -0700
committerGitHub <noreply@github.com>2017-09-01 02:23:53 -0700
commit0879b8ffcbbac29c282084eea2888194371113fa (patch)
tree8ff0b3562affc308939788c5e54708e284a014da /cmd/fscrypt/commands.go
parentb04d7ef31dc2e21f055b1b656efb9511e72db6c6 (diff)
parent0dfbbf62fae3d4051dd5f0686835ac393f8a0247 (diff)
Merge pull request #56 from google/panicsv0.2.10.2.1
Fixed failures in PAM module
Diffstat (limited to 'cmd/fscrypt/commands.go')
-rw-r--r--cmd/fscrypt/commands.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/fscrypt/commands.go b/cmd/fscrypt/commands.go
index 43c9cb0..fd90626 100644
--- a/cmd/fscrypt/commands.go
+++ b/cmd/fscrypt/commands.go
@@ -119,7 +119,7 @@ func encryptAction(c *cli.Context) error {
// keyring unless --skip-unlock is used. On failure, an error is returned, any
// metadata creation is reverted, and the directory is unmodified.
func encryptPath(path string) (err error) {
- target, err := parseUserFlag()
+ target, err := parseUserFlag(!skipUnlockFlag.Value)
if err != nil {
return
}
@@ -274,7 +274,7 @@ func unlockAction(c *cli.Context) error {
return expectedArgsErr(c, 1, false)
}
- target, err := parseUserFlag()
+ target, err := parseUserFlag(true)
if err != nil {
return newExitError(c, err)
}
@@ -357,7 +357,7 @@ func purgeAction(c *cli.Context) error {
}
}
- target, err := parseUserFlag()
+ target, err := parseUserFlag(true)
if err != nil {
return newExitError(c, err)
}
@@ -507,7 +507,7 @@ func createProtectorAction(c *cli.Context) error {
return expectedArgsErr(c, 1, false)
}
- target, err := parseUserFlag()
+ target, err := parseUserFlag(false)
if err != nil {
return newExitError(c, err)
}