X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bus%2Fkdbus-d.c;h=db97c25351f57cb6812aef9eafc896b731b7023d;hb=946520da129ce586023f264cd4bb47dda2fd94a5;hp=3e247bea9f279b2b695b5f31bc47b289bb3ab5af;hpb=4d29dedeebef13332bbc30b1e50321e0fc616b0e;p=platform%2Fupstream%2Fdbus.git diff --git a/bus/kdbus-d.c b/bus/kdbus-d.c index 3e247be..db97c25 100644 --- a/bus/kdbus-d.c +++ b/bus/kdbus-d.c @@ -127,7 +127,7 @@ dbus_bool_t add_match_kdbus (DBusTransport* transport, __u64 id, const char *rul /*parsing rule and calculating size of command*/ size = sizeof(struct kdbus_cmd_match); if(parse_match_key(rule, "interface='", &pInterface)) /*actual size is not important for interface because bloom size is defined by bus*/ - size += KDBUS_PART_HEADER_SIZE + bloom_size; + size += KDBUS_ITEM_HEADER_SIZE + bloom_size; name_size = parse_match_key(rule, "sender='", &pName); if(name_size) { @@ -154,14 +154,14 @@ dbus_bool_t add_match_kdbus (DBusTransport* transport, __u64 id, const char *rul if(pName) { pItem->type = KDBUS_MATCH_SRC_NAME; - pItem->size = KDBUS_PART_HEADER_SIZE + name_size + 1; + pItem->size = KDBUS_ITEM_HEADER_SIZE + name_size + 1; memcpy(pItem->str, pName, strlen(pName) + 1); pItem = KDBUS_PART_NEXT(pItem); } if(pInterface) { pItem->type = KDBUS_MATCH_BLOOM; - pItem->size = KDBUS_PART_HEADER_SIZE + bloom_size; + pItem->size = KDBUS_ITEM_HEADER_SIZE + bloom_size; strncpy(pItem->data, pInterface, bloom_size); } @@ -222,85 +222,88 @@ dbus_bool_t remove_match_kdbus (DBusTransport* transport, __u64 id) */ int kdbus_NameQuery(const char* name, DBusTransport* transport, struct nameInfo* pInfo) { - struct kdbus_cmd_name_info *msg; - struct kdbus_item *item; - uint64_t size; + struct kdbus_cmd_conn_info *cmd; int ret; - uint64_t item_size; int fd; + uint64_t size; + __u64 id = 0; - pInfo->sec_label_len = 0; - pInfo->sec_label = NULL; + memset(pInfo, 0, sizeof(struct nameInfo)); if(!_dbus_transport_get_socket_fd(transport, &fd)) return -EPERM; - item_size = KDBUS_PART_HEADER_SIZE + strlen(name) + 1; - item_size = (item_size < 56) ? 56 : item_size; //at least 56 bytes are needed by kernel to place info about name, otherwise error - size = sizeof(struct kdbus_cmd_name_info) + item_size; + size = sizeof(struct kdbus_cmd_conn_info); + if((name[0] == ':') && (name[1] == '1') && (name[2] == '.')) /* if name starts with ":1." it is a unique name and should be send as number */ + id = strtoull(&name[3], NULL, 10); + if(id == 0) + size += strlen(name) + 1; - msg = malloc(size); - if (!msg) + cmd = alloca(size); + if (!cmd) { _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno)); return -errno; } - memset(msg, 0, size); - msg->size = size; - if((name[0] == ':') && (name[1] == '1') && (name[2] == '.')) /* if name starts with ":1." it is a unique name and should be send as number */ - msg->id = strtoull(&name[3], NULL, 10); - else - msg->id = 0; - - item = msg->items; - item->type = KDBUS_NAME_INFO_ITEM_NAME; - item->size = item_size; - memcpy(item->str, name, strlen(name) + 1); + memset(cmd, 0, sizeof(struct kdbus_cmd_conn_info)); + cmd->size = size; + cmd->id = id; + if(id == 0) + memcpy(cmd->name, name, strlen(name) + 1); again: - ret = ioctl(fd, KDBUS_CMD_NAME_QUERY, msg); + ret = ioctl(fd, KDBUS_CMD_CONN_INFO, cmd); if (ret < 0) { if(errno == EINTR) goto again; - if(errno == EAGAIN) - goto again; - else if(ret == -ENOBUFS) - { - msg = realloc(msg, msg->size); //prepare memory - if(msg != NULL) - goto again; - } pInfo->uniqueId = 0; - ret = -errno; + return -errno; } else { - pInfo->uniqueId = msg->id; - pInfo->userId = msg->creds.uid; - pInfo->processId = msg->creds.pid; - item = msg->items; - while((uint8_t *)(item) < (uint8_t *)(msg) + msg->size) + struct kdbus_conn_info *info; + struct kdbus_item *item; + + info = (struct kdbus_conn_info *)((char*)dbus_transport_get_pool_pointer(transport) + cmd->offset); + pInfo->uniqueId = info->id; + + item = info->items; + while((uint8_t *)(item) < (uint8_t *)(info) + info->size) { - if(item->type == KDBUS_NAME_INFO_ITEM_SECLABEL) - { - pInfo->sec_label_len = item->size - KDBUS_PART_HEADER_SIZE - 1; - if(pInfo->sec_label_len != 0) + if(item->type == KDBUS_ITEM_CREDS) { - pInfo->sec_label = malloc(pInfo->sec_label_len); - if(pInfo->sec_label == NULL) - ret = -1; - else - memcpy(pInfo->sec_label, item->data, pInfo->sec_label_len); + pInfo->userId = item->creds.uid; + pInfo->processId = item->creds.pid; } - break; - } + + if(item->type == KDBUS_ITEM_SECLABEL) + { + pInfo->sec_label_len = item->size - KDBUS_ITEM_HEADER_SIZE - 1; + if(pInfo->sec_label_len != 0) + { + pInfo->sec_label = malloc(pInfo->sec_label_len); + if(pInfo->sec_label == NULL) + ret = -1; + else + memcpy(pInfo->sec_label, item->data, pInfo->sec_label_len); + } + } + item = KDBUS_PART_NEXT(item); } + + again2: + if (ioctl(fd, KDBUS_CMD_FREE, &cmd->offset) < 0) + { + if(errno == EINTR) + goto again2; + _dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno); + return -errno; + } } - free(msg); return ret; } @@ -309,62 +312,99 @@ int kdbus_NameQuery(const char* name, DBusTransport* transport, struct nameInfo* */ char* make_kdbus_bus(DBusBusType type, const char* address, DBusError *error) { - struct { - struct kdbus_cmd_bus_make head; - uint64_t n_size; - uint64_t n_type; - char name[64]; - } __attribute__ ((__aligned__(8))) bus_make; - - int fdc, ret; - char *bus; - char *addr_value; - - _dbus_verbose("Opening /dev/kdbus/control\n"); - fdc = open("/dev/kdbus/control", O_RDWR|O_CLOEXEC); - if (fdc < 0) + // TODO Function alloca() used. In upstream there was a patch proposing to + // replace alloca() with malloc() to assure memory alignment. If there will be + // suggestion to use malloc instead of alloca this function has to be modified + struct kdbus_cmd_make *bus_make; + struct kdbus_item *item; + __u64 name_size, bus_make_size; + int fdc, ret; + char *addr_value = NULL; + char *bus = NULL; + char *name = NULL; + + if(type == DBUS_BUS_SYSTEM) + name_size = snprintf(name, 0, "%u-kdbus-%s", getuid(), "system") + 1; + else if(type == DBUS_BUS_SESSION) + name_size = snprintf(name, 0, "%u-kdbus", getuid()) + 1; + else + name_size = snprintf(name, 0, "%u-kdbus-%u", getuid(), getpid()) + 1; + + name = alloca(name_size); + if (!name) { - _dbus_verbose("--- error %d (%m)\n", fdc); - dbus_set_error(error, DBUS_ERROR_FAILED, "Opening /dev/kdbus/control failed: %d (%m)", fdc); - return NULL; + return NULL; } - addr_value = strchr(address, ':') + 1; + bus_make_size = sizeof(struct kdbus_cmd_make) + KDBUS_ITEM_SIZE(name_size) + KDBUS_ITEM_SIZE(sizeof(__u64)); + bus_make = alloca(bus_make_size); + if (!bus_make) + { + return NULL; + } - memset(&bus_make, 0, sizeof(bus_make)); - bus_make.head.bloom_size = 64; - bus_make.head.flags = KDBUS_MAKE_ACCESS_WORLD; - if(!strcmp(addr_value, "sbb")) - bus_make.head.flags |= KDBUS_MAKE_SBB_OFFSET; + bus_make->size = bus_make_size; +#ifdef POLICY_TO_KDBUS + bus_make->flags = KDBUS_MAKE_ACCESS_WORLD; +#else + bus_make->flags = KDBUS_MAKE_ACCESS_WORLD | KDBUS_MAKE_POLICY_OPEN; +#endif + item = bus_make->items; + + item->type = KDBUS_ITEM_MAKE_NAME; + item->size = KDBUS_ITEM_HEADER_SIZE + name_size; + if(type == DBUS_BUS_SYSTEM) + sprintf(name, "%u-kdbus-%s", getuid(), "system"); + else if(type == DBUS_BUS_SESSION) + sprintf(name, "%u-kdbus", getuid()); + else + sprintf(name, "%u-kdbus-%u", getuid(), getpid()); + memcpy((bus_make->items)->str, name, name_size); - if(type == DBUS_BUS_SYSTEM) - snprintf(bus_make.name, sizeof(bus_make.name), "%u-kdbus-%s", getuid(), "system"); - else if(type == DBUS_BUS_SESSION) - snprintf(bus_make.name, sizeof(bus_make.name), "%u-kdbus", getuid()); - else - snprintf(bus_make.name, sizeof(bus_make.name), "%u-kdbus-%u", getuid(), getpid()); + item = KDBUS_PART_NEXT(item); + item->type = KDBUS_ITEM_BLOOM_SIZE; + item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64); + item->data64[0] = 64; + + addr_value = strchr(address, ':') + 1; + if(*addr_value) + { + if(!strcmp(addr_value, "sbb")) + bus_make->flags |= KDBUS_MAKE_SBB_OFFSET; + else + { + dbus_set_error_const(error, DBUS_ERROR_BAD_ADDRESS, "Invalid address parameter."); + return NULL; + } + } - bus_make.n_type = KDBUS_MAKE_NAME; - bus_make.n_size = KDBUS_PART_HEADER_SIZE + strlen(bus_make.name) + 1; - bus_make.head.size = sizeof(struct kdbus_cmd_bus_make) + bus_make.n_size; + _dbus_verbose("Opening /dev/kdbus/control\n"); + fdc = open("/dev/kdbus/control", O_RDWR|O_CLOEXEC); + if (fdc < 0) + { + _dbus_verbose("--- error %d (%m)\n", fdc); + dbus_set_error(error, DBUS_ERROR_FAILED, "Opening /dev/kdbus/control failed: %d (%m)", fdc); + return NULL; + } - _dbus_verbose("Creating bus '%s'\n", bus_make.name); - ret = ioctl(fdc, KDBUS_CMD_BUS_MAKE, &bus_make); - if (ret) + _dbus_verbose("Creating bus '%s'\n", (bus_make->items[0]).str); + ret = ioctl(fdc, KDBUS_CMD_BUS_MAKE, bus_make); + if (ret) { - _dbus_verbose("--- error %d (%m)\n", ret); - dbus_set_error(error, DBUS_ERROR_FAILED, "Creating bus '%s' failed: %d (%m)", bus_make.name, fdc); - return NULL; + _dbus_verbose("--- error %d (%m)\n", errno); + dbus_set_error(error, DBUS_ERROR_FAILED, "Creating bus '%s' failed: %d (%m)", + (bus_make->items[0]).str, errno); + return NULL; } - if (asprintf(&bus, "kdbus:path=/dev/kdbus/%s/bus", bus_make.name) < 0) + if (asprintf(&bus, "kdbus:path=/dev/kdbus/%s/bus", (bus_make->items[0]).str) < 0) { - BUS_SET_OOM (error); - return NULL; + BUS_SET_OOM (error); + return NULL; } - _dbus_verbose("Return value '%s'\n", bus); - return bus; + _dbus_verbose("Return value '%s'\n", bus); + return bus; } /* @@ -382,7 +422,6 @@ static dbus_bool_t add_matches_for_kdbus_broadcasts(DBusConnection* connection) uint64_t size; int fd; DBusTransport *transport; - const char* unique_name; transport = dbus_connection_get_transport(connection); @@ -402,28 +441,28 @@ static dbus_bool_t add_matches_for_kdbus_broadcasts(DBusConnection* connection) return FALSE; } - unique_name = dbus_bus_get_unique_name(connection); - - pCmd_match->id = strtoull(&unique_name[3], NULL, 10); + pCmd_match->id = 0; pCmd_match->cookie = 1; pCmd_match->size = size; + pCmd_match->src_id = 0; pItem = pCmd_match->items; - pCmd_match->src_id = 0; pItem->type = KDBUS_MATCH_NAME_CHANGE; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; + pItem->size = KDBUS_ITEM_HEADER_SIZE + 1; pItem = KDBUS_PART_NEXT(pItem); pItem->type = KDBUS_MATCH_NAME_ADD; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; + pItem->size = KDBUS_ITEM_HEADER_SIZE + 1; pItem = KDBUS_PART_NEXT(pItem); pItem->type = KDBUS_MATCH_NAME_REMOVE; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; + pItem->size = KDBUS_ITEM_HEADER_SIZE + 1; pItem = KDBUS_PART_NEXT(pItem); pItem->type = KDBUS_MATCH_ID_ADD; - pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64); + pItem->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64); + pItem->id = KDBUS_MATCH_SRC_ID_ANY; pItem = KDBUS_PART_NEXT(pItem); pItem->type = KDBUS_MATCH_ID_REMOVE; - pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64); + pItem->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64); + pItem->id = KDBUS_MATCH_SRC_ID_ANY; if(ioctl(fd, KDBUS_CMD_MATCH_ADD, pCmd_match)) { @@ -479,8 +518,10 @@ dbus_bool_t register_daemon_name(DBusConnection* connection) BusTransaction *transaction; _dbus_string_init_const(&daemon_name, DBUS_SERVICE_DBUS); +#ifdef POLICY_TO_KDBUS if(!register_kdbus_policy(DBUS_SERVICE_DBUS, dbus_connection_get_transport(connection), geteuid())) return FALSE; +#endif if(kdbus_request_name(connection, &daemon_name, 0, 0) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) return FALSE; @@ -501,8 +542,12 @@ dbus_bool_t register_daemon_name(DBusConnection* connection) retval = TRUE; out: - bus_transaction_cancel_and_free(transaction); - return retval; + if(retval) + bus_transaction_execute_and_free(transaction); + else + bus_transaction_cancel_and_free(transaction); + + return retval; } dbus_uint32_t kdbus_request_name(DBusConnection* connection, const DBusString *service_name, dbus_uint32_t flags, __u64 sender_id) @@ -529,77 +574,85 @@ dbus_uint32_t kdbus_release_name(DBusConnection* connection, const DBusString *s dbus_bool_t kdbus_list_services (DBusConnection* connection, char ***listp, int *array_len) { int fd; - struct kdbus_cmd_names* pCmd; - __u64 cmd_size; + struct kdbus_cmd_name_list __attribute__ ((__aligned__(8))) cmd; + struct kdbus_name_list *name_list; + struct kdbus_cmd_name *name; + DBusTransport *transport = dbus_connection_get_transport(connection); dbus_bool_t ret_val = FALSE; char** list; int list_len = 0; int i = 0; int j; - cmd_size = sizeof(struct kdbus_cmd_names) + KDBUS_ITEM_SIZE(1); - pCmd = malloc(cmd_size); - if(pCmd == NULL) - goto out; - pCmd->size = cmd_size; + if(!_dbus_transport_get_socket_fd(transport, &fd)) + return FALSE; - _dbus_transport_get_socket_fd(dbus_connection_get_transport(connection), &fd); + cmd.flags = KDBUS_NAME_LIST_NAMES | KDBUS_NAME_LIST_UNIQUE; again: - cmd_size = 0; - if(ioctl(fd, KDBUS_CMD_NAME_LIST, pCmd)) + if(ioctl(fd, KDBUS_CMD_NAME_LIST, &cmd)) { if(errno == EINTR) goto again; - if(errno == ENOBUFS) //buffer to small to put all names into it - cmd_size = pCmd->size; //here kernel tells how much memory it needs else { _dbus_verbose("kdbus error asking for name list: err %d (%m)\n",errno); - goto out; - } - } - if(cmd_size) //kernel needs more memory - { - pCmd = realloc(pCmd, cmd_size); //prepare memory - if(pCmd == NULL) return FALSE; - goto again; //and try again + } } - else - { - struct kdbus_cmd_name* pCmd_name; - for (pCmd_name = pCmd->names; (uint8_t *)(pCmd_name) < (uint8_t *)(pCmd) + pCmd->size; pCmd_name = KDBUS_PART_NEXT(pCmd_name)) - list_len++; + name_list = (struct kdbus_name_list *)((char*)dbus_transport_get_pool_pointer(transport) + cmd.offset); - list = malloc(sizeof(char*) * (list_len + 1)); - if(list == NULL) - goto out; + for (name = name_list->names; (uint8_t *)(name) < (uint8_t *)(name_list) + name_list->size; name = KDBUS_PART_NEXT(name)) + list_len++; - for (pCmd_name = pCmd->names; (uint8_t *)(pCmd_name) < (uint8_t *)(pCmd) + pCmd->size; pCmd_name = KDBUS_PART_NEXT(pCmd_name)) - { - list[i] = strdup(pCmd_name->name); - if(list[i] == NULL) - { - for(j=0; jnames; (uint8_t *)(name) < (uint8_t *)(name_list) + name_list->size; name = KDBUS_PART_NEXT(name)) + { + if(name->size > sizeof(struct kdbus_cmd_name) ) + { + list[i] = strdup(name->name); + if(list[i] == NULL) + goto out; + } + else + { + list[i] = malloc(snprintf(list[i], 0, ":1.%llu0", (unsigned long long)name->id)); + if(list[i] == NULL) + goto out; + sprintf(list[i], ":1.%llu", (unsigned long long int)name->id); + } + _dbus_verbose ("Name %d: %s\n", i, list[i]); + ++i; + } + + list[i] = NULL; *array_len = list_len; *listp = list; ret_val = TRUE; out: - if(pCmd) - free(pCmd); + if (ioctl(fd, KDBUS_CMD_FREE, &cmd.offset) < 0) + { + if(errno == EINTR) + goto out; + _dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno); + ret_val = FALSE; + } + if(ret_val == FALSE) + { + for(j=0; jsize = cmd_size; - pCmd->names[0].id = 0; - pCmd->names[0].size = sizeof(struct kdbus_cmd_name) + name_length; - memcpy(pCmd->names[0].name, name, name_length); - _dbus_verbose ("Asking for queued owners of %s\n", pCmd->names[0].name); + pCmd->id = 0; + memcpy(pCmd->name, name, name_length); + + _dbus_verbose ("Asking for queued owners of %s\n", pCmd->name); - _dbus_transport_get_socket_fd(dbus_connection_get_transport(connection), &fd); + _dbus_transport_get_socket_fd(transport, &fd); again: - cmd_size = 0; if(ioctl(fd, KDBUS_CMD_NAME_LIST_QUEUED, pCmd)) { if(errno == EINTR) goto again; - if(errno == ENOBUFS) //buffer to small to put all names into it - cmd_size = pCmd->size; //here kernel tells how much memory it needs - else if(errno == ENOENT) + else if(errno == ESRCH) { dbus_set_error (error, DBUS_ERROR_NAME_HAS_NO_OWNER, "Could not get owners of name '%s': no such name", name); - free(pCmd); return FALSE; } else @@ -653,36 +705,32 @@ dbus_bool_t kdbus_list_queued (DBusConnection *connection, DBusList **return_li goto out; } } - if(cmd_size) //kernel needs more memory - { - pCmd = realloc(pCmd, cmd_size); //prepare memory - if(pCmd == NULL) - return FALSE; - goto again; //and try again - } - else - { - struct kdbus_cmd_name* pCmd_name; - for (pCmd_name = pCmd->names; (uint8_t *)(pCmd_name) < (uint8_t *)(pCmd) + pCmd->size; pCmd_name = KDBUS_PART_NEXT(pCmd_name)) - { - char *uname = NULL; + name_list = (struct kdbus_name_list *)((char*)dbus_transport_get_pool_pointer(transport) + pCmd->offset); - _dbus_verbose ("Got queued owner id: %llu\n", (unsigned long long)pCmd_name->id); - uname = malloc(snprintf(uname, 0, ":1.%llu0", (unsigned long long)pCmd_name->id)); - if(uname == NULL) - goto out; - sprintf(uname, ":1.%llu", (unsigned long long int)pCmd_name->id); - if (!_dbus_list_append (return_list, uname)) - goto out; - } + for (owner = name_list->names; (uint8_t *)(owner) < (uint8_t *)(name_list) + name_list->size; owner = KDBUS_PART_NEXT(owner)) + { + char *uname = NULL; + + _dbus_verbose ("Got queued owner id: %llu\n", (unsigned long long)owner->id); + uname = malloc(snprintf(uname, 0, ":1.%llu0", (unsigned long long)owner->id)); + if(uname == NULL) + goto out; + sprintf(uname, ":1.%llu", (unsigned long long int)owner->id); + if (!_dbus_list_append (return_list, uname)) + goto out; } ret_val = TRUE; out: - if(pCmd) - free(pCmd); + if (ioctl(fd, KDBUS_CMD_FREE, &pCmd->offset) < 0) + { + if(errno == EINTR) + goto out; + _dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno); + ret_val = FALSE; + } if(ret_val == FALSE) { DBusList *link; @@ -759,8 +807,8 @@ int kdbus_get_name_owner(DBusConnection* connection, const char* name, char* own sprintf(owner, ":1.%llu", (unsigned long long int)info.uniqueId); _dbus_verbose("Unique name discovered:%s\n", owner); } - else if(ret != -ENOENT) - _dbus_verbose("kdbus error sending name query: err %d (%m)\n", errno); + else if((ret != -ENOENT) && (ret != -ENXIO)) + _dbus_verbose("kdbus error sending name query: err %d (%m)\n", ret); return ret; } @@ -781,7 +829,7 @@ dbus_bool_t kdbus_get_unix_user(DBusConnection* connection, const char* name, un *uid = info.userId; return TRUE; } - else if(inter_ret == -ENOENT) //name has no owner + else if((inter_ret == -ENOENT) || (inter_ret == -ENXIO)) //name has no owner { _dbus_verbose ("Name %s has no owner.\n", name); dbus_set_error (error, DBUS_ERROR_FAILED, "Could not get UID of name '%s': no such name", name); @@ -812,7 +860,7 @@ dbus_bool_t kdbus_get_connection_unix_process_id(DBusConnection* connection, con *pid = info.processId; return TRUE; } - else if(inter_ret == -ENOENT) //name has no owner + else if((inter_ret == -ENOENT) || (inter_ret == -ENXIO)) //name has no owner dbus_set_error (error, DBUS_ERROR_FAILED, "Could not get PID of name '%s': no such name", name); else { @@ -835,7 +883,7 @@ dbus_bool_t kdbus_get_connection_unix_selinux_security_context(DBusConnection* c dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); inter_ret = kdbus_NameQuery(name, dbus_connection_get_transport(connection), &info); - if(inter_ret == -ENOENT) //name has no owner + if((inter_ret == -ENOENT) || (inter_ret == -ENXIO)) //name has no owner dbus_set_error (error, DBUS_ERROR_FAILED, "Could not get security context of name '%s': no such name", name); else if(inter_ret < 0) { @@ -953,7 +1001,6 @@ dbus_bool_t register_kdbus_starters(DBusConnection* connection) BusTransaction *transaction; DBusString name; DBusTransport* transport; - unsigned long int euid; transaction = bus_transaction_new (bus_connection_get_context(connection)); if (transaction == NULL) @@ -963,7 +1010,6 @@ dbus_bool_t register_kdbus_starters(DBusConnection* connection) return FALSE; transport = dbus_connection_get_transport(connection); - euid = geteuid(); if(!_dbus_transport_get_socket_fd (transport, &fd)) return FALSE; @@ -972,16 +1018,18 @@ dbus_bool_t register_kdbus_starters(DBusConnection* connection) for(i=0; i