[sr-dev] [kamailio/kamailio] ldap: rename private function ldap_connect (PR #2975)

``` When compiling against openldap 2.6.0 kamailio's private ldap_connect() clashes with openldap's own. curl dealt with a similar issue earlier (see [1]). Simply rename the function to avoid the issue. In file included from ldap_api_fn.c:37: ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'; have 'int(char *)' 34 | extern int ldap_connect(char *_ld_name); | ^~~~~~~~~~~~ In file included from ldap_api_fn.c:33: /home/sk/tmp/sdk/openwrt-sdk-ath79-generic_gcc-11.2.0_musl.Linux-x86_64/staging_dir/target-mips_24kc_musl/usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' with type 'int(LDAP *)' {aka 'int(struct ldap *)'} 1555 | ldap_connect( LDAP *ld ); | ^~~~~~~~~~~~ make[5]: *** [../../Makefile.rules:100: ldap_api_fn.o] Error 1 make[4]: *** [Makefile:511: modules] Error 1 ``` [1] https://github.com/curl/curl/commit/8bdde6b14ce3b5fd71c772a578fcbd4b6fa6df19 Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> <!-- Kamailio Pull Request Template --> <!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception --> #### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] 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) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description <!-- Describe your changes in detail --> Hi all, Small compile fix. I saw kamailio is failing to build on OpenWrt build bots since a recent openldap bump from 2.4.58 to 2.6.0. I linked a curl commit in the commit message, they also renamed some of their functions, although they did rename all their ldap_* functions to oldap_. I didn't dare do that in kamailio :) Renaming a single function was enough to make it compile again. Maybe you want to do something different to address this issue, I don't know. I didn't runtest this. Kind regards, Seb You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2975 -- Commit Summary -- * ldap: rename private function ldap_connect -- File Changes -- M src/modules/ldap/ldap_connect.c (2) M src/modules/ldap/ldap_connect.h (2) M src/modules/ldap/ldap_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2975.patch https://github.com/kamailio/kamailio/pull/2975.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2975