From 9075d78f6878907f676fda1062779c921b23ae59 Mon Sep 17 00:00:00 2001

From: Noriko Hosoi <nhosoi@redhat.com>

Date: Mon, 10 Aug 2015 17:04:25 -0700

Subject: [PATCH 42/45] Ticket #47511 - bashisms in 389-ds-base admin scripts

Description by mvocu (Thank you):

The shell scripts in 389-ds-base/ldap/admin/src/scripts use 'source'

to source common scripts; the 'source' keyword is bash-specific (or

c-shell, if memory serves). The interpreter is set to /bin/sh, which

is not guaranteed to be bash (and at least on Debian 7.1 it is dash).

The 'source' keyword can be replaced by '.', which should work.

The patch was provided by tjaalton@ubuntu.com (Thank you, Timo!).

https://fedorahosted.org/389/ticket/47511

Reviewed and tested by nhosoi@redhat.com.

(cherry picked from commit 2ce7a7334bcb89e47c0f5c544144aec37010a5b9)

(cherry picked from commit 49245911410cdd04bc53b00d8973c26defa5a37b)

---

 ldap/admin/src/initconfig.in              |  4 +-

 ldap/admin/src/scripts/DSSharedLib.in     | 92 +++++++++++++++----------------

 ldap/admin/src/scripts/bak2db.in          | 23 ++++----

 ldap/admin/src/scripts/db2bak.in          |  7 +--

 ldap/admin/src/scripts/db2index.in        |  4 +-

 ldap/admin/src/scripts/db2ldif.in         | 22 ++++----

 ldap/admin/src/scripts/dbverify.in        |  6 +-

 ldap/admin/src/scripts/dn2rdn.in          |  4 +-

 ldap/admin/src/scripts/ldif2db.in         |  4 +-

 ldap/admin/src/scripts/ldif2ldap.in       | 46 ++++++++--------

 ldap/admin/src/scripts/monitor.in         | 44 +++++++--------

 ldap/admin/src/scripts/restart-dirsrv.in  |  2 +-

 ldap/admin/src/scripts/restoreconfig.in   |  4 +-

 ldap/admin/src/scripts/saveconfig.in      |  6 +-

 ldap/admin/src/scripts/start-dirsrv.in    | 16 +++---

 ldap/admin/src/scripts/stop-dirsrv.in     | 14 ++---

 ldap/admin/src/scripts/suffix2instance.in |  6 +-

 ldap/admin/src/scripts/upgradedb.in       |  4 +-

 ldap/admin/src/scripts/upgradednformat.in |  6 +-

 ldap/admin/src/scripts/vlvindex.in        |  4 +-

 rpm/389-ds-base-git.sh                    |  2 +-

 rpm/add_patches.sh                        |  4 +-

 rpm/rpmverrel.sh                          |  2 +-

 wrappers/initscript.in                    | 26 +++------

 wrappers/ldap-agent-initscript.in         | 28 ++++------

 25 files changed, 181 insertions(+), 199 deletions(-)

diff --git a/ldap/admin/src/initconfig.in b/ldap/admin/src/initconfig.in

index 134e82c..7afa315 100644

--- a/ldap/admin/src/initconfig.in

+++ b/ldap/admin/src/initconfig.in

@@ -2,11 +2,11 @@

 OS=`uname -s`

 # use the new mt slab memory allocator on Solaris

 # this requires Solaris 9 update 3 or later

-if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then

+if [ "$OS" = "SunOS" ] && [ -f /usr/lib/libumem.so ] ; then

     LD_PRELOAD=/usr/lib/libumem.so

     export LD_PRELOAD

 fi

-if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then

+if [ "$OS" = "SunOS" ] && [ -f /usr/lib/64/libumem.so ] ; then

     LD_PRELOAD_64=/usr/lib/64/libumem.so

     export LD_PRELOAD_64

 fi

diff --git a/ldap/admin/src/scripts/DSSharedLib.in b/ldap/admin/src/scripts/DSSharedLib.in

index 3683696..8317c58 100644

--- a/ldap/admin/src/scripts/DSSharedLib.in

+++ b/ldap/admin/src/scripts/DSSharedLib.in

@@ -98,13 +98,13 @@ get_init_file()

     do

         inst_count=`expr $inst_count + 1`

         id=`normalize_server_id $configfile`

-        if [ -n "$servid" -a "$id" = "$servid" ]

+        if [ -n "$servid" ] && [ "$id" = "$servid" ]

         then

             # found it

             echo $configfile

             exit 0

         fi

-        if  [ $first == "yes" ]

+        if  [ $first = "yes" ]

         then

             instances=$id

             first="no"

@@ -114,7 +114,7 @@ get_init_file()

     done

     # server id not provided, check if there is only one instance

-    if [ -z "$servid" -a $inst_count -eq 1 ]

+    if [ -z "$servid" ] && [ $inst_count -eq 1 ]

     then

         # return the file

         echo $configfile

@@ -135,48 +135,44 @@ process_dse ()

     configdir=$1

     pid=$2

     file="$configdir/dse.ldif"

-    shopt -s nocasematch

-    OLD_IFC=$IFC

+    OLD_IFS=$IFS

     IFS=""

     while read -r LINE

     do

-        if [[ $LINE !=  \ * ]] && [ "$output" != "" ]

+        case $LINE in

+            ' '*)

+                ;;

+            *)

+                if [ -n "$output" ]

+                then

+                    echo "$output" >> /tmp/DSSharedLib.$pid

+                    output=""

+                fi

+                ;;

+        esac

+        if [ -n "$output" ]

         then

-            echo "$output" >> /tmp/DSSharedLib.$pid

-            output=""

-        fi

-        if [ "$output" != "" ] && [[ $LINE == \ * ]]

-        then

-            # continuation line, strip the space and append it

-            LINE=`echo "$LINE" | sed -e 's/^ //'`

-            output=$output$LINE

-        elif [[ $LINE == nsslapd-port* ]]

-        then

-            output=$LINE;

-        elif [[ $LINE == nsslapd-localhost* ]]

-        then

-            output=$LINE;

-        elif [[ $LINE == nsslapd-securePort* ]]

-        then

-            output=$LINE;

-        elif [[ $LINE == nsslapd-security* ]]

-        then

-            output=$LINE;

-        elif [[ $LINE == nsslapd-ldapilisten* ]]

-        then

-            output=$LINE;

-        elif [[ $LINE == nsslapd-ldapifilepath* ]]

-        then

-            output=$LINE;

-        elif [[ $LINE == nsslapd-rootdn* ]]

-        then

-            output=$LINE;

-        elif [[ $LINE == nsslapd-ldapiautobind* ]]

-        then

-            output=$LINE;

-        elif [[ $LINE == nsslapd-certdir* ]]

-        then

-            output=$LINE;

+            case $LINE in

+                ' '*)

+                    # continuation line, strip the space and append it

+                    LINE=`echo "$LINE" | sed -e 's/^ //'`

+                    output=$output$LINE

+                    ;;

+            esac

+        else

+            case $LINE in

+                nsslapd-certdir*|\

+                nsslapd-ldapiautobind*|\

+                nsslapd-ldapilisten*|\

+                nsslapd-ldapifilepath*|\

+                nsslapd-localhost*|\

+                nsslapd-port*|\

+                nsslapd-rootdn*|\

+                nsslapd-securePort*|\

+                nsslapd-security*)

+                    output=$LINE

+                    ;;

+            esac

         fi

     done < $file

@@ -194,19 +190,19 @@ check_protocol ()

     ldapi=$3

     openldap=$4

-    if [ "$protocol" == "LDAPI" ] && [ "$openldap" != "yes" ]; then

+    if [ "$protocol" = "LDAPI" ] && [ "$openldap" != "yes" ]; then

         echo ""

         exit

-    elif [ "$protocol" == "LDAPI" ] && [ "$ldapi" == "off" ]; then

+    elif [ "$protocol" = "LDAPI" ] && [ "$ldapi" = "off" ]; then

         echo ""

         exit

-    elif [ "$protocol" == "STARTTLS" ]; then

-        if [ "$security" == "" ] || [ "$security" == "off" ]; then

+    elif [ "$protocol" = "STARTTLS" ]; then

+        if [ -z "$security" ] || [ "$security" = "off" ]; then

             echo ""

             exit

         fi

-    elif [ "$protocol" == "LDAPS" ]; then

-        if [ "$security" == "" ] || [ "$security" == "off" ]; then

+    elif [ "$protocol" = "LDAPS" ]; then

+        if [ -z "$security" ] || [ "$security" = "off" ]; then

             echo ""

             exit

         fi

@@ -224,4 +220,4 @@ check_protocol ()

     fi

     echo "$protocol"

-}

\ No newline at end of file

+}

diff --git a/ldap/admin/src/scripts/bak2db.in b/ldap/admin/src/scripts/bak2db.in

index f0cede4..a2e54cc 100755

--- a/ldap/admin/src/scripts/bak2db.in

+++ b/ldap/admin/src/scripts/bak2db.in

@@ -1,6 +1,6 @@

 #!/bin/sh

-source @datadir@/@package_name@/data/DSSharedLib

+. @datadir@/@package_name@/data/DSSharedLib

 libpath_add "@libdir@/@package_name@/"

 libpath_add "@nss_libdir@"

@@ -26,15 +26,18 @@ if [ $# -lt 1 ] || [ $# -gt 7 ]

 then

     usage

     exit 1

-elif [[ $1 == -* ]]

-then

-    usage

-    exit 1

-else

-    archivedir=$1

-    shift

 fi

-    

+case $1 in

+    -*)

+        usage

+        exit 1

+        ;;

+    *)

+        archivedir=$1

+        shift

+        ;;

+esac

+

 while getopts "hn:Z:qd:vi:a:SD:" flag

 do

     case $flag in

@@ -55,7 +58,7 @@ do

 done

 initfile=$(get_init_file "@initconfigdir@" $servid)

-if [ $? == 1 ]

+if [ $? -eq 1 ]

 then

     usage

     echo "You must supply a valid server instance identifier.  Use -Z to specify instance name"

diff --git a/ldap/admin/src/scripts/db2bak.in b/ldap/admin/src/scripts/db2bak.in

index dacd7b0..1896c19 100755

--- a/ldap/admin/src/scripts/db2bak.in

+++ b/ldap/admin/src/scripts/db2bak.in

@@ -1,6 +1,6 @@

 #!/bin/sh

-source @datadir@/@package_name@/data/DSSharedLib

+. @datadir@/@package_name@/data/DSSharedLib

 libpath_add "@libdir@/@package_name@/"

 libpath_add "@nss_libdir@"

@@ -26,7 +26,6 @@ then

     usage

     exit 1

 fi

-

 if [ "$#" -gt 0 ]

 then

     if [[ $1 != -* ]]

@@ -56,7 +55,7 @@ done

 initfile=$(get_init_file "@initconfigdir@" $servid)

-if [ $? == 1 ]

+if [ $? -eq 1 ]

 then

     usage

     echo "You must supply a valid server instance identifier.  Use -Z to specify instance name"

@@ -67,7 +66,7 @@ fi

 servid=`normalize_server_id $initfile`

 . $initfile

-if [ -z $bak_dir ]

+if [ -z "$bak_dir" ]

 then

     bak_dir=@localstatedir@/lib/@PACKAGE_NAME@/slapd-$servid/bak/$servid-`date +%Y_%m_%d_%H_%M_%S`

 fi

diff --git a/ldap/admin/src/scripts/db2index.in b/ldap/admin/src/scripts/db2index.in

index a1321ea..2b76cd1 100755

--- a/ldap/admin/src/scripts/db2index.in

+++ b/ldap/admin/src/scripts/db2index.in

@@ -1,6 +1,6 @@

 #!/bin/sh

-source @datadir@/@package_name@/data/DSSharedLib

+. @datadir@/@package_name@/data/DSSharedLib

 libpath_add "@libdir@/@package_name@/"

 libpath_add "@nss_libdir@"

@@ -59,7 +59,7 @@ then

 fi

 initfile=$(get_init_file "@initconfigdir@" $servid)

-if [ $? == 1 ]

+if [ $? -eq 1 ]

 then

     usage

     echo "You must supply a valid server instance identifier.  Use -Z to specify instance name"

diff --git a/ldap/admin/src/scripts/db2ldif.in b/ldap/admin/src/scripts/db2ldif.in

index d7e0ff0..fcf73a0 100755

--- a/ldap/admin/src/scripts/db2ldif.in

+++ b/ldap/admin/src/scripts/db2ldif.in

@@ -1,6 +1,6 @@

 #!/bin/sh

-source @datadir@/@package_name@/data/DSSharedLib

+. @datadir@/@package_name@/data/DSSharedLib

 libpath_add "@libdir@/@package_name@/"

 libpath_add "@nss_libdir@"

@@ -39,7 +39,7 @@ make_ldiffile()

     be=""

     while [ "$1" != "" ]

     do

-        if [ "$1" = "-a" ]; then

+        if [ "x$1" = "x-a" ]; then

             shift

             if [ `expr "$1" : "/.*"` -gt 0 ]; then 

 	            if [ `expr "$1" : "/.*"` -gt 0 ]; then 

@@ -56,17 +56,17 @@ make_ldiffile()

                 shift 

                 return 0 

             fi

-        elif [ "$1" = "-n" ]; then

+        elif [ "x$1" = "x-n" ]; then

             shift

-            if [ "$be" = "" ]; then

+            if [ -z "$be" ]; then

                 be="$1"

             else

                 tmpbe="$be"

                 be="${tmpbe}-$1"

             fi

-        elif [ "$1" = "-s" ]; then

+        elif [ "x$1" = "x-s" ]; then

             shift

-            if [ "$1" != "" ]; then

+            if [ -n "$1" ]; then

                 rdn=`echo $1 | awk -F, '{print $1}'`

                 rdnval=`echo $rdn | awk -F= '{print $2}'`

                 if [ "$be" = "" ]; then

@@ -76,15 +76,15 @@ make_ldiffile()

                     be="${tmpbe}-$rdnval"

                 fi

             fi

-        elif [ "$1" = "-M" ]; then

+        elif [ "x$1" = "x-M" ]; then

             be=""

         fi

-        if [ "$1" != "" ]; then

+        if [ -n "$1" ]; then

             shift

         fi

     done

-    if [ "$be" = "" ]; then

+    if [ -z "$be" ]; then

         echo @localstatedir@/lib/@PACKAGE_NAME@/slapd-$servid/ldif/$servid-`date +%Y_%m_%d_%H%M%S`.ldif

     else

         echo @localstatedir@/lib/@PACKAGE_NAME@/slapd-$servid/ldif/$servid-${be}-`date +%Y_%m_%d_%H%M%S`.ldif

@@ -92,7 +92,7 @@ make_ldiffile()

     return 0

 }

-if [ "$#" -lt 2 ];

+if [ $# -lt 2 ];

 then

     usage

     exit 1

@@ -137,7 +137,7 @@ then

 fi

 initfile=$(get_init_file "@initconfigdir@" $servid)

-if [ $? == 1 ]

+if [ $? -eq 1 ]

 then

     usage

     echo "You must supply a valid server instance identifier.  Use -Z to specify instance name"

diff --git a/ldap/admin/src/scripts/dbverify.in b/ldap/admin/src/scripts/dbverify.in

index 461cc16..bbacc17 100755

--- a/ldap/admin/src/scripts/dbverify.in

+++ b/ldap/admin/src/scripts/dbverify.in

@@ -1,6 +1,6 @@

 #!/bin/sh

-source @datadir@/@package_name@/data/DSSharedLib

+. @datadir@/@package_name@/data/DSSharedLib

 libpath_add "@libdir@/@package_name@/"

 libpath_add "@nss_libdir@"

@@ -47,7 +47,7 @@ do

 done

 initfile=$(get_init_file "@initconfigdir@" $servid)

-if [ $? == 1 ]

+if [ $? -eq 1 ]

 then

     usage

     echo "You must supply a valid server instance identifier.  Use -Z to specify instance name"

@@ -58,7 +58,7 @@ fi

 . $initfile

 @sbindir@/ns-slapd dbverify -D $CONFIG_DIR $args

-if [ $display_version == "yes" ]; then

+if [ $display_version = "yes" ]; then

     exit 0

 fi

 if [ $? -eq 0 ]; then

diff --git a/ldap/admin/src/scripts/dn2rdn.in b/ldap/admin/src/scripts/dn2rdn.in

index 32a70c8..616969a 100755

--- a/ldap/admin/src/scripts/dn2rdn.in

+++ b/ldap/admin/src/scripts/dn2rdn.in

@@ -1,6 +1,6 @@

 #!/bin/sh

-source @datadir@/@package_name@/data/DSSharedLib

+. @datadir@/@package_name@/data/DSSharedLib

 libpath_add "@libdir@/@package_name@/"

 libpath_add "@nss_libdir@"

@@ -39,7 +39,7 @@ do

 done

 initfile=$(get_init_file "@initconfigdir@" $servid)

-if [ $? == 1 ]

+if [ $? -eq 1 ]

 then

     usage

     echo "You must supply a valid server instance identifier.  Use -Z to specify instance name"

diff --git a/ldap/admin/src/scripts/ldif2db.in b/ldap/admin/src/scripts/ldif2db.in

index ce15349..a34241a 100755

--- a/ldap/admin/src/scripts/ldif2db.in

+++ b/ldap/admin/src/scripts/ldif2db.in

@@ -1,6 +1,6 @@

 #!/bin/sh

-source @datadir@/@package_name@/data/DSSharedLib

+. @datadir@/@package_name@/data/DSSharedLib

 libpath_add "@libdir@/@package_name@/"

 libpath_add "@nss_libdir@"

@@ -82,7 +82,7 @@ do

 done

 initfile=$(get_init_file "@initconfigdir@" $servid)

-if [ $? == 1 ]

+if [ $? -eq 1 ]

 then

     usage

     echo "You must supply a valid server instance identifier.  Use -Z to specify instance name"

diff --git a/ldap/admin/src/scripts/ldif2ldap.in b/ldap/admin/src/scripts/ldif2ldap.in

index 874b1bb..1e871be 100755

--- a/ldap/admin/src/scripts/ldif2ldap.in

+++ b/ldap/admin/src/scripts/ldif2ldap.in

@@ -1,6 +1,6 @@

 #!/bin/sh

-source @datadir@/@package_name@/data/DSSharedLib

+. @datadir@/@package_name@/data/DSSharedLib

 libpath_add "@ldapsdk_libdir@"

 libpath_add "@libdir@"

@@ -40,14 +40,14 @@ do

     esac

 done

-if [ "$input_file" == "" ]

+if [ -z "$input_file" ]

 then 

     usage

     exit 1

 fi

 initfile=$(get_init_file "@initconfigdir@" $servid)

-if [ $? == 1 ]

+if [ $? -eq 1 ]

 then

     usage

     echo "You must supply a valid server instance identifier.  Use -Z to specify instance name"

@@ -67,13 +67,13 @@ ldapi=$(grep -i 'nsslapd-ldapilisten' $file | awk '{print $2}' )

 ldapiURL=$(grep -i 'nsslapd-ldapifilepath' $file | awk '{print $2}' )

 certdir=$(grep -i 'nsslapd-certdir' $file | awk '{print $2}' )

 autobind=$(grep -i 'nsslapd-ldapiautobind' $file | awk '{print $2}' )

-if [ "$rootdn" == "" ]; then

+if [ -z "$rootdn" ]; then

     value=$(grep -i 'nsslapd-rootdn' $file)

     rootdn=`echo "$value" | sed -e 's/nsslapd-rootdn: //i'`

 fi

 rm $file

-if [ "$ldapiURL" != "" ]; then

+if [ -n "$ldapiURL" ]; then

     ldapiURL=`echo "$ldapiURL" | sed -e 's/\//%2f/g'`

     ldapiURL="ldapi://"$ldapiURL

 fi

@@ -86,7 +86,7 @@ then

     export LDAPTLS_CACERTDIR=$certdir

 fi

-if [ -z $security ]; then

+if [ -z "$security" ]; then

     security="off"

 fi

 revised_protocol=$(check_protocol $protocol $security $ldapi $openldap)

@@ -99,12 +99,12 @@ protocol=$revised_protocol

 #

 # STARTTLS

 #

-if [ "$security" == "on" ]; then

-    if [ "$protocol" == "STARTTLS" ] || [ "$protocol" == "" ]; then

-        if [ "$error" == "yes" ]; then 

+if [ "$security" = "on" ]; then

+    if [ "$protocol" = "STARTTLS" ] || [ -z "$protocol" ]; then

+        if [ "$error" = "yes" ]; then

             echo "Using the next most secure protocol(STARTTLS)"

         fi

-        if [ "$openldap" == "yes" ]; then

+        if [ "$openldap" = "yes" ]; then

             ldapmodify -x -ZZ -p $port -h $host -D $rootdn -w $passwd -a -f $input_file

         else

             ldapmodify -ZZZ -P $certdir -p $port -h $host -D $rootdn -w $passwd -a -f $input_file

@@ -116,12 +116,12 @@ fi

 #

 # LDAPS

 #

-if [ "$security" == "on" ]; then

-    if [ "$protocol" == "LDAPS" ] || [ "$protocol" == "" ]; then

-        if [ "$error" == "yes" ]; then 

+if [ "$security" = "on" ]; then

+    if [ "$protocol" = "LDAPS" ] || [ -z "$protocol" ]; then

+        if [ "$error" = "yes" ]; then

             echo "Using the next most secure protocol(LDAPS)"

         fi

-        if [ "$openldap" == "yes" ]; then

+        if [ "$openldap" = "yes" ]; then

             ldapmodify -x -H "ldaps://$host:$secure_port" -D $rootdn -w $passwd -a -f $input_file

         else

             ldapmodify -Z -P $certdir -p $secure_port -h $host -D $rootdn -w $passwd -a -f $input_file 

@@ -133,21 +133,21 @@ fi

 #

 # LDAPI

 #

-if [ "$ldapi" == "on" ] && [ "$openldap" == "yes" ]; then

-    if [ "$protocol" == "LDAPI" ] || [ "$protocol" == "" ]; then

-        if [ "$(id -u)" == "0" ] && [ "$autobind" == "on" ]; then

-            if [ "$error" == "yes" ]; then 

+if [ "$ldapi" = "on" ] && [ "$openldap" = "yes" ]; then

+    if [ "$protocol" = "LDAPI" ] || [ -z "$protocol" ]; then

+        if [ $(id -u) -eq 0 ] && [ "$autobind" = "on" ]; then

+            if [ "$error" = "yes" ]; then

                 echo "Using the next most secure protocol(LDAPI/AUTOBIND)"

             fi

             ldapmodify -H $ldapiURL -Y EXTERNAL -a -f $input_file 2>/dev/null

         else

-            if [ "$error" == "yes" ]; then 

+            if [ "$error" = "yes" ]; then

                 echo "Using the next most secure protocol(LDAPI)"

             fi

             ldapmodify -x -H $ldapiURL -D $rootdn -w $passwd -a -f $input_file

         fi

         rc=$?

-        if [ $rc != 0 ]

+        if [ $rc -ne 0 ]

         then

             echo "Operation failed (error $rc)"

         fi

@@ -158,11 +158,11 @@ fi

 #

 # LDAP

 #

-if [ "$protocol" == "LDAP" ] || [ "$protocol" == "" ]; then

-    if [ "$error" == "yes" ]; then 

+if [ "$protocol" = "LDAP" ] || [ -z "$protocol" ]; then

+    if [ "$error" = "yes" ]; then

         echo "Using the next most secure protocol(LDAP)"

     fi

-    if [ "$openldap" == "yes" ]; then

+    if [ "$openldap" = "yes" ]; then

         ldapmodify -x -p $port -h $host -D $rootdn -w $passwd -a -f $input_file

     else

         ldapmodify -p $port -h $host -D $rootdn -w $passwd -a -f $input_file

diff --git a/ldap/admin/src/scripts/monitor.in b/ldap/admin/src/scripts/monitor.in

index 7b2058b..36a2fc9 100755

--- a/ldap/admin/src/scripts/monitor.in

+++ b/ldap/admin/src/scripts/monitor.in

@@ -1,6 +1,6 @@

 #!/bin/sh

-source @datadir@/@package_name@/data/DSSharedLib

+. @datadir@/@package_name@/data/DSSharedLib

 libpath_add "@libdir@/@package_name@/"

 libpath_add "@ldapsdk_libdir@"

@@ -41,7 +41,7 @@ do

 done

 initfile=$(get_init_file "@initconfigdir@" $servid)

-if [ $? == 1 ]

+if [ $? -eq 1 ]

 then

     usage

     echo "You must supply a valid server instance identifier.  Use -Z to specify instance name"

@@ -66,17 +66,17 @@ ldapi=$(grep -i 'nsslapd-ldapilisten' $file | awk '{print $2}' )

 ldapiURL=$(grep -i 'nsslapd-ldapifilepath' $file | awk '{print $2}' )

 certdir=$(grep -i 'nsslapd-certdir' $file | awk '{print $2}' )

 autobind=$(grep -i 'nsslapd-ldapiautobind' $file | awk '{print $2}' )

-if [ "$rootdn" == "" ]; then

+if [ -z "$rootdn" ]; then

     value=$(grep -i 'nsslapd-rootdn' $file)

     rootdn=`echo "$value" | sed -e 's/nsslapd-rootdn: //i'`

 fi

 rm $file

-if [ "$passwd" != "" ]; then

+if [ -n "$passwd" ]; then

     dn="-D $rootdn"

     passwd="-w$passwd"

 fi

-if [ "$ldapiURL" != "" ]

+if [ -n "$ldapiURL" ]

 then

     ldapiURL=`echo "$ldapiURL" | sed -e 's/\//%2f/g'`

     ldapiURL="ldapi://"$ldapiURL

@@ -103,12 +103,12 @@ protocol=$revised_protocol

 #

 # STARTTLS

 #

-if [ "$security" == "on" ]; then

-    if [ "$protocol" == "STARTTLS" ] || [ "$protocol" == "" ]; then

-        if [ "$error" == "yes" ]; then 

+if [ "$security" = "on" ]; then

+    if [ "$protocol" = "STARTTLS" ] || [ -z "$protocol" ]; then

+        if [ "$error" = "yes" ]; then

             echo "Using the next most secure protocol(STARTTLS)"

         fi

-        if [ "$openldap" == "yes" ]; then

+        if [ "$openldap" = "yes" ]; then

             ldapsearch -x -LLL -ZZ -h $host -p $port -b "$MDN" -s base $dn $passwd "objectClass=*"

         else

             ldapsearch -ZZZ -P $certdir  -h $host -p $port -b "$MDN" -s base $dn $passwd "objectClass=*"

@@ -120,12 +120,12 @@ fi

 #

 # LDAPS

 #

-if [ "$security" == "on" ]; then

-    if [ "$protocol" == "LDAPS" ] || [ "$protocol" == "" ]; then

-        if [ "$error" == "yes" ]; then 

+if [ "$security" = "on" ]; then

+    if [ "$protocol" = "LDAPS" ] || [ -z "$protocol" ]; then

+        if [ "$error" = "yes" ]; then

             echo "Using the next most secure protocol(LDAPS)"

         fi

-        if [ "$openldap" == "yes" ]; then

+        if [ "$openldap" = "yes" ]; then

             ldapsearch -x -LLL -H "ldaps://$host:$secure_port" -b "$MDN" -s base $dn $passwd "objectClass=*"

         else 

             ldapsearch -Z -P $certdir -p $secure_port -b "$MDN" -s base $dn $passwd "objectClass=*"

@@ -137,15 +137,15 @@ fi

 #

 # LDAPI

 #

-if [ "$ldapi" == "on" ] && [ "$openldap" == "yes" ]; then

-    if [ "$protocol" == "LDAPI" ] || [ "$protocol" == "" ]; then

-        if [ "$(id -u)" == "0" ] && [ "$autobind" == "on" ]; then

-            if [ "$error" == "yes" ]; then 

+if [ "$ldapi" = "on" ] && [ "$openldap" = "yes" ]; then

+    if [ "$protocol" = "LDAPI" ] || [ -z "$protocol" ]; then

+        if [ $(id -u) -eq 0 ] && [ "$autobind" = "on" ]; then

+            if [ "$error" = "yes" ]; then

                 echo "Using the next most secure protocol(LDAPI/AUTOBIND)"

             fi

             ldapsearch -LLL -H "$ldapiURL" -b "$MDN" -s base -Y EXTERNAL "objectClass=*" 2>/dev/null

         else

-            if [ "$error" == "yes" ]; then 

+            if [ "$error" = "yes" ]; then

                 echo "Using the next most secure protocol(LDAPI)"

             fi

             ldapsearch -x -LLL -H "$ldapiURL" -b "$MDN" -s base $dn $passwd "objectClass=*"

@@ -157,14 +157,14 @@ fi

 #

 # LDAP

 #

-if [ "$protocol" == "LDAP" ] || [ "$protocol" == "" ]; then

-    if [ "$error" == "yes" ]; then 

+if [ "$protocol" = "LDAP" ] || [ "$protocol" = "" ]; then

+    if [ "$error" = "yes" ]; then

         echo "Using the next most secure protocol(LDAP)"

     fi

-    if [ "$openldap" == "yes" ]; then

+    if [ "$openldap" = "yes" ]; then

         ldapsearch -x -LLL -h $host -p $port -b "$MDN" -s base $dn $passwd "objectClass=*"

     else

         ldapsearch -h $host -p $port -b "$MDN" -s base $dn $passwd "objectClass=*"

-    fi   

+    fi

     exit $?

 fi

diff --git a/ldap/admin/src/scripts/restart-dirsrv.in b/ldap/admin/src/scripts/restart-dirsrv.in

index 130e06e..e86a24c 100644