[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: get-ldap-ltsp-config: Fix extraction of ltspConfig from LDAP.

[Dominik George]

Dominik George pushed to branch master at Debian Edu / debian-edu-config


Commits:
c67e1808 by Dominik George at 2019-03-01T12:17:38Z
get-ldap-ltsp-config: Fix extraction of ltspConfig from LDAP.

lts.conf values can very well contain spaces.

- - - - -
4340da45 by Dominik George at 2019-03-01T12:19:11Z
Update changelog.

- - - - -


2 changed files:

- debian/changelog
- share/ltsp/get-ldap-ltsp-config


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,7 @@
 debian-edu-config (2.10.62) unstable; urgency=medium
 
   * get-ldap-ltsp-config: Fix detection of MAC address.
+  * get-ldap-ltsp-config: Fix extraction of ltspConfig from LDAP.
   * update-hostname-from-ip: Always print hostname if -n is used.
   * Add myself as Uploader.
 


=====================================
share/ltsp/get-ldap-ltsp-config
=====================================
@@ -76,7 +76,7 @@ HOSTNAME=$(/usr/sbin/update-hostname-from-ip -m -n)
 setup_from_ldap() {
     filter="(&(ltspConfig=*)$1)"
     config="$(ldapsearch -h "$LDAP_HOST" -b "$BASE_DN" -x "$filter" ltspConfig | \
-	    awk '/^ltspConfig: [^=]*=[^;]*$/ { print $2 }')"
+	    grep -Po '(?<=^ltspConfig: ).*')"
     if [ "$config" ] ; then
 	if eval "$config" ; then
             echo "$config" >> $cachefile



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/f88239d81121a030b821882615cb4f37d22bd518...4340da45784559c4969bec4917e05ef40d32c040

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/f88239d81121a030b821882615cb4f37d22bd518...4340da45784559c4969bec4917e05ef40d32c040
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20190301/bebed8ae/attachment.html>