From d205625335021057b1216d5aa4171480286568a6 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Sun, 20 Sep 2009 21:23:01 -0400 Subject: [PATCH] --- yaml --- r: 169147 b: refs/heads/master c: af8ff04917169805b151280155bf772d3ca9bec0 h: refs/heads/master i: 169145: 808b0baa7204e3423f528be89caac06787b0fac5 169143: af2d69ba355543fdb6b41aeced24a9a4a31f4e6d v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7ba7ae852982..c72be04d1934 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1669b049db50fc7f1d4e694fb115a0f408c63fce +refs/heads/master: af8ff04917169805b151280155bf772d3ca9bec0 diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index bb230d5d7085..a985d0bc59bb 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -5830,12 +5830,12 @@ int selinux_disable(void) selinux_disabled = 1; selinux_enabled = 0; - /* Try to destroy the avc node cache */ - avc_disable(); - /* Reset security_ops to the secondary module, dummy or capability. */ security_ops = secondary_ops; + /* Try to destroy the avc node cache */ + avc_disable(); + /* Unregister netfilter hooks. */ selinux_nf_ip_exit();