isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for deregistering hooks. If an I/O log plugin fails

Browse Source 
to initialize, deregister its hooks (if any).
This commit is contained in:
Todd C. Miller
2012-03-08 11:29:32 -05:00
parent d4a3a5d8b9
commit 9b58120c36
2 changed files with 135 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/sudo.c
View File

@@ -139,6 +139,7 @@ static int iolog_open(struct plugin_container *plugin, char * const settings[],
static void iolog_close(struct plugin_container *plugin, int exit_status,
int error);
static int iolog_show_version(struct plugin_container *plugin, int verbose);
static void iolog_unlink(struct plugin_container *plugin);
#ifdef RLIMIT_CORE
static struct rlimit corelimit;
@@ -275,8 +276,8 @@ main(int argc, char *argv[], char *envp[])
case 1:
break;
case 0:
/* I/O plugin asked to be disabled, remove from list. */
tq_remove(&io_plugins, plugin);
/* I/O plugin asked to be disabled, remove and free. */
iolog_unlink(plugin);
break;
case -2:
usage(1);
@@ -1197,3 +1198,25 @@ iolog_show_version(struct plugin_container *plugin, int verbose)
debug_decl(iolog_show_version, SUDO_DEBUG_PCOMM)
debug_return_bool(plugin->u.io->show_version(verbose));
}
/*
* Remove the specified I/O logging plugin from the io_plugins list.
* Deregisters any hooks before unlinking, then frees the container.
*/
static void
iolog_unlink(struct plugin_container *plugin)
{
debug_decl(iolog_unlink, SUDO_DEBUG_PCOMM)
/* Deregister hooks, if any. */
if (plugin->u.io->version >= SUDO_API_MKVERSION(1, 2)) {
if (plugin->u.io->deregister_hooks != NULL)
plugin->u.io->deregister_hooks(SUDO_HOOK_VERSION,
deregister_hook);
}
/* Remove from io_plugins list and free. */
tq_remove(&io_plugins, plugin);
efree(plugin);
debug_return;
}