diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-02 05:27:53 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-02 05:27:53 +0000 |
| commit | 8190e96fad6481eed053dc724ce5d8fbb89d8ad1 (patch) | |
| tree | ee5cd1ddfc1d54e98a53cdf5a1e70cccc4d53a2e /pbx | |
| parent | 5eae9f44f74f9869e46e416a2d5d092834043483 (diff) | |
Merged revisions 284610 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r284610 | tilghman | 2010-09-02 00:20:59 -0500 (Thu, 02 Sep 2010) | 10 lines
When optional_api is non-optional, force dependent modules to be loaded.
(closes issue #17707)
Reported by: ira
Patches:
20100819__issue17707__asterisk1.8.diff.txt uploaded by tilghman (license 14)
Tested by: tilghman
Review: https://reviewboard.asterisk.org/r/876/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_dundi.c | 1 | ||||
| -rw-r--r-- | pbx/pbx_loopback.c | 1 | ||||
| -rw-r--r-- | pbx/pbx_realtime.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index aaa30da0c..ef482df2c 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -4880,5 +4880,6 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Distributed Universal Nu .load = load_module, .unload = unload_module, .reload = reload, + .nonoptreq = "res_crypto", ); diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c index f51ec8204..9ab146398 100644 --- a/pbx/pbx_loopback.c +++ b/pbx/pbx_loopback.c @@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/sched.h" #include "asterisk/io.h" #include "asterisk/utils.h" -#include "asterisk/crypto.h" #include "asterisk/astdb.h" diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c index 2697ea0d2..f183c867b 100644 --- a/pbx/pbx_realtime.c +++ b/pbx/pbx_realtime.c @@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/sched.h" #include "asterisk/io.h" #include "asterisk/utils.h" -#include "asterisk/crypto.h" #include "asterisk/astdb.h" #include "asterisk/app.h" #include "asterisk/astobj2.h" |