summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/User.hs
diff options
context:
space:
mode:
authorJoey Hess2015-09-14 20:23:08 -0400
committerJoey Hess2015-09-14 20:23:08 -0400
commite5c398a0f6dfc65d56c2dcdf2e8bbf031579ef38 (patch)
treec76125aaf059f4acaab6a32c3cfc223e5294c787 /src/Propellor/Property/User.hs
parent0f9f05ae9e65182daa9bfc98a9932e2e1382e9b5 (diff)
parentfb7b1826870c8a0e01f88da74ff2fd98a0626d5b (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/User.hs')
-rw-r--r--src/Propellor/Property/User.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/User.hs b/src/Propellor/Property/User.hs
index add3ae52..c029999f 100644
--- a/src/Propellor/Property/User.hs
+++ b/src/Propellor/Property/User.hs
@@ -58,8 +58,8 @@ hasPassword' (User u) context = go `requires` shadowConfig True
setPassword :: (((PrivDataField, PrivData) -> Propellor Result) -> Propellor Result) -> Propellor Result
setPassword getpassword = getpassword $ go
where
- go (Password user, password) = set user password []
- go (CryptPassword user, hash) = set user hash ["--encrypted"]
+ go (Password user, password) = set user (privDataVal password) []
+ go (CryptPassword user, hash) = set user (privDataVal hash) ["--encrypted"]
go (f, _) = error $ "Unexpected type of privdata: " ++ show f
set user v ps = makeChange $ withHandle StdinHandle createProcessSuccess