diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-01-11 16:35:14 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-01-11 16:35:14 -0600 |
| commit | ddc9c1f72089bb998a6b8689d8fe3f134e1d26ec (patch) | |
| tree | c660a7ce9580336f2db47a540116312f9cfd5b81 /res | |
| parent | 85fdbcefae17b9b91a9dd087955a7a903922a6ea (diff) | |
| parent | a5406b1f9e5fdad87a91c82d6ee39249472bd0dc (diff) | |
Merge "res_crypto: Perform cleanup at shutdown." into 13
Diffstat (limited to 'res')
| -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 78b8df209..168342791 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 */ |