Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 65061
b: refs/heads/master
c: 097cc62
h: refs/heads/master
i:
  65059: 39747eb
v: v3
  • Loading branch information
Linus Torvalds committed Sep 19, 2007
1 parent 26a1505 commit 710d9ce
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9c95e7319ba98585ebb6d304eca2d56f401ed70c
refs/heads/master: 097cc62283455668ad0b35c72920c6373f45c2ab
2 changes: 2 additions & 0 deletions trunk/security/selinux/hooks.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ static inline int inode_doinit(struct inode *inode)
}

enum {
Opt_error = -1,
Opt_context = 1,
Opt_fscontext = 2,
Opt_defcontext = 4,
Expand All @@ -327,6 +328,7 @@ static match_table_t tokens = {
{Opt_fscontext, "fscontext=%s"},
{Opt_defcontext, "defcontext=%s"},
{Opt_rootcontext, "rootcontext=%s"},
{Opt_error, NULL},
};

#define SEL_MOUNT_FAIL_MSG "SELinux: duplicate or incompatible mount options\n"
Expand Down

0 comments on commit 710d9ce

Please sign in to comment.