From dece4f8f994c78aca9213cfb8f20e6d979ff738d Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Mon, 19 Jan 2009 13:29:43 -0500
Subject: Revert previous change. Only call stap-add-server-cert from
 stap-serverd if it has been installed.

---
 stap-serverd | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'stap-serverd')

diff --git a/stap-serverd b/stap-serverd
index 2c7abba1..1c227e6c 100755
--- a/stap-serverd
+++ b/stap-serverd
@@ -52,8 +52,10 @@ function initialization {
 	if ! test -f $ssl_db/stap-server.cert; then
 	    $exec_prefix/stap-gen-server-cert `dirname $ssl_db` || exit 1
             # Now add the server's certificate to the client's database,
-	    # making it a trusted peer.
-	    $exec_prefix/stap-add-server-cert $ssl_db/stap-server.cert `dirname $ssl_db` || exit 1
+	    # making it a trusted peer. Do this only if the client has been installed.
+	    if test -f $exec_prefix/stap-add-server-cert -a -f $exec_prefix/stap-add-server-cert; then
+		$exec_prefix/stap-add-server-cert $ssl_db/stap-server.cert `dirname $ssl_db`
+	    fi
 	fi
     fi
     nss_pw=$ssl_db/pw
-- 
cgit