[Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.9.2.5, 1.9.2.6 setup.patch, 1.1.2.4, 1.1.2.5

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/newinst

Modified Files:
      Tag: Directory71RtmBranch
	setup setup.patch 
Log Message:
[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.



Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -r1.9.2.5 -r1.9.2.6
--- setup	25 Oct 2005 20:37:05 -0000	1.9.2.5
+++ setup	27 Oct 2005 17:50:16 -0000	1.9.2.6
@@ -316,38 +316,43 @@
 }
 
 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

setup.patch:

Index: setup.patch
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup.patch,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- setup.patch	17 Oct 2005 18:07:11 -0000	1.1.2.4
+++ setup.patch	27 Oct 2005 17:50:16 -0000	1.1.2.5
@@ -272,36 +272,41 @@
     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