]> pilppa.com Git - uci.git/commitdiff
make uci_lookup_ptr() use the extended flag properly again
authorFelix Fietkau <nbd@openwrt.org>
Fri, 20 Aug 2010 13:51:07 +0000 (15:51 +0200)
committerFelix Fietkau <nbd@openwrt.org>
Fri, 20 Aug 2010 13:51:07 +0000 (15:51 +0200)
list.c

diff --git a/list.c b/list.c
index 0b3a3f2ad2db079ddf73d523faef9987a09750d2..c683dd236fd973feb2b8aef3e3b0de51e2c891ac 100644 (file)
--- a/list.c
+++ b/list.c
@@ -387,10 +387,14 @@ uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool ext
 
        /* if the section name validates as a regular name, pass through
         * to the regular uci_lookup function call */
-       if (ptr->flags & UCI_LOOKUP_EXTENDED)
-               e = uci_lookup_ext_section(ctx, ptr);
-       else
+       if (ptr->flags & UCI_LOOKUP_EXTENDED) {
+               if (extended)
+                       e = uci_lookup_ext_section(ctx, ptr);
+               else
+                       UCI_THROW(ctx, UCI_ERR_INVAL);
+       } else {
                e = uci_lookup_list(&ptr->p->sections, ptr->section);
+       }
 
        if (!e)
                goto abort;