diff options
| author | Andrew G. Morgan <morgan@kernel.org> | 2008-04-28 23:00:40 -0700 |
|---|---|---|
| committer | Andrew G. Morgan <morgan@kernel.org> | 2008-04-28 23:08:08 -0700 |
| commit | bbff35aed9d6e1b4817312bd6b131a9ac4e42f55 (patch) | |
| tree | fbe7c604156fda64ce713e9ce538b430d0323284 | |
| parent | f3747777bfef0789071edfaf8186f2eb0a42aa96 (diff) | |
| download | libcap-bbff35aed9d6e1b4817312bd6b131a9ac4e42f55.tar.gz | |
Clean up in preparation for next release.
Don't install non-existent man pages.
Update kernel header from latest 2.6.26 git tree.
Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
| -rw-r--r-- | doc/Makefile | 6 | ||||
| -rw-r--r-- | libcap/include/linux/capability.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/doc/Makefile b/doc/Makefile index 404b38d..bba10a9 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -5,7 +5,6 @@ topdir=$(shell pwd)/.. include $(topdir)/Make.Rules -MAN2S = capget.2 capset.2 MAN3S = cap_init.3 cap_free.3 cap_dup.3 \ cap_clear.3 cap_clear_flag.3 cap_get_flag.3 cap_set_flag.3 \ cap_get_proc.3 cap_set_proc.3 \ @@ -15,14 +14,13 @@ MAN3S = cap_init.3 cap_free.3 cap_dup.3 \ capsetp.3 capgetp.3 MAN8S = getcap.8 setcap.8 -MANS = $(MAN2S) $(MAN3S) $(MAN8S) +MANS = $(MAN3S) $(MAN8S) all: $(MANS) install: - mkdir -p -m 755 $(MANDIR)/man2 $(MANDIR)/man3 $(MANDIR)/man8 + mkdir -p -m 755 $(MANDIR)/man3 $(MANDIR)/man8 for man in \ - $(MANDIR)/man2 $(MAN2S) \ $(MANDIR)/man3 $(MAN3S) \ $(MANDIR)/man8 $(MAN8S) \ ; \ diff --git a/libcap/include/linux/capability.h b/libcap/include/linux/capability.h index 7d50ff6..eaab759 100644 --- a/libcap/include/linux/capability.h +++ b/libcap/include/linux/capability.h @@ -155,6 +155,7 @@ typedef struct kernel_cap_struct { * Add any capability from current's capability bounding set * to the current process' inheritable set * Allow taking bits out of capability bounding set + * Allow modification of the securebits for a process */ #define CAP_SETPCAP 8 @@ -490,8 +491,6 @@ extern const kernel_cap_t __cap_init_eff_set; int capable(int cap); int __capable(struct task_struct *t, int cap); -extern long cap_prctl_drop(unsigned long cap); - #endif /* __KERNEL__ */ #endif /* !_LINUX_CAPABILITY_H */ |