X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fservice.c;h=8097e26b0034bac306813b92d4e26815ad8e7d6d;hp=4eb3d9e6688d1ff4990dc30a08d424f8001b2135;hb=79a98c609da042c60260e8e0236464014d480dcb;hpb=db69869f264af2d1afcdd3e573e0e9fdd5bef065;ds=sidebyside diff --git a/src/core/service.c b/src/core/service.c index 4eb3d9e66..8097e26b0 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -3656,6 +3656,8 @@ static void service_bus_name_owner_change( } int service_set_socket_fd(Service *s, int fd, Socket *sock) { + _cleanup_free_ char *peer = NULL; + int r; assert(s); assert(fd >= 0); @@ -3673,6 +3675,23 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock) { if (s->state != SERVICE_DEAD) return -EAGAIN; + if (getpeername_pretty(fd, &peer) >= 0) { + + if (UNIT(s)->description) { + _cleanup_free_ char *a; + + a = strjoin(UNIT(s)->description, " (", peer, ")", NULL); + if (!a) + return -ENOMEM; + + r = unit_set_description(UNIT(s), a); + } else + r = unit_set_description(UNIT(s), peer); + + if (r < 0) + return r; + } + s->socket_fd = fd; unit_ref_set(&s->accept_socket, UNIT(sock));