wok diff nss_ldap/receipt @ rev 19100

Up firefox-official(46.0.1)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed May 04 10:58:00 2016 +0300 (2016-05-04)
parents 164fcaca1cd0
children 8dd8bab3f0ca
line diff
     1.1 --- a/nss_ldap/receipt	Sat Nov 30 20:43:45 2013 +0000
     1.2 +++ b/nss_ldap/receipt	Wed May 04 10:58:00 2016 +0300
     1.3 @@ -35,13 +35,13 @@
     1.4  
     1.5  post_install()
     1.6  {
     1.7 -	if [ -s $1/etc/openldap/slapd.conf ]; then
     1.8 -		suffix=$(awk '/^suffix/ { print $2 }' < $1/etc/openldap/slapd.conf | sed 's/"//g')
     1.9 -		rootdn=$(awk '/^rootdn/ { print $2 }' < $1/etc/openldap/slapd.conf | sed 's/"//g')
    1.10 -		rootpw=$(awk '/^rootpw/ { print $2 }' < $1/etc/openldap/slapd.conf)
    1.11 +	if [ -s "$1/etc/openldap/slapd.conf" ]; then
    1.12 +		suffix=$(awk '/^suffix/ { print $2 }' < "$1/etc/openldap/slapd.conf" | sed 's/"//g')
    1.13 +		rootdn=$(awk '/^rootdn/ { print $2 }' < "$1/etc/openldap/slapd.conf" | sed 's/"//g')
    1.14 +		rootpw=$(awk '/^rootpw/ { print $2 }' < "$1/etc/openldap/slapd.conf")
    1.15  		sed -i -e "s|binddn .*|binddn $rootdn|" \
    1.16  		       -e "s|bindpw .*|bindpw $rootpw|" \
    1.17 -		       -e "s|dc=padl,dc=com|$suffix|g" $1/etc/ldap.conf
    1.18 +		       -e "s|dc=padl,dc=com|$suffix|g" "$1/etc/ldap.conf"
    1.19  		cat <<EOT
    1.20  ------
    1.21  Suffix login DN and password are found in /etc/openldap/slapd.conf with suffix, rootdn and rootpw keywords: