From ff4e27661da364d1b2442d1de47cc560833f2cd9 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Tue, 4 Oct 2011 09:57:06 +0300 Subject: [PATCH] Removed smack_remove* as they are not neede for 1.0 API. --- src/smack.c | 43 ------------------------------------------- src/smack.h | 32 -------------------------------- tests/check_smack.c | 50 -------------------------------------------------- 3 files changed, 125 deletions(-) diff --git a/src/smack.c b/src/smack.c index bb1ae82..4d4d1da 100644 --- a/src/smack.c +++ b/src/smack.c @@ -262,49 +262,6 @@ int smack_rule_set_add(SmackRuleSet handle, const char *subject, return ret == 0 ? 0 : -1; } -void smack_rule_set_remove(SmackRuleSet handle, const char *subject, - const char *object) -{ - struct smack_subject *s = NULL; - struct smack_object *o = NULL; - - HASH_FIND_STR(handle->subjects, subject, s); - if (s == NULL) - return; - - HASH_FIND_STR(s->objects, object, o); - if (o == NULL) - return; - - o->ac = 0; - return; -} - -void smack_rule_set_remove_by_subject(SmackRuleSet handle, const char *subject) -{ - struct smack_subject *s = NULL; - struct smack_object *o = NULL, *tmp = NULL; - - HASH_FIND_STR(handle->subjects, subject, s); - if (s == NULL) - return; - - HASH_ITER(hh, s->objects, o, tmp) - o->ac = 0; -} - -void smack_rule_set_remove_by_object(SmackRuleSet handle, const char *object) -{ - struct smack_subject *s = NULL, *tmp = NULL; - struct smack_object *o = NULL; - - HASH_ITER(hh, handle->subjects, s, tmp) { - HASH_FIND_STR(s->objects, object, o); - if (o) - o->ac = 0; - } -} - int smack_rule_set_have_access(SmackRuleSet handle, const char *subject, const char *object, const char *access_str) { diff --git a/src/smack.h b/src/smack.h index ee53c73..87b77a9 100644 --- a/src/smack.h +++ b/src/smack.h @@ -100,38 +100,6 @@ extern int smack_rule_set_add(SmackRuleSet handle, const char *subject, const char *object, const char *access); /*! - * Remove rule from a rule set. When rules are applied to kernel, removed - * rules will be written with empty access code. - * - * @param handle handle to a rule set - * @param subject subject of the rule - * @param object object of the rule - * @return Returns negative value on failure. - */ -extern void smack_rule_set_remove(SmackRuleSet handle, const char *subject, - const char *object); - -/*! - * Remove all rules with the given subject from a rule set. When rules are - * applied to kernel, removed rules will be written with empty access code. - * - * @param handle handle to a rule set - * @param subject subject of the rule - */ -extern void smack_rule_set_remove_by_subject(SmackRuleSet handle, - const char *subject); - -/*! - * Remove all rules with the given object from a rule set. When rules are - * applied to kernel, removed rules will be written with empty access code. - - * @param handle handle to a rule set - * @param object object of the rule - */ -extern void smack_rule_set_remove_by_object(SmackRuleSet handle, - const char *object); - -/*! * Check access to a give object from the give rule set. * * @param handle handle to a rule set diff --git a/tests/check_smack.c b/tests/check_smack.c index 8f6a58f..190e4a8 100644 --- a/tests/check_smack.c +++ b/tests/check_smack.c @@ -38,7 +38,6 @@ START_TEST(test_save_to_kernel) smack_rule_set_add(rules, "Apple", "Orange", "rwx"); smack_rule_set_add(rules, "Plum", "Peach", "rx"); smack_rule_set_add(rules, "Banana", "Peach", "xa"); - smack_rule_set_remove(rules, "Plum", "Peach"); rc = smack_rule_set_apply_kernel( rules, @@ -75,7 +74,6 @@ START_TEST(test_save_to_file) smack_rule_set_add(rules, "Apple", "Orange", "rwx"); smack_rule_set_add(rules, "Plum", "Peach", "rx"); smack_rule_set_add(rules, "Banana", "Peach", "xa"); - smack_rule_set_remove(rules, "Plum", "Peach"); rc = smack_rule_set_save( rules, @@ -93,52 +91,6 @@ START_TEST(test_save_to_file) } END_TEST -START_TEST(test_rule_set_remove_by_subject) -{ - int rc; - SmackRuleSet rules; - - rules = smack_rule_set_new(NULL); - fail_unless(rules != NULL, "Creating rule set failed"); - if (rules == NULL) - return; - - smack_rule_set_add(rules, "Apple", "Orange", "rwx"); - smack_rule_set_add(rules, "Plum", "Peach", "rx"); - smack_rule_set_add(rules, "Banana", "Peach", "xa"); - - smack_rule_set_remove_by_subject(rules, "Plum"); - - rc = smack_rule_set_have_access(rules, "Plum", "Peach", "rx"); - fail_unless(rc == 0, "Access granted to a removed rule"); - - smack_rule_set_free(rules); -} -END_TEST - -START_TEST(test_rule_set_remove_by_object) -{ - int rc; - SmackRuleSet rules; - - rules = smack_rule_set_new(NULL); - fail_unless(rules != NULL, "Creating rule set failed"); - if (rules == NULL) - return; - - smack_rule_set_add(rules, "Apple", "Orange", "rwx"); - smack_rule_set_add(rules, "Plum", "Peach", "rx"); - smack_rule_set_add(rules, "Banana", "Peach", "xa"); - - smack_rule_set_remove_by_object(rules, "Peach"); - - rc = smack_rule_set_have_access(rules, "Plum", "Peach", "rx"); - fail_unless(rc == 0, "Access granted to a removed rule"); - - smack_rule_set_free(rules); -} -END_TEST - Suite *ruleset_suite (void) { Suite *s; @@ -149,8 +101,6 @@ Suite *ruleset_suite (void) tc_core = tcase_create("Rules"); tcase_add_test(tc_core, test_save_to_kernel); tcase_add_test(tc_core, test_save_to_file); - tcase_add_test(tc_core, test_rule_set_remove_by_subject); - tcase_add_test(tc_core, test_rule_set_remove_by_object); suite_add_tcase(s, tc_core); return s; -- 2.7.4