summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-03-01 09:27:27 +0000
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-03-01 09:27:27 +0000
commita0110032c256fdaf577bbd6ed1b6550f88958170 (patch)
tree4de41cc5fd8eb1ab6771337599563999b65bfa9f /include
parenta847f56464f9737ddb11a7e41f63b142b237b776 (diff)
parente20ffd76fc5bdccf79223667a615dd4c820947ab (diff)
Merge shinybook.infradead.org:/home/dwmw2/bk/linus-2.6
into shinybook.infradead.org:/home/dwmw2/bk/audit-2.6
Diffstat (limited to 'include')
-rw-r--r--include/linux/audit.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h
index c27b028ec3c8..2a3c2d39dd8b 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -150,6 +150,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)
@@ -159,6 +160,7 @@ extern uid_t audit_get_loginuid(struct audit_context *ctx);
#define audit_putname(n) do { ; } while (0)
#define audit_inode(n,i,d) do { ; } while (0)
#define audit_get_loginuid(c) ({ -1; })
+#define audit_ipc_perms(q,u,g,m) ({ 0; })
#endif
#ifdef CONFIG_AUDIT