diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-01-11 16:35:03 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-01-11 16:35:04 -0600 |
| commit | 319648977c190b3d51ba886ce781362d7e79bcc9 (patch) | |
| tree | e796046e0baccb515ed73d950cd6d1f93959dbfe | |
| parent | b543e389d051b57ef6cefb179d444c4e0157b1c2 (diff) | |
| parent | dc2c000fd59a5c97d646a76d5f5dd7eaeb5a6a2a (diff) | |
Merge "res_crypto: Perform cleanup at shutdown."
| -rw-r--r-- | res/res_crypto.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/res/res_crypto.c b/res/res_crypto.c index d8f328f08..e7cb72878 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -652,13 +652,17 @@ static int load_module(void) } else { 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; } static int unload_module(void) { - /* Can't unload this once we're loaded */ - return -1; + ast_cli_unregister_multiple(cli_crypto, ARRAY_LEN(cli_crypto)); + + return 0; } /* needs usecount semantics defined */ |