From 1326b7afc2b3ca6a281ade97d7c577cfd4270479 Mon Sep 17 00:00:00 2001 From: B Stack Date: Fri, 17 Apr 2020 15:23:18 -0400 Subject: update paths for current and near-future bgscripts --- src/usr/share/doc/laps/changes | 3 +++ src/usr/share/laps/laps.sh | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/usr/share') diff --git a/src/usr/share/doc/laps/changes b/src/usr/share/doc/laps/changes index c7067e3..5860000 100644 --- a/src/usr/share/doc/laps/changes +++ b/src/usr/share/doc/laps/changes @@ -13,3 +13,6 @@ * Thu Jul 18 2019 B Stack - 0.0.5-1 - move library functions out of laps + +* Fri Apr 17 2020 Ben Stack - unreleased +- add support for libexec/ path 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" -- cgit From 14ecb4ea7513d9fd528c374db176eedd8da72233 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 22 Mar 2021 15:20:18 -0400 Subject: version bump and rename .cron file Fix #10, #11, and #12 --- src/usr/share/doc/laps/changes | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/usr/share') diff --git a/src/usr/share/doc/laps/changes b/src/usr/share/doc/laps/changes index c7067e3..9c842eb 100644 --- a/src/usr/share/doc/laps/changes +++ b/src/usr/share/doc/laps/changes @@ -11,5 +11,10 @@ - fix #6 document the -i interactive flag - fix #7 add LAPS_KINIT_HOST_SCRIPT_OPTS -* Thu Jul 18 2019 B Stack - 0.0.5-1 +* Thu Jul 18 2019 B Stack - 0.0.4-2 - move library functions out of laps + +* Mon Mar 22 2021 B. Stack - 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 -- cgit