hasSomePassword and hasPassword now check to make sure shadow passwords are enabled.

1 files changed, 9 insertions, 7 deletions

diff --git a/src/Propellor/Property/User.hs b/src/Propellor/Property/User.hs
index ccb69b24..5c8e768c 100644
--- a/src/Propellor/Property/User.hs
+++ b/src/Propellor/Property/User.hs
@@ -44,13 +44,15 @@ hasPassword user = property (user ++ "has password") $ do
 	ensureProperty $ hasPassword' user (Context hostname)
 
 hasPassword' :: UserName -> Context -> Property
-hasPassword' user context = withPrivData (Password user) context $ \getpassword ->
-	property (user ++ " has password") $
-		getpassword $ \password -> makeChange $
-			withHandle StdinHandle createProcessSuccess
-				(proc "chpasswd" []) $ \h -> do
-					hPutStrLn h $ user ++ ":" ++ password
-					hClose h
+hasPassword' user context = go `requires` shadowConfig True
+  where
+	go = withPrivData (Password user) context $ \getpassword ->
+		property (user ++ " has password") $
+			getpassword $ \password -> makeChange $
+				withHandle StdinHandle createProcessSuccess
+					(proc "chpasswd" []) $ \h -> do
+						hPutStrLn h $ user ++ ":" ++ password
+						hClose h
 
 lockedPassword :: UserName -> Property
 lockedPassword user = check (not <$> isLockedPassword user) $ cmdProperty "passwd"