diff options
| author | B Stack <bgstack15@gmail.com> | 2021-03-22 15:26:36 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2021-03-22 15:26:36 -0400 |
| commit | 4238d00f7b49723511cb13b0597fe873a6cf9d01 (patch) | |
| tree | c9af98a11a638f5514f96814190ff3b84803b120 | |
| parent | version bump and rename .cron file (diff) | |
| parent | Merge branch 'dev' of https://gitlab.com/bgstack15/laps into dev (diff) | |
| download | laps-4238d00f7b49723511cb13b0597fe873a6cf9d01.tar.gz laps-4238d00f7b49723511cb13b0597fe873a6cf9d01.tar.bz2 laps-4238d00f7b49723511cb13b0597fe873a6cf9d01.zip | |
Bring in unreleased changes from 2020dev
| -rw-r--r-- | src/usr/share/doc/laps/changes | 9 | ||||
| -rwxr-xr-x | src/usr/share/laps/laps.sh | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/usr/share/doc/laps/changes b/src/usr/share/doc/laps/changes index 9c842eb..484ad4c 100644 --- a/src/usr/share/doc/laps/changes +++ b/src/usr/share/doc/laps/changes @@ -14,7 +14,10 @@ * Thu Jul 18 2019 B Stack <bgstack15@gmail.com> - 0.0.4-2 - move library functions out of laps +* Fri Apr 17 2020 Ben Stack <bgstack15@gmail.com> - unreleased +- add support for libexec/ path + * Mon Mar 22 2021 B. Stack <bgstack15@gmail.com> - 0.0.5-1 -- Depend on bgscripts lib that provides library fix for shldap (Fix #10) -- Fix #11 (laps 0.0.5 rpm) -- Fix #12 70_laps.cron name is invalid on Debian-based distros +- Fix #10: Depend on bgscripts version that fixes shldap lib +- Fix #11: laps 0.0.5 rpm +- Fix #12: 70_laps.cron name is invalid on Debian-based distros diff --git a/src/usr/share/laps/laps.sh b/src/usr/share/laps/laps.sh index 1023dc4..d561c55 100755 --- a/src/usr/share/laps/laps.sh +++ b/src/usr/share/laps/laps.sh @@ -341,6 +341,7 @@ while read flocation ; do if test -e ${flocation} ; then __thisfver="$( sh ${flo /usr/share/bgscripts/framework.sh /usr/share/laps/dependencies/framework.sh /usr/share/laps/framework.sh +/usr/libexec/bgscripts/framework.sh EOFLOCATIONS test -z "${frameworkscript}" && echo "$0: framework not found. Aborted." 1>&2 && exit 4 @@ -384,6 +385,7 @@ ${LAPS_SHLDAP} ${SHLDAP} /usr/share/bgscripts/shldap.sh /usr/lib/bgscripts/shldap.sh +/usr/libexec/bgscripts/shldap.sh EOFSENDSH test "${setvalout}" = "critical-fail" && ferror "${scriptfile}: 4. LAPS_SHLDAP not found. Aborted." && exit 4 LAPS_SHLDAP_MINIMUM=20190717 @@ -442,9 +444,9 @@ test -z "${LAPS_LDAPMODIFY_STATUS_TMPFILE}" && LAPS_LDAPMODIFY_STATUS_TMPFILE="$ test -z "${LAPS_LDAPSEARCH_STATUS_TMPFILE}" && LAPS_LDAPSEARCH_STATUS_TMPFILE="$( TMPDIR="${LAPS_TMPDIR}" mktemp )" test -z "${LAPS_PASSWORD_STATUS_TMPFILE}" && LAPS_PASSWORD_STATUS_TMPFILE="$( TMPDIR="${LAPS_TMPDIR}" mktemp )" #test -z "${LAPS_TMPFILE1}" && LAPS_TMPFILE1="$( TMPDIR="${LAPS_TMPDIR}" mktemp )" -define_if_new LAPS_KINIT_HOST_SCRIPT "/usr/share/bgscripts/work/kinit-host.sh" +define_if_new LAPS_KINIT_HOST_SCRIPT "/usr/bin/kinit-host" define_if_new LAPS_KINIT_HOST_SCRIPT_OPTS "" -define_if_new LAPS_KINIT_HOST_SCRIPT_DEFAULT "/usr/share/bgscripts/work/kinit-host.sh" +define_if_new LAPS_KINIT_HOST_SCRIPT_DEFAULT "/usr/bin/kinit-host" define_if_new LAPS_KLIST_BIN "/usr/bin/klist" define_if_new LAPS_KINIT_BIN "/usr/bin/kinit" define_if_new LAPS_LDAPSEARCH_BIN "/usr/bin/ldapsearch" |