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 /main.cxx | |
| 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 'main.cxx')
| -rw-r--r-- | main.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -414,6 +414,14 @@ main (int argc, char * const argv []) else s.cert_db_path = getenv("HOME") + string ("/.systemtap/ssl/server"); + // Location of our signing certificate. + // If we're root, use the database in SYSCONFDIR, otherwise + // use the one in our $HOME directory. */ + if (geteuid() == 0) + s.cert_db_path = SYSCONFDIR "/systemtap/ssl/server"; + else + s.cert_db_path = getenv("HOME") + string ("/.systemtap/ssl/server"); + const char* s_p = getenv ("SYSTEMTAP_TAPSET"); if (s_p != NULL) { |