diff options
author | David Howells <dhowells@redhat.com> | 2013-09-24 05:35:14 -0400 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2013-09-24 05:35:14 -0400 |
commit | a5b4bd2874d9032b42db8cc4880058576c561b06 (patch) | |
tree | a41cb03e506ebdd35d01c84f24bad0833ae3ea68 /security/keys | |
parent | 61ea0c0ba904a55f55317d850c1072ff7835ac92 (diff) |
KEYS: Use bool in make_key_ref() and is_key_possessed()
Make make_key_ref() take a bool possession parameter and make
is_key_possessed() return a bool.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security/keys')
-rw-r--r-- | security/keys/keyring.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index 6ece7f2e5707..f78406372ebe 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c | |||
@@ -329,9 +329,10 @@ key_ref_t keyring_search_aux(key_ref_t keyring_ref, | |||
329 | 329 | ||
330 | struct keyring_list *keylist; | 330 | struct keyring_list *keylist; |
331 | struct timespec now; | 331 | struct timespec now; |
332 | unsigned long possessed, kflags; | 332 | unsigned long kflags; |
333 | struct key *keyring, *key; | 333 | struct key *keyring, *key; |
334 | key_ref_t key_ref; | 334 | key_ref_t key_ref; |
335 | bool possessed; | ||
335 | long err; | 336 | long err; |
336 | int sp, nkeys, kix; | 337 | int sp, nkeys, kix; |
337 | 338 | ||
@@ -542,8 +543,8 @@ key_ref_t __keyring_search_one(key_ref_t keyring_ref, | |||
542 | key_perm_t perm) | 543 | key_perm_t perm) |
543 | { | 544 | { |
544 | struct keyring_list *klist; | 545 | struct keyring_list *klist; |
545 | unsigned long possessed; | ||
546 | struct key *keyring, *key; | 546 | struct key *keyring, *key; |
547 | bool possessed; | ||
547 | int nkeys, loop; | 548 | int nkeys, loop; |
548 | 549 | ||
549 | keyring = key_ref_to_ptr(keyring_ref); | 550 | keyring = key_ref_to_ptr(keyring_ref); |