sr-dev December 2018

sr-dev@lists.kamailio.org

23 participants
314 discussions

[kamailio/kamailio] Missing options for psql in pgsql_ro_query prevents usage of kamctl (#1750)
by Victor Seva 03 Dec '18

03 Dec '18

>From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906233 > In the current version missing command line options for the read-only psql call (in pgsql_ro_query) prevents usage of kamctl for PostgreSQL backend, e.g. when adding a _new_ user: > root@debian9 ~ # kamctl add phone_u phone_p database engine 'PGSQL' loaded Control engine 'FIFO' loaded is_user: user counter=1 INFO: user 'phone_u' already exists > This is because the psql query returns the correct result (0 in this case) but the pgsql_ro_query function lacks the psql options -A -q -t as defined. >As a result the query contains the result and the coloumn name and footer,e.g. in this case: ``` root@debian9 ~ # /usr/bin/psql -h localhost -U kamailioro kamailio \ -c "select count(*) from subscriber where username='phone_u';" count ------- 0 (1 row) ``` >In this example the "kamctl add" command looks at the last line of the output to check if the user is already defined and misinterprets the result as it expectes "0" as the result. >This affect not only the "kamctl add" command but most calls that calls $DBROCMD in kamctl. -- 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/issues/1750

1 1

git:master:1894b378: utils/kamctl: [pgsql] add missing options for pgsql_ro_query()
by Victor Seva 03 Dec '18

03 Dec '18

Module: kamailio Branch: master Commit: 1894b378f975e7129024f6f10640c6c642e30a1b URL: https://github.com/kamailio/kamailio/commit/1894b378f975e7129024f6f10640c6c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-03T12:29:33+01:00 utils/kamctl: [pgsql] add missing options for pgsql_ro_query() Thanks Andreas Maus <maus+debianbug(a)ypbind.de> fix #1750 --- Modified: utils/kamctl/kamctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/1894b378f975e7129024f6f10640c6c… Patch: https://github.com/kamailio/kamailio/commit/1894b378f975e7129024f6f10640c6c… --- diff --git a/utils/kamctl/kamctl.pgsql b/utils/kamctl/kamctl.pgsql index 7e5abaef9a..1250dc0d7e 100644 --- a/utils/kamctl/kamctl.pgsql +++ b/utils/kamctl/kamctl.pgsql @@ -57,15 +57,17 @@ pgsql_query() { # input: sql query, optional pgsql command-line params pgsql_ro_query() { - mdbg "pgsql_ro_query: $PGSQL $2 -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" + mdbg "pgsql_ro_query: $PGSQL $2 -A -q -t -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" if [ -z "$DBPORT" ] ; then PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -U $DBROUSER \ $DBNAME \ -c "$1" else PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -p $DBPORT \ -U $DBROUSER \

1 0

[kamailio/kamailio] utils/kamctl: [pgsql] add missing options for pgsql_ro_query() (#1751)
by Victor Seva 03 Dec '18

03 Dec '18

Thanks Andreas Maus <maus+debianbug(a)ypbind.de>   #### Pre-Submission Checklist    - [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:  - [X] PR should be backported to stable branches - [ ] Tested changes locally - [X] Related to issue #1750 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1751 -- Commit Summary -- * utils/kamctl: [pgsql] add missing options for pgsql_ro_query() -- File Changes -- M utils/kamctl/kamctl.pgsql (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1751.patch https://github.com/kamailio/kamailio/pull/1751.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/1751

2 2

git:master:c94207bf: textops: fixed the kemi export for regex_substring()
by Daniel-Constantin Mierla 03 Dec '18

03 Dec '18

Module: kamailio Branch: master Commit: c94207bf3a3324bb0f443da031feee7947a452f7 URL: https://github.com/kamailio/kamailio/commit/c94207bf3a3324bb0f443da031feee7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-03T08:23:35+01:00 textops: fixed the kemi export for regex_substring() --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/c94207bf3a3324bb0f443da031feee7… Patch: https://github.com/kamailio/kamailio/commit/c94207bf3a3324bb0f443da031feee7… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index c7c110beb1..3db4626232 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4856,7 +4856,7 @@ static sr_kemi_t sr_kemi_textops_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("textops"), str_init("regex_substring"), - SR_KEMIP_INT, regex_substring_f, + SR_KEMIP_INT, ki_regex_substring, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE } },

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2018