X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-dbus.c;h=7b6134fa4b9420f4aad3026f1a44144c80ec3a45;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=0ac4f4995bd354d1f9581196fd2f3384d7c08549;hpb=eaf5670e9d10b5d7c066043e7563706cf1e01bd5;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-dbus.c b/src/afb-api-dbus.c
index 0ac4f499..7b6134fa 100644
--- a/src/afb-api-dbus.c
+++ b/src/afb-api-dbus.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2019 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -682,6 +682,7 @@ static void init_origin_creds(struct origin *origin)
 	gid_t gid;
 	pid_t pid;
 	const char *context;
+	struct afb_cred *ocred;
 
 	rc = sd_bus_get_name_creds(origin->api->sdbus, origin->name,
 			SD_BUS_CREDS_PID|SD_BUS_CREDS_UID|SD_BUS_CREDS_GID|SD_BUS_CREDS_SELINUX_CONTEXT,
@@ -689,13 +690,14 @@ static void init_origin_creds(struct origin *origin)
 	if (rc < 0)
 		origin->cred = NULL;
 	else {
-		afb_cred_unref(origin->cred);
 		sd_bus_creds_get_uid(c, &uid);
 		sd_bus_creds_get_gid(c, &gid);
 		sd_bus_creds_get_pid(c, &pid);
 		sd_bus_creds_get_selinux_context(c, &context);
+		ocred = origin->cred;
 		origin->cred = afb_cred_create(uid, gid, pid, context);
 		sd_bus_creds_unref(c);
+		afb_cred_unref(ocred);
 	}
 }
 
@@ -849,7 +851,7 @@ static int dbus_req_subscribe(struct afb_xreq *xreq, struct afb_event_x2 *event)
 	uint64_t msgid;
 	int rc;
 
-	rc = afb_evt_event_x2_add_watch(dreq->listener->listener, event);
+	rc = afb_evt_listener_watch_x2(dreq->listener->listener, event);
 	sd_bus_message_get_cookie(dreq->message, &msgid);
 	afb_api_dbus_server_event_send(dreq->listener->origin, 'S', afb_evt_event_x2_fullname(event), afb_evt_event_x2_id(event), "", msgid);
 	return rc;
@@ -863,7 +865,7 @@ static int dbus_req_unsubscribe(struct afb_xreq *xreq, struct afb_event_x2 *even
 
 	sd_bus_message_get_cookie(dreq->message, &msgid);
 	afb_api_dbus_server_event_send(dreq->listener->origin, 'U', afb_evt_event_x2_fullname(event), afb_evt_event_x2_id(event), "", msgid);
-	rc = afb_evt_event_x2_remove_watch(dreq->listener->listener, event);
+	rc = afb_evt_listener_unwatch_x2(dreq->listener->listener, event);
 	return rc;
 }
 
@@ -970,7 +972,7 @@ static int api_dbus_server_on_object_called(sd_bus_message *message, void *userd
 
 	/* connect to the context */
 	afb_xreq_init(&dreq->xreq, &afb_api_dbus_xreq_itf);
-	if (afb_context_connect(&dreq->xreq.context, uuid, NULL) < 0)
+	if (afb_context_connect(&dreq->xreq.context, uuid, NULL, NULL) < 0)
 		goto out_of_memory;
 	session = dreq->xreq.context.session;
 
@@ -980,8 +982,8 @@ static int api_dbus_server_on_object_called(sd_bus_message *message, void *userd
 		goto out_of_memory;
 
 	/* fulfill the request and emit it */
-	dreq->xreq.context.flags = flags;
-	dreq->xreq.cred = afb_cred_mixed_on_behalf_import(listener->origin->cred, &dreq->xreq.context, creds && creds[0] ? creds : NULL);
+	afb_context_change_cred(&dreq->xreq.context, listener->origin->cred);
+	afb_context_on_behalf_import(&dreq->xreq.context, creds);
 	dreq->message = sd_bus_message_ref(message);
 	dreq->json = json_tokener_parse_verbose(dreq->request, &jerr);
 	if (jerr != json_tokener_success) {