From: Corey Farrell Date: Mon, 6 Apr 2015 15:17:18 +0000 (+0000) Subject: res_pjsip_phoneprov_provider: Revert 433996 / 433997. X-Git-Tag: 14.0.0-beta1~1122 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffd7319df337a2b99f4df4422b27d8aee07697af;p=thirdparty%2Fasterisk.git res_pjsip_phoneprov_provider: Revert 433996 / 433997. res_pjsip_phoneprov_provider is using ao2_callback with OBJ_MULTIPLE, then ignoring the return. OBJ_NODATA flag was to prevent a reference leak, but this caused the module to FRACK on unload. Revert change until this can be investigated further. ASTERISK-24935 Reported by: Corey Farrell Review: https://reviewboard.asterisk.org/r/4578/ ........ Merged revisions 434025 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@434026 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_pjsip_phoneprov_provider.c b/res/res_pjsip_phoneprov_provider.c index 656fdd2956..70dd99e067 100644 --- a/res/res_pjsip_phoneprov_provider.c +++ b/res/res_pjsip_phoneprov_provider.c @@ -353,7 +353,7 @@ static int load_users(void) return 0; } - ao2_callback(users, OBJ_MULTIPLE | OBJ_NODATA, users_apply_handler, sorcery); + ao2_callback(users, OBJ_MULTIPLE, users_apply_handler, sorcery); ao2_ref(users, -1); return 0;