Don't call into the debug subsystem after we've deregistered the

plugin's instance.

diff --git a/plugins/sudoers/iolog.c b/plugins/sudoers/iolog.c
index 179c99d7350b6049a615f6faef0be8e7a94ee2bd..fb6f815c03435c6c1624345a85712da18e0baa8d 100644 (file)
--- a/plugins/sudoers/iolog.c
+++ b/plugins/sudoers/iolog.c
@@ -699,12 +699,13 @@ sudoers_io_close(int exit_status, int error)
     }
     sudo_debug_set_default_instance(prev_instance);
 
+    sudo_debug_exit(__func__, __FILE__, __LINE__, sudo_debug_subsys);
     if (sudoers_debug_instance != SUDO_DEBUG_INSTANCE_INITIALIZER) {
        sudo_debug_deregister(sudoers_debug_instance);
        sudoers_debug_instance = SUDO_DEBUG_INSTANCE_INITIALIZER;
     }
 
-    debug_return;
+    return;
 }
 
 static int

diff --git a/plugins/sudoers/policy.c b/plugins/sudoers/policy.c
index 35f9371904cb3eb9acaa4bf0e6a2f423b8b2f09c..ad9c5e42085be6d4970c97c43b1a05f744714715 100644 (file)
--- a/plugins/sudoers/policy.c
+++ b/plugins/sudoers/policy.c
@@ -600,12 +600,13 @@ sudoers_policy_close(int exit_status, int error_code)
     user_gids = NULL;
     sudo_debug_set_default_instance(prev_instance);
 
+    sudo_debug_exit(__func__, __FILE__, __LINE__, sudo_debug_subsys);
     if (sudoers_debug_instance != SUDO_DEBUG_INSTANCE_INITIALIZER) {
        sudo_debug_deregister(sudoers_debug_instance);
        sudoers_debug_instance = SUDO_DEBUG_INSTANCE_INITIALIZER;
     }
 
-    debug_return;
+    return;
 }
 
 /*