#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)

#### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality)

#### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)

#### Description ul.dump rpc procedure has two problems: - it doesn't call unlock_ulslot() for "ul.dump brief" when aor creation fails - json format of its reply is incorrect for multiple domains. They are not represented as an array of domains and this breaks "kamctl ul show" while "kamcmd ul.dump" still works.

Table unlocking is safe and needs to be backported to the stable branch. New output format of "ul.dump" can be considered as a breaking change since somebody can use this command to get registered users information and parse it. You can view, comment on, or merge this pull request online at:

https://github.com/kamailio/kamailio/pull/1275

-- Commit Summary --

* Fix memory leak in ldap module that happens after calling ldap_result_next() * Merge branch 'master' of https://github.com/kamailio/kamailio * tsilo: fix deadlock in ts_append() * Merge branch 'master' of https://github.com/kamailio/kamailio * ipops: new naptr_query function * Merge branch 'master' of https://github.com/kamailio/kamailio * Merge remote-tracking branch 'upstream/master' * Merge remote-tracking branch 'upstream/master' * usrloc: fix format of the ul.dump json reply * usrloc: fix usrloc slot lock in ul.dump rpc procedure * Merge branch 'master' of https://github.com/kamailio/kamailio

-- File Changes --

M src/modules/usrloc/ul_rpc.c (24)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/1275.patch https://github.com/kamailio/kamailio/pull/1275.diff