diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-16 16:35:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-16 16:35:45 -0800 |
| commit | cae3cf8f1b6bd60ec4a6c657f4399e2f8269cab0 (patch) | |
| tree | bc427f9dd330c0e7fef30a5499025d8f710df26a /include/linux | |
| parent | 94dad77b4d2ae306a8055447ebabaaac0762fc5f (diff) | |
| parent | 76ae6d567b0f17402feb35164a9323ca8a88f97d (diff) | |
Merge
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/audit.h | 9 | ||||
| -rw-r--r-- | include/linux/fs.h | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index 40450a738b21..3628f7cfb178 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -125,10 +125,9 @@ struct audit_rule { /* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */ #ifdef __KERNEL__ -#ifdef CONFIG_AUDIT struct audit_buffer; struct audit_context; -#endif +struct inode; #ifdef CONFIG_AUDITSYSCALL /* These are defined in auditsc.c */ @@ -141,7 +140,7 @@ extern void audit_syscall_entry(struct task_struct *task, extern void audit_syscall_exit(struct task_struct *task, int return_code); extern void audit_getname(const char *name); extern void audit_putname(const char *name); -extern void audit_inode(const char *name, unsigned long ino, dev_t rdev); +extern void audit_inode(const char *name, const struct inode *inode); /* Private API (for audit.c only) */ extern int audit_receive_filter(int type, int pid, int uid, int seq, @@ -150,6 +149,7 @@ extern void audit_get_stamp(struct audit_context *ctx, struct timespec *t, int *serial); extern int audit_set_loginuid(struct audit_context *ctx, uid_t loginuid); extern uid_t audit_get_loginuid(struct audit_context *ctx); +extern int audit_ipc_perms(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode); #else #define audit_alloc(t) ({ 0; }) #define audit_free(t) do { ; } while (0) @@ -157,8 +157,9 @@ extern uid_t audit_get_loginuid(struct audit_context *ctx); #define audit_syscall_exit(t,r) do { ; } while (0) #define audit_getname(n) do { ; } while (0) #define audit_putname(n) do { ; } while (0) -#define audit_inode(n,i,d) do { ; } while (0) +#define audit_inode(n,i) do { ; } while (0) #define audit_get_loginuid(c) ({ -1; }) +#define audit_ipc_perms(q,u,g,m) ({ 0; }) #endif #ifdef CONFIG_AUDIT diff --git a/include/linux/fs.h b/include/linux/fs.h index 59891f8a049b..723f41b51ced 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -212,7 +212,6 @@ extern int dir_notify_enable; #include <linux/list.h> #include <linux/radix-tree.h> #include <linux/prio_tree.h> -#include <linux/audit.h> #include <linux/init.h> #include <asm/atomic.h> @@ -1272,13 +1271,7 @@ extern void __init vfs_caches_init(unsigned long); #ifndef CONFIG_AUDITSYSCALL #define putname(name) __putname(name) #else -#define putname(name) \ - do { \ - if (unlikely(current->audit_context)) \ - audit_putname(name); \ - else \ - __putname(name); \ - } while (0) +extern void putname(const char *name); #endif extern int register_blkdev(unsigned int, const char *); |