diff options
| author | David Howells <dhowells@redhat.com> | 2014-07-22 21:54:43 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-07-22 21:54:43 +0100 |
| commit | 64724cfc6eea920dbaada14f0fb978b1dd31192d (patch) | |
| tree | d2f491be07a05e2d96b5c8b8e5a0a878f285eb22 /include/keys | |
| parent | 6204e0025566ad3992ce649d4f44b7e8cdde2293 (diff) | |
| parent | 7d2ce2320e8efdc4a6dcbae7b329ed3f0d1cd778 (diff) | |
| download | linux-64724cfc6eea920dbaada14f0fb978b1dd31192d.tar.gz linux-64724cfc6eea920dbaada14f0fb978b1dd31192d.tar.bz2 linux-64724cfc6eea920dbaada14f0fb978b1dd31192d.zip | |
Merge remote-tracking branch 'integrity/next-with-keys' into keys-next
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include/keys')
| -rw-r--r-- | include/keys/system_keyring.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h index 8dabc399bd1d..72665eb80692 100644 --- a/include/keys/system_keyring.h +++ b/include/keys/system_keyring.h @@ -17,7 +17,15 @@ #include <linux/key.h> extern struct key *system_trusted_keyring; - +static inline struct key *get_system_trusted_keyring(void) +{ + return system_trusted_keyring; +} +#else +static inline struct key *get_system_trusted_keyring(void) +{ + return NULL; +} #endif #endif /* _KEYS_SYSTEM_KEYRING_H */ |