X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=list.c;h=99179712e8b88c6b567ca04e1b9046edcd8b3b33;hb=862bdfa26c2f016e2db67dc700d87ca4cf24a6e9;hp=c683dd236fd973feb2b8aef3e3b0de51e2c891ac;hpb=796bfd3cf5f2540674a78825b101691ce43e1069;p=uci.git

diff --git a/list.c b/list.c
index c683dd2..9917971 100644
--- a/list.c
+++ b/list.c
@@ -371,7 +371,11 @@ uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool ext
 	ptr->flags |= UCI_LOOKUP_DONE;
 
 	/* look up the package first */
-	e = uci_lookup_list(&ctx->root, ptr->package);
+	if (ptr->p)
+		e = &ptr->p->e;
+	else
+		e = uci_lookup_list(&ctx->root, ptr->package);
+
 	if (!e) {
 		UCI_INTERNAL(uci_load, ctx, ptr->package, &ptr->p);
 		if (!ptr->p)
@@ -382,12 +386,14 @@ uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool ext
 		ptr->last = e;
 	}
 
-	if (!ptr->section)
+	if (!ptr->section && !ptr->s)
 		goto complete;
 
 	/* if the section name validates as a regular name, pass through
 	 * to the regular uci_lookup function call */
-	if (ptr->flags & UCI_LOOKUP_EXTENDED) {
+	if (ptr->s) {
+		e = &ptr->s->e;
+	} else if (ptr->flags & UCI_LOOKUP_EXTENDED) {
 		if (extended)
 			e = uci_lookup_ext_section(ctx, ptr);
 		else