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 /runtime/staprun/staprun_funcs.c | |
| 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 'runtime/staprun/staprun_funcs.c')
| -rw-r--r-- | runtime/staprun/staprun_funcs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/staprun/staprun_funcs.c b/runtime/staprun/staprun_funcs.c index 6e72fd72..f8fe1308 100644 --- a/runtime/staprun/staprun_funcs.c +++ b/runtime/staprun/staprun_funcs.c @@ -225,7 +225,7 @@ check_signature(void) /* Use realpath() to canonicalize the module path. */ if (realpath(modpath, module_realpath) == NULL) { - perr("Unable to canonicalize signature path \"%s\"", modpath); + perr("Unable to canonicalize module path \"%s\"", modpath); return MODULE_CHECK_ERROR; } @@ -403,7 +403,6 @@ check_groups (void) perr("Unable to retrieve group list"); return -1; } - for (i = 0; i < ngids; i++) { /* If the user is a member of 'stapdev', then we're * done, since he can use staprun without any @@ -419,7 +418,6 @@ check_groups (void) if (gidlist[i] == stapusr_gid) gid = stapusr_gid; } - if (gid != stapusr_gid) { unprivileged_user = 1; return 0; |