Merge branch 'nogetent-user' into 'master'

[__user] Fall back to /etc files if getent(1) is not available

See merge request ungleich-public/cdist!795

cdist/conf/type/__user/explorer/group

@@ -23,11 +23,9 @@
 
 if [ -f "$__object/parameter/gid" ]; then
    gid=$(cat "$__object/parameter/gid")
-   getent=$(command -v getent)
+   if command -v getent >/dev/null; then
-   if [ X != X"${getent}" ]; then
+      getent group "$gid" || true
-      "${getent}" group "$gid" || true
    elif [ -f /etc/group ]; then
       grep -E "^(${gid}|([^:]+:){2}${gid}):" /etc/group || true
    fi
 fi
-

cdist/conf/type/__user/explorer/passwd

@@ -23,9 +23,8 @@
 
 name=$__object_id
 
-getent=$(command -v getent)
+if command -v getent >/dev/null; then
-if [ X != X"${getent}" ]; then
+  getent passwd "$name" || true
-  "${getent}" passwd "$name" || true
 elif [ -f /etc/passwd ]; then
   grep "^${name}:" /etc/passwd || true
 fi

cdist/conf/type/__user/explorer/shadow

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 #
 # 2011 Steven Armstrong (steven-cdist at armstrong.cc)
 #
@@ -22,18 +22,19 @@
 #
 
 name=$__object_id
-os="$("$__explorer/os")"
-# Default to using shadow passwords
-database="shadow"
 
-case "$os" in
+case $("$__explorer/os") in
-  "freebsd"|"netbsd"|"openbsd")  database="passwd";;
+  'freebsd'|'netbsd'|'openbsd')
+    database='passwd'
+    ;;
+  # Default to using shadow passwords
+  *)
+    database='shadow'
+    ;;
 esac
 
-
+if command -v getent >/dev/null; then
-getent=$(command -v getent)
+  getent "$database" "$name" || true
-if [ X != X"${getent}" ]; then
-  "${getent}" "$database" "$name" || true
 elif [ -f /etc/shadow ]; then
   grep "^${name}:" /etc/shadow || true
 fi