sorcery: Output an error message if a wizard is specified for an object type and...
authorJoshua Colp <jcolp@digium.com>
Sat, 14 Feb 2015 19:46:09 +0000 (19:46 +0000)
committerJoshua Colp <jcolp@digium.com>
Sat, 14 Feb 2015 19:46:09 +0000 (19:46 +0000)
ASTERISK-24612 #close
Reported by: Joshua Colp
........

Merged revisions 431771 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431772 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/sorcery.c

index 17d2625..cec3f1b 100644 (file)
@@ -892,7 +892,11 @@ enum ast_sorcery_apply_result __ast_sorcery_apply_wizard_mapping(struct ast_sorc
        RAII_VAR(struct ast_sorcery_object_wizard *, object_wizard, ao2_alloc(sizeof(*object_wizard), sorcery_object_wizard_destructor), ao2_cleanup);
        int created = 0;
 
-       if (!wizard || !object_wizard) {
+       if (!wizard) {
+               ast_log(LOG_ERROR, "Wizard '%s' could not be applied to object type '%s' as it was not found\n",
+                       name, type);
+               return AST_SORCERY_APPLY_FAIL;
+       } else if (!object_wizard) {
                return AST_SORCERY_APPLY_FAIL;
        }