aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Druyan <paveld@il.ibm.com>2019-01-21 20:33:01 +0200
committerPavel Druyan <paveld@il.ibm.com>2019-01-21 20:33:01 +0200
commite741c28b99ea6b15c14a598bfafe866a8322cdd1 (patch)
tree4d7c13f98316bd1d4e8c065cd33f245ac8152165
parentUpdate laps.conf.example for bgscripts-core-1.4.0 directory change (diff)
downloadlaps-e741c28b99ea6b15c14a598bfafe866a8322cdd1.tar.gz
laps-e741c28b99ea6b15c14a598bfafe866a8322cdd1.tar.bz2
laps-e741c28b99ea6b15c14a598bfafe866a8322cdd1.zip
Add ubuntu support
-rwxr-xr-xsrc/usr/share/laps/laps.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/usr/share/laps/laps.sh b/src/usr/share/laps/laps.sh
index f5fa48d..15280d3 100755
--- a/src/usr/share/laps/laps.sh
+++ b/src/usr/share/laps/laps.sh
@@ -373,7 +373,7 @@ wrapper_change_password() {
then
echo "0" > "${LAPS_PASSWORD_STATUS_TMPFILE}"
else
- ___wcp_stdout="$( echo "${___wcp_phrase}" | "${___wcp_passwd_bin}" --stdin "${___wcp_user}" ; echo "$?" > "${LAPS_PASSWORD_STATUS_TMPFILE}" )"
+ ___wcp_stdout="$( echo -e "$(echo ${___wcp_phrase})\n$(echo ${___wcp_phrase})" | "${___wcp_passwd_bin}" "${___wcp_user}" ; echo "$?" > "${LAPS_PASSWORD_STATUS_TMPFILE}" )"
fi
___wcp_passwd_result="$( cat "${LAPS_PASSWORD_STATUS_TMPFILE}" )"
@@ -655,8 +655,8 @@ define_if_new LAPS_TIMELIMIT "45 days"
define_if_new LAPS_PWGEN_SCRIPT "/usr/bin/pwmake"
define_if_new LAPS_PWGEN_FLAGS "130"
define_if_new LAPS_USER "floot"
-define_if_new LAPS_PASSWD_BIN "/bin/passwd"
-define_if_new LAPS_LOG_BIN "/bin/logger"
+define_if_new LAPS_PASSWD_BIN "$(which passwd)"
+define_if_new LAPS_LOG_BIN "$(which logger)"
define_if_new LAPS_LOG_FLAGS "-t laps -i -p authpriv.notice"
define_if_new LAPS_LOG_MSG "LAPS has updated the password for user ${LAPS_USER}"
define_if_new LAPS_TEST 0
bgstack15