json = afb_req_json(req);
if (wrap_json_unpack(json, "s", runid)
- || wrap_json_unpack(json, "{ss}", "runid", runid)) {
+ && wrap_json_unpack(json, "{ss}", "runid", runid)) {
INFO("bad request method %s: %s", method,
json_object_to_json_string(json));
bad_request(req);
/* scan the request */
json = afb_req_json(req);
if (wrap_json_unpack(json, "s", &appid)
- || wrap_json_unpack(json, "{ss}", _id_, &appid)) {
+ && wrap_json_unpack(json, "{ss}", _id_, &appid)) {
bad_request(req);
return;
}
/* scan the request */
json = afb_req_json(req);
if (wrap_json_unpack(json, "s", &appid)
- || wrap_json_unpack(json, "{ss}", _id_, &appid)) {
+ && wrap_json_unpack(json, "{ss}", _id_, &appid)) {
bad_request(req);
return;
}
/* scan the request */
json = afb_req_json(req);
if (wrap_json_unpack(json, "s", &appid)
- || wrap_json_unpack(json, "{ss}", _id_, &appid)) {
+ && wrap_json_unpack(json, "{ss}", _id_, &appid)) {
bad_request(req);
return;
}
/* scan the request */
json = afb_req_json(req);
if (wrap_json_unpack(json, "s", &wgtfile)
- || wrap_json_unpack(json, "{ss s?s s?b s?b}",
+ && wrap_json_unpack(json, "{ss s?s s?b s?b}",
"wgt", &wgtfile,
"root", &root,
"force", &force,
if (ifo == NULL)
afb_req_fail_f(req, "failed", "installation failed: %m");
else {
+ afm_udb_update(afudb);
/* reload if needed */
if (reload)
do_reloads();
/* scan the request */
json = afb_req_json(req);
if (wrap_json_unpack(json, "s", &idaver)
- || wrap_json_unpack(json, "{ss s?s}",
+ && wrap_json_unpack(json, "{ss s?s}",
_id_, &idaver,
"root", &root)) {
return bad_request(req);
if (rc)
afb_req_fail_f(req, "failed", "uninstallation failed: %m");
else {
+ afm_udb_update(afudb);
afb_req_success(req, NULL, NULL);
application_list_changed(_uninstall_, idaver);
}
return -1;
}
- /* set the systemd's buses */
- systemd_set_bus(0, afb_daemon_get_system_bus());
- systemd_set_bus(1, afb_daemon_get_user_bus());
-
/* create TRUE */
json_true = json_object_new_boolean(1);
/* get dpath of userid */
nun = alloca((size_t)(arodot - uname) + strlen(userid) + strlen(arodot) + 1);
stpcpy(stpcpy(stpncpy(nun, uname, (size_t)(arodot - uname)), userid), arodot);
- dp = systemd_unit_dpath_by_name(*isuser, uname, 1);
+ dp = systemd_unit_dpath_by_name(*isuser, nun, 1);
if (dp == NULL) {
- ERROR("Can't load unit of name %s for %s: %m", uname, uscope);
+ ERROR("Can't load unit of name %s for %s: %m", nun, uscope);
goto error;
}
/* record the dpath */
if (rc < 0) {
j_read_string_at(appli, "unit-scope", &uscope);
j_read_string_at(appli, "unit-name", &uname);
- ERROR("can't start %s unit %s", uscope, uname);
+ ERROR("can't start %s unit %s for uid %d", uscope, uname, uid);
goto error;
}
if (state == NULL) {
j_read_string_at(appli, "unit-scope", &uscope);
j_read_string_at(appli, "unit-name", &uname);
- ERROR("can't wait %s unit %s: %m", uscope, uname);
+ ERROR("can't wait %s unit %s for uid %d: %m", uscope, uname, uid);
goto error;
}
if (state != SysD_State_Active) {
j_read_string_at(appli, "unit-scope", &uscope);
j_read_string_at(appli, "unit-name", &uname);
- ERROR("start error %s unit %s: %s", uscope, uname, state);
+ ERROR("start error %s unit %s for uid %d: %s", uscope, uname, uid, state);
goto error;
}
if (rc < 0) {
j_read_string_at(appli, "unit-scope", &uscope);
j_read_string_at(appli, "unit-name", &uname);
- ERROR("can't getpid of %s unit %s: %m", uscope, uname);
+ ERROR("can't getpid of %s unit %s for uid %d: %m", uscope, uname, uid);
goto error;
}