diff options
| author | B Stack <bgstack15@gmail.com> | 2019-01-31 15:21:39 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-01-31 15:21:39 +0000 |
| commit | 56b9f5bb1a329f271d54dc1965b25ce4d63a1307 (patch) | |
| tree | 4d7c13f98316bd1d4e8c065cd33f245ac8152165 | |
| parent | Update laps.conf.example for bgscripts-core-1.4.0 directory change (diff) | |
| parent | Add ubuntu support (diff) | |
| download | laps-56b9f5bb1a329f271d54dc1965b25ce4d63a1307.tar.gz laps-56b9f5bb1a329f271d54dc1965b25ce4d63a1307.tar.bz2 laps-56b9f5bb1a329f271d54dc1965b25ce4d63a1307.zip | |
Merge branch 'master' into 'master'
Add Ubuntu support
See merge request bgstack15/laps!3
| -rwxr-xr-x | src/usr/share/laps/laps.sh | 6 |
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 |