diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-01-19 13:29:43 -0500 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-01-19 13:29:43 -0500 |
| commit | dece4f8f994c78aca9213cfb8f20e6d979ff738d (patch) | |
| tree | d9786f17a18dee7c0b95505c1a24ef3ac1c38beb | |
| parent | 1d7ce108a605557fb814c2cc9f4ab7a46a1b9534 (diff) | |
| download | systemtap-steved-dece4f8f994c78aca9213cfb8f20e6d979ff738d.tar.gz systemtap-steved-dece4f8f994c78aca9213cfb8f20e6d979ff738d.tar.xz systemtap-steved-dece4f8f994c78aca9213cfb8f20e6d979ff738d.zip | |
Revert previous change. Only call stap-add-server-cert from stap-serverd if it has been installed.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | stap-serverd | 6 | ||||
| -rw-r--r-- | systemtap.spec | 1 |
3 files changed, 6 insertions, 4 deletions
@@ -1,6 +1,7 @@ 2009-01-19 Dave Brolley <brolley@redhat.com> - * stap-serverd (stap-server): Add stap-add-server-cert. + * stap-serverd (initialization): Call stap-add-server-cert only if + it has been installed. 2009-01-13 Stan Cox <scox@redhat.com> 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 diff --git a/systemtap.spec b/systemtap.spec index 876f273b..75274d24 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -264,7 +264,6 @@ exit 0 %{_bindir}/stap-start-server %{_bindir}/stap-stop-server %{_bindir}/stap-gen-server-cert -%{_bindir}/stap-add-server-cert %{_bindir}/stap-server-connect %{_mandir}/man8/stap-server.8* |