[sr-dev] git:master:0a161d19: Merge pull request #2022 from mancasg/master

Module: kamailio Branch: master Commit: 0a161d19707917f690b5823b64d120cccc354c8b URL: https://github.com/kamailio/kamailio/commit/0a161d19707917f690b5823b64d120c… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: GitHub &lt;noreply(a)github.com&gt; Date: 2019-08-12T11:37:11+02:00 Merge pull request #2022 from mancasg/master core: Fix the cfg framework variable input type default --- Modified: src/core/cfg/cfg.c --- Diff: https://github.com/kamailio/kamailio/commit/0a161d19707917f690b5823b64d120c… Patch: https://github.com/kamailio/kamailio/commit/0a161d19707917f690b5823b64d120c… --- diff --git a/src/core/cfg/cfg.c b/src/core/cfg/cfg.c index 3822a9c94d..488d72f35a 100644 --- a/src/core/cfg/cfg.c +++ b/src/core/cfg/cfg.c @@ -94,7 +94,7 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, /* verify the type of the input */ if (CFG_INPUT_MASK(def[i].type)==0) { - def[i].type |= def[i].type << CFG_INPUT_SHIFT; + def[i].type |= CFG_VAR_MASK(def[i].type) << CFG_INPUT_SHIFT; } else { if ((CFG_INPUT_MASK(def[i].type) != CFG_VAR_MASK(def[i].type) << CFG_INPUT_SHIFT) && (def[i].on_change_cb == 0)) {