Smack: Make the syslog control configurable

[firefly-linux-kernel-4.4.55.git] / security / smack / smack.h

diff --git a/security/smack/smack.h b/security/smack/smack.h
index 364cc64fce717be1e75d16fa91f4aeaadc55539f..d072fd32212d36cb359dbd31006614c3471f2981 100644 (file)
--- a/security/smack/smack.h
+++ b/security/smack/smack.h
@@ -241,7 +241,8 @@ u32 smack_to_secid(const char *);
 extern int smack_cipso_direct;
 extern int smack_cipso_mapped;
 extern struct smack_known *smack_net_ambient;
-extern char *smack_onlycap;
+extern struct smack_known *smack_onlycap;
+extern struct smack_known *smack_syslog_label;
 extern const char *smack_cipso_option;
 
 extern struct smack_known smack_known_floor;
@@ -312,7 +313,7 @@ static inline int smack_privileged(int cap)
 
        if (!capable(cap))
                return 0;
-       if (smack_onlycap == NULL || smack_onlycap == skp->smk_known)
+       if (smack_onlycap == NULL || smack_onlycap == skp)
                return 1;
        return 0;
 }