diff options
| author | Andrew Morgan <morgan@kernel.org> | 2007-11-10 09:50:34 -0800 |
|---|---|---|
| committer | Andrew Morgan <morgan@kernel.org> | 2007-11-10 09:50:54 -0800 |
| commit | d4f54c58c8b1a13ef273fad209917a204b3334af (patch) | |
| tree | 0f3546ea36e5034e861cf96c2b82ef1bc17c1555 | |
| parent | f782a9792f375581307a0c60d7f985c19aa6b439 (diff) | |
| download | libcap-d4f54c58c8b1a13ef273fad209917a204b3334af.tar.gz | |
Prune kernel header and fix missing assignment (fixes from KaiGai Kohei)
- the kernel header doesn't need compiler.h included
+ patch submitted for upstream use.
- the cap_copy_int() function was missing a crucial assignment
Signed-off-by: Andrew Morgan <morgan@kernel.org>
| -rw-r--r-- | libcap/cap_extint.c | 2 | ||||
| -rw-r--r-- | libcap/include/linux/capability.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libcap/cap_extint.c b/libcap/cap_extint.c index 4cf43ea..7f4e07c 100644 --- a/libcap/cap_extint.c +++ b/libcap/cap_extint.c @@ -116,7 +116,7 @@ cap_t cap_copy_int(const void *cap_ext) if (bno != blen) val |= export->bytes[bno++][set] << 24; - cap_d->u[blk].flat[set]; + cap_d->u[blk].flat[set] = val; } } diff --git a/libcap/include/linux/capability.h b/libcap/include/linux/capability.h index 94663b4..26de1e7 100644 --- a/libcap/include/linux/capability.h +++ b/libcap/include/linux/capability.h @@ -14,7 +14,6 @@ #define _LINUX_CAPABILITY_H #include <linux/types.h> -#include <linux/compiler.h> struct task_struct; |