diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-03-26 20:41:09 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-03-26 20:41:09 +0000 |
| commit | e1f0c5bc78cf7d893682edf27215ecc0030fcaed (patch) | |
| tree | 51936e65f6863bb865ce4bc7303da36d7d8b6b76 /nscd | |
| parent | 4e87573fe224a5d187f463a6e051f5781e38fd97 (diff) | |
| download | glibc-e1f0c5bc78cf7d893682edf27215ecc0030fcaed.zip glibc-e1f0c5bc78cf7d893682edf27215ecc0030fcaed.tar.gz glibc-e1f0c5bc78cf7d893682edf27215ecc0030fcaed.tar.bz2 | |
* scripts/check-local-headers.sh: Filter out sys/capability.h.cvs/fedora-glibc-20070331T1609
2007-03-22 Jakub Jelinek <jakub@redhat.com>
* config.h.in (HAVE_LIBCAP): Add.
* nscd/selinux.h: Include sys/capability.h rather than non-existent
sys/capabilities.h.
* nscd/selinux.c (preserve_capabilities): Use cap_free instead of
free_caps. Cast away const from 4th cap_set_flag argument.
Diffstat (limited to 'nscd')
| -rw-r--r-- | nscd/selinux.c | 16 | ||||
| -rw-r--r-- | nscd/selinux.h | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/nscd/selinux.c b/nscd/selinux.c index 4a46222..f2dbcee 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); diff --git a/nscd/selinux.h b/nscd/selinux.h index 9ce0628..27afcd6 100644 --- a/nscd/selinux.h +++ b/nscd/selinux.h @@ -1,5 +1,5 @@ /* Header for nscd SELinux access controls. - Copyright (C) 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Matthew Rickard <mjricka@epoch.ncsc.mil>, 2004. @@ -23,7 +23,7 @@ #include "nscd.h" #ifdef HAVE_LIBCAP -# include <sys/capabilities.h> +# include <sys/capability.h> #endif #ifdef HAVE_SELINUX |