diff options
author | Jakub Jelinek <jakub@redhat.com> | 2007-03-31 17:23:57 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2007-03-31 17:23:57 +0000 |
commit | eae077f1c3de8572b3616b29cd53e72ca054b280 (patch) | |
tree | 9bf840af92e910b83914716b4172f41291670871 /nscd/selinux.c | |
parent | 6ce38a95a4c8318df75cf91fbd90101601b3fa7f (diff) |
Updated to fedora-glibc-20070331T1609cvs/fedora-glibc-2_5_90-20
Diffstat (limited to 'nscd/selinux.c')
-rw-r--r-- | nscd/selinux.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/nscd/selinux.c b/nscd/selinux.c index 4a462223f5..f2dbceeea1 100644 --- a/nscd/selinux.c +++ b/nscd/selinux.c @@ -187,18 +187,22 @@ preserve_capabilities (void) if (tmp_caps == NULL || new_caps == NULL) { if (tmp_caps != NULL) - free_caps (tmp_caps); + cap_free (tmp_caps); dbg_log (_("Failed to initialize drop of capabilities")); error (EXIT_FAILURE, 0, _("cap_init failed")); } /* There is no reason why these should not work. */ - cap_set_flag (new_caps, CAP_PERMITTED, nnew_cap_list, new_cap_list, CAP_SET); - cap_set_flag (new_caps, CAP_EFFECTIVE, nnew_cap_list, new_cap_list, CAP_SET); - - cap_set_flag (tmp_caps, CAP_PERMITTED, ntmp_cap_list, tmp_cap_list, CAP_SET); - cap_set_flag (tmp_caps, CAP_EFFECTIVE, ntmp_cap_list, tmp_cap_list, CAP_SET); + cap_set_flag (new_caps, CAP_PERMITTED, nnew_cap_list, + (cap_value_t *) new_cap_list, CAP_SET); + cap_set_flag (new_caps, CAP_EFFECTIVE, nnew_cap_list, + (cap_value_t *) new_cap_list, CAP_SET); + + cap_set_flag (tmp_caps, CAP_PERMITTED, ntmp_cap_list, + (cap_value_t *) tmp_cap_list, CAP_SET); + cap_set_flag (tmp_caps, CAP_EFFECTIVE, ntmp_cap_list, + (cap_value_t *) tmp_cap_list, CAP_SET); int res = cap_set_proc (tmp_caps); |