X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubus.git;a=blobdiff_plain;f=ubusd_obj.c;h=08314732567e7c03f066ae8d4c5faad22f381eff;hp=69ca8b871fd8c6a3cfc83dd04945cb897bac71be;hb=6f4e11e1db399074273944329883f9c35e7daef6;hpb=a69f062cbd4041229f8d29ef9647bf783df414c1

diff --git a/ubusd_obj.c b/ubusd_obj.c
index 69ca8b8..0831473 100644
--- a/ubusd_obj.c
+++ b/ubusd_obj.c
@@ -58,6 +58,9 @@ static struct ubus_object_type *ubus_create_obj_type(struct blob_attr *sig)
 	int rem;
 
 	type = calloc(1, sizeof(*type));
+	if (!type)
+		return NULL;
+
 	type->refcount = 1;
 
 	if (!ubus_alloc_id(&obj_types, &type->id, 0))
@@ -142,6 +145,9 @@ struct ubus_object *ubusd_create_object(struct ubus_client *cl, struct blob_attr
 		return NULL;
 
 	if (attr[UBUS_ATTR_OBJPATH]) {
+		if (ubusd_acl_check(cl, blob_data(attr[UBUS_ATTR_OBJPATH]), NULL, UBUS_ACL_PUBLISH))
+			goto free;
+
 		obj->path.key = strdup(blob_data(attr[UBUS_ATTR_OBJPATH]));
 		if (!obj->path.key)
 			goto free;
@@ -164,12 +170,12 @@ free:
 	return NULL;
 }
 
-void ubus_subscribe(struct ubus_object *obj, struct ubus_object *target, const char *method)
+void ubus_subscribe(struct ubus_object *obj, struct ubus_object *target)
 {
 	struct ubus_subscription *s;
 	bool first = list_empty(&target->subscribers);
 
-	s = calloc(1, sizeof(*s) + strlen(method) + 1);
+	s = calloc(1, sizeof(*s));
 	if (!s)
 		return;
 
@@ -177,7 +183,6 @@ void ubus_subscribe(struct ubus_object *obj, struct ubus_object *target, const c
 	s->target = target;
 	list_add(&s->list, &target->subscribers);
 	list_add(&s->target_list, &obj->target_list);
-	strcpy(s->method, method);
 
 	if (first)
 		ubus_notify_subscription(target);
@@ -220,10 +225,12 @@ void ubusd_free_object(struct ubus_object *obj)
 	free(obj);
 }
 
-static void __init ubusd_obj_init(void)
+static void __constructor ubusd_obj_init(void)
 {
 	ubus_init_id_tree(&objects);
 	ubus_init_id_tree(&obj_types);
 	ubus_init_string_tree(&path, false);
 	ubusd_event_init();
+	ubusd_acl_init();
+	ubusd_monitor_init();
 }