From 6264a9b718583626e8fdcb9608afb8da759b0541 Mon Sep 17 00:00:00 2001 From: Jake Guffey Date: Wed, 20 Jun 2012 17:22:19 -0400 Subject: [PATCH 1/2] Don't use shadow passwords on FreeBSD shadow database doesn't exist by default in FreeBSD -- use "passwd" database --- conf/type/__user/explorer/shadow | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/conf/type/__user/explorer/shadow b/conf/type/__user/explorer/shadow index c75e36f4..a949ec51 100755 --- a/conf/type/__user/explorer/shadow +++ b/conf/type/__user/explorer/shadow @@ -22,6 +22,13 @@ # name=$__object_id +os="$($__explorer/os)" +# Default to using shadow passwords +database="shadow" -getent shadow "$name" || true +if [ "$os" = "freebsd" ]; then + database="passwd" +fi + +getent "$database" "$name" || true From 686554358a8f3b5eb64da8a4578d6d57e8fa62c9 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 25 Jun 2012 19:12:00 +0200 Subject: [PATCH 2/2] ++changes(2.0.14) Signed-off-by: Nico Schottelius --- doc/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/changelog b/doc/changelog index 9160a817..a70cdefe 100644 --- a/doc/changelog +++ b/doc/changelog @@ -7,6 +7,7 @@ Changelog 2.0.14: * Bugfix Type: __jail: Use correct variable (Jake Guffey) * Change Type: __jail: Parameter jailbase now optional (Jake Guffey) + * Bugfix Type: __user: Use passwd database on FreeBSD (Jake Guffey) * Bugfix Type: __start_on_boot: Do not change parameters * Feature __user: Added support for BSDs (Sébastien Gross) * New Type: __package_zypper