aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2005-11-07 03:59:30 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 10:53:37 -0500
commit0f6ed7c2641fe4cea83cd09c21928ca30c0983ec (patch)
tree15662837acd37f24dddeb11eb12980429c8c4ef4
parent28ef35845f2c8da8e1bed068277d2fab1e8c8979 (diff)
[PATCH] Keys: Remove incorrect and obsolete '!' operators
The attached patch removes a couple of incorrect and obsolete '!' operators left over from the conversion of the key permission functions from true/false returns to zero/error returns. Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--security/keys/keyring.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index e1cc4dd79012..c7a0ab1cfda3 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -434,8 +434,8 @@ ascend:
434 if (sp >= KEYRING_SEARCH_MAX_DEPTH) 434 if (sp >= KEYRING_SEARCH_MAX_DEPTH)
435 continue; 435 continue;
436 436
437 if (!key_task_permission(make_key_ref(key, possessed), 437 if (key_task_permission(make_key_ref(key, possessed),
438 context, KEY_SEARCH) < 0) 438 context, KEY_SEARCH) < 0)
439 continue; 439 continue;
440 440
441 /* stack the current position */ 441 /* stack the current position */
@@ -621,8 +621,8 @@ struct key *find_keyring_by_name(const char *name, key_serial_t bound)
621 if (strcmp(keyring->description, name) != 0) 621 if (strcmp(keyring->description, name) != 0)
622 continue; 622 continue;
623 623
624 if (!key_permission(make_key_ref(keyring, 0), 624 if (key_permission(make_key_ref(keyring, 0),
625 KEY_SEARCH) < 0) 625 KEY_SEARCH) < 0)
626 continue; 626 continue;
627 627
628 /* found a potential candidate, but we still need to 628 /* found a potential candidate, but we still need to