diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-05-05 14:01:51 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-05-05 14:01:51 -0400 |
| commit | f80f9e60d170329f4c3210d28914daa732ce0a48 (patch) | |
| tree | bf7c5142c22a35aa8b56adfcd4812873a0b2efca /stap-serverd | |
| parent | b03d329d5ad9d22d684b61859971a7b12b5e5104 (diff) | |
| parent | 7c4e9d57761b10058d36756df3b39039e292812d (diff) | |
| download | systemtap-steved-f80f9e60d170329f4c3210d28914daa732ce0a48.tar.gz systemtap-steved-f80f9e60d170329f4c3210d28914daa732ce0a48.tar.xz systemtap-steved-f80f9e60d170329f4c3210d28914daa732ce0a48.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
modsign.cxx
runtime/staprun/modverify.c
runtime/staprun/staprun_funcs.c
stap-authorize-server-cert
stap-authorize-signing-cert
stap-serverd
systemtap.spec
Diffstat (limited to 'stap-serverd')
| -rwxr-xr-x | stap-serverd | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/stap-serverd b/stap-serverd index b422deaa..4eee8c38 100755 --- a/stap-serverd +++ b/stap-serverd @@ -52,12 +52,15 @@ function initialization { ${stap_exec_prefix}stap-gen-cert $ssl_db || exit 1 # Now add the server's certificate to the client's database, # making it a trusted peer. Do this only if the client has been installed. - if test -f `which ${stap_exec_prefix}stap-add-server-cert` -a -x `which ${stap_exec_prefix}stap-add-server-cert`; then + if test -f `which ${stap_exec_prefix}stap-client` -a \ + -x `which ${stap_exec_prefix}stap-client`; then ${stap_exec_prefix}stap-authorize-server-cert $ssl_db/$stap_certfile fi elif ! test -f $stap_ssl_db/client/cert8.db; then # If the client's database does not exist, then initialize it with our certificate. - if test -f `which ${stap_exec_prefix}stap-add-server-cert` -a -x `which ${stap_exec_prefix}stap-add-server-cert`; then + # Do this only if the client has been installed. + if test -f `which ${stap_exec_prefix}stap-client` -a \ + -x `which ${stap_exec_prefix}stap-client`; then ${stap_exec_prefix}stap-authorize-server-cert $ssl_db/$stap_certfile fi fi |