Merge "res_crypto: Perform cleanup at shutdown." into 13

This commit is contained in:
Joshua Colp
2016-01-11 16:35:14 -06:00
committed by Gerrit Code Review

View File

@@ -652,13 +652,17 @@ static int load_module(void)
} else { } else {
crypto_load(-1, -1); crypto_load(-1, -1);
} }
/* This prevents dlclose from ever running, but allows CLI cleanup at shutdown. */
ast_module_shutdown_ref(ast_module_info->self);
return AST_MODULE_LOAD_SUCCESS; return AST_MODULE_LOAD_SUCCESS;
} }
static int unload_module(void) static int unload_module(void)
{ {
/* Can't unload this once we're loaded */ ast_cli_unregister_multiple(cli_crypto, ARRAY_LEN(cli_crypto));
return -1;
return 0;
} }
/* needs usecount semantics defined */ /* needs usecount semantics defined */