[171817] RHEL full install from service pack rpm cannot process security files

dssecure.txt and assecure.txt are the temporary file created in the setup
script, which is generated only when slapd instance and admin server are
installed, respectively.  But they were checked even if it was the fresh
install.

2 files changed, 57 insertions, 47 deletions

diff --git a/ldap/cm/newinst/setup b/ldap/cm/newinst/setup
index 23da6251..0fc0412d 100755
--- a/ldap/cm/newinst/setup
+++ b/ldap/cm/newinst/setup
@@ -316,38 +316,43 @@ adminXmlSSLOn() {
 }
 
 SSLOn() {
-	for dir in `cat dssecure.txt` ; do
-		if [ -f $dir/config/dse.ldif ]; then
-			security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
-			$dir/stop-slapd
-			cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
-			mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
-			echo "$dir/config/dse.ldif: SSL on ..."
-			echo "Restarting Directory Server: $dir/start-slapd"
-			$dir/start-slapd
-		fi
-	done
+	if [ -f dssecure.txt ]; then
+		for dir in `cat dssecure.txt` ; do
+			if [ -f $dir/config/dse.ldif ]; then
+				security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+				$dir/stop-slapd
+				cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
+				mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+				echo "$dir/config/dse.ldif: SSL on ..."
+				echo "Restarting Directory Server: $dir/start-slapd"
+				$dir/start-slapd
+			fi
+		done
+		rm -f dssecure.txt > /dev/null 2>&1
+	fi
 
 	if [ $isadminsslon -ne 0 ]; then
 		$sroot/stop-admin
 	fi
-	for confline in `cat assecure.txt` ; do
-		conffile=`echo $confline | awk -F= '{print $1}'`
-		confparam=`echo $confline | awk -F= '{print $2}'`
-		echo $conffile | grep "\.xml$" > /dev/null 2>&1
-		rval=$?
-		if [ $rval -eq 0 ]; then
-			adminXmlSSLOn $conffile $confparam
-		else
-			adminSSLOn $conffile $confparam
-		fi
-	done
+	if [ -f assecure.txt ]; then
+		for confline in `cat assecure.txt` ; do
+			conffile=`echo $confline | awk -F= '{print $1}'`
+			confparam=`echo $confline | awk -F= '{print $2}'`
+			echo $conffile | grep "\.xml$" > /dev/null 2>&1
+			rval=$?
+			if [ $rval -eq 0 ]; then
+				adminXmlSSLOn $conffile $confparam
+			else
+				adminSSLOn $conffile $confparam
+			fi
+		done
+		rm -f assecure.txt > /dev/null 2>&1
+	fi
 	if [ $isadminsslon -ne 0 ]; then
 		echo "Restarting Administration Server: $sroot/start-admin"
 		$sroot/start-admin
 	fi
 
-	rm -f dssecure.txt assecure.txt > /dev/null 2>&1
 }
 
 # check whether it is an in-place installation
diff --git a/ldap/cm/newinst/setup.patch b/ldap/cm/newinst/setup.patch
index 45004736..7637b386 100755
--- a/ldap/cm/newinst/setup.patch
+++ b/ldap/cm/newinst/setup.patch
@@ -272,36 +272,41 @@ adminXmlSSLOn() {
     echo "$conffile: SSL on ..."
 }
 
-for dir in `cat dssecure.txt` ; do
-    clear
-    if [ -f $dir/config/dse.ldif ]; then
-        security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
-        $dir/stop-slapd
-        cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
-        mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
-        echo "$dir/config/dse.ldif: SSL on ..."
-        echo "Restarting Directory Server: $dir/start-slapd"
-        $dir/start-slapd
-    fi
-done
+if [ -f dssecure.txt ]; then
+    for dir in `cat dssecure.txt` ; do
+        clear
+        if [ -f $dir/config/dse.ldif ]; then
+            security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+            $dir/stop-slapd
+            cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
+            mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+            echo "$dir/config/dse.ldif: SSL on ..."
+            echo "Restarting Directory Server: $dir/start-slapd"
+            $dir/start-slapd
+        fi
+    done
+    rm -f dssecure.txt
+fi
 
 if [ $isadminsslon -ne 0 ]; then
     $serverroot/stop-admin
 fi
-for confline in `cat assecure.txt` ; do
-    conffile=`echo $confline | awk -F= '{print $1}'`
-    confparam=`echo $confline | awk -F= '{print $2}'`
-    echo $conffile | grep "\.xml$" > /dev/null 2>&1
-    rval=$?
-    if [ $rval -eq 0 ]; then
-        adminXmlSSLOn $conffile $confparam
-    else
-        adminSSLOn $conffile $confparam
-    fi
-done
+if [ -f assecure.txt ]; then
+    for confline in `cat assecure.txt` ; do
+        conffile=`echo $confline | awk -F= '{print $1}'`
+        confparam=`echo $confline | awk -F= '{print $2}'`
+        echo $conffile | grep "\.xml$" > /dev/null 2>&1
+        rval=$?
+        if [ $rval -eq 0 ]; then
+            adminXmlSSLOn $conffile $confparam
+        else
+            adminSSLOn $conffile $confparam
+        fi
+    done
+    rm -f assecuire.txt
+fi
 if [ $isadminsslon -ne 0 ]; then
     echo "Restarting Administration Server: $serverroot/start-admin"
     $serverroot/start-admin
 fi
 
-rm -f dssecure.txt assecuire.txt