projects
/
project
/
ubus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ubusd: fix id lookup of objects with path and no methods
[project/ubus.git]
/
ubusd_proto.c
diff --git
a/ubusd_proto.c
b/ubusd_proto.c
index
b591384
..
d2feed9
100644
(file)
--- a/
ubusd_proto.c
+++ b/
ubusd_proto.c
@@
-156,7
+156,7
@@
static int ubusd_handle_add_object(struct ubus_client *cl, struct ubus_msg_buf *
static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, struct ubus_object *obj)
{
struct ubus_method *m;
static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, struct ubus_object *obj)
{
struct ubus_method *m;
- int cnt = 0;
+ int
all_cnt = 0,
cnt = 0;
void *s;
if (!obj->type)
void *s;
if (!obj->type)
@@
-170,6
+170,7
@@
static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE);
list_for_each_entry(m, &obj->type->methods, list) {
s = blob_nest_start(&b, UBUS_ATTR_SIGNATURE);
list_for_each_entry(m, &obj->type->methods, list) {
+ all_cnt++;
if (!ubusd_acl_check(cl, obj->path.key, blobmsg_name(m->data), UBUS_ACL_ACCESS)) {
blobmsg_add_blob(&b, m->data);
cnt++;
if (!ubusd_acl_check(cl, obj->path.key, blobmsg_name(m->data), UBUS_ACL_ACCESS)) {
blobmsg_add_blob(&b, m->data);
cnt++;
@@
-177,7
+178,7
@@
static void ubusd_send_obj(struct ubus_client *cl, struct ubus_msg_buf *ub, stru
}
blob_nest_end(&b, s);
}
blob_nest_end(&b, s);
- if (cnt)
+ if (cnt
|| !all_cnt
)
ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
}
ubus_proto_send_msg_from_blob(cl, ub, UBUS_MSG_DATA);
}