diff options
| m--------- | grecs | 0 | ||||
| -rw-r--r-- | modules/mailutils/mod_mailutils.c | 2 | ||||
| -rw-r--r-- | src/module.c | 2 | ||||
| -rw-r--r-- | tests/notify-upl.at | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/grecs b/grecs -Subproject 57a00b140954a2c22ba2fdebc93e8e6eda41b2a +Subproject 477701c059d73e47aa1bac97e96d801542f2bd8 diff --git a/modules/mailutils/mod_mailutils.c b/modules/mailutils/mod_mailutils.c index ae437ff..f705168 100644 --- a/modules/mailutils/mod_mailutils.c +++ b/modules/mailutils/mod_mailutils.c @@ -593,13 +593,13 @@ static struct grecs_keyword notify_event_kw[] = { }; void * wy_config(grecs_node_t *node) { int i; - struct mailevt *evt = grecs_malloc(sizeof(*evt)); + struct mailevt *evt = grecs_zalloc(sizeof(*evt)); for (i = 0; notify_event_kw[i].ident; i++) notify_event_kw[i].varptr = evt; if (grecs_tree_process(node->down, notify_event_kw)) { free(evt); evt = NULL; diff --git a/src/module.c b/src/module.c index 33946ee..ca1d471 100644 --- a/src/module.c +++ b/src/module.c @@ -144,13 +144,13 @@ conf_notification_modules(struct notification *np) struct module *mod = modlookup(np->modname); if (!mod) { wy_log(LOG_ERR, "%s: no such module", np->modname); return 1; } - if (!np->modcfg && mod->config) { + if (!np->modcfg && mod->config && np->modnode) { np->modcfg = mod->config(np->modnode); if (!np->modcfg) { wy_log(LOG_ERR, "%s: failed to configure", np->modname); return 1; diff --git a/tests/notify-upl.at b/tests/notify-upl.at index 2c60c90..ab69e4f 100644 --- a/tests/notify-upl.at +++ b/tests/notify-upl.at @@ -12,13 +12,13 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with Wydawca. If not, see <http://www.gnu.org/licenses/>. AT_SETUP([Simple upload and notification]) -AT_KEYWORDS([notify]) +AT_KEYWORDS([notify notify-upl]) AT_DATA([errtmpl], [wydawca: [[NOTICE]] AT_PACKAGE_TARNAME (AT_PACKAGE_NAME AT_PACKAGE_VERSION) started wydawca: [[NOTICE]] file.directive.asc: VERSION: 1.1 wydawca: [[NOTICE]] file.directive.asc: COMMENT: Gnupload for Wydawca testsuite wydawca: [[INFO]] errors: 0 |