diff options
author | James Morris <jmorris@namei.org> | 2011-05-13 09:52:16 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-05-13 09:52:16 +1000 |
commit | ca7d12000895ae5dfef8b8ff2648a0d50abd397c (patch) | |
tree | 259fb1e473ef6129b9fa5faf771c9e811ab572c4 /security/selinux/ss | |
parent | 411f05f123cbd7f8aa1edcae86970755a6e2a9d9 (diff) | |
parent | 93826c092c385549c04af184fbebd43f36995c69 (diff) | |
download | linux-ca7d12000895ae5dfef8b8ff2648a0d50abd397c.tar.gz linux-ca7d12000895ae5dfef8b8ff2648a0d50abd397c.tar.bz2 linux-ca7d12000895ae5dfef8b8ff2648a0d50abd397c.zip |
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus
Diffstat (limited to 'security/selinux/ss')
-rw-r--r-- | security/selinux/ss/policydb.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index e6e7ce0d3d55..7102457661d6 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -1819,8 +1819,6 @@ static int filename_trans_read(struct policydb *p, void *fp) goto out; nel = le32_to_cpu(buf[0]); - printk(KERN_ERR "%s: nel=%d\n", __func__, nel); - last = p->filename_trans; while (last && last->next) last = last->next; @@ -1857,8 +1855,6 @@ static int filename_trans_read(struct policydb *p, void *fp) goto out; name[len] = 0; - printk(KERN_ERR "%s: ft=%p ft->name=%p ft->name=%s\n", __func__, ft, ft->name, ft->name); - rc = next_entry(buf, fp, sizeof(u32) * 4); if (rc) goto out; |