fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-04-30 08:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

systemd: update sd-daemon.[ch] from upstream systemd

Browse source
This commit is contained in:
Lennart Poettering 2010-09-05 23:30:47 +02:00
parent 87d324c343
commit 1b56dabaaa
2 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dbus/sd-daemon.c
View file

@ -1,4 +1,4 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
Copyright 2010 Lennart Poettering
@ -332,11 +332,6 @@ int sd_notify(int unset_environment, const char *state) {
struct msghdr msghdr;
struct iovec iovec;
union sockaddr_union sockaddr;
struct ucred *ucred;
union {
struct cmsghdr cmsghdr;
uint8_t buf[CMSG_SPACE(sizeof(struct ucred))];
} control;
const char *e;
if (!state) {
@ -369,16 +364,6 @@ int sd_notify(int unset_environment, const char *state) {
iovec.iov_base = (char*) state;
iovec.iov_len = strlen(state);
memset(&control, 0, sizeof(control));
control.cmsghdr.cmsg_level = SOL_SOCKET;
control.cmsghdr.cmsg_type = SCM_CREDENTIALS;
control.cmsghdr.cmsg_len = CMSG_LEN(sizeof(struct ucred));
ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr);
ucred->pid = getpid();
ucred->uid = getuid();
ucred->gid = getgid();
memset(&msghdr, 0, sizeof(msghdr));
msghdr.msg_name = &sockaddr;
msghdr.msg_namelen = sizeof(sa_family_t) + strlen(e);
@ -388,8 +373,6 @@ int sd_notify(int unset_environment, const char *state) {
msghdr.msg_iov = &iovec;
msghdr.msg_iovlen = 1;
msghdr.msg_control = &control;
msghdr.msg_controllen = control.cmsghdr.cmsg_len;
if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) {
r = -errno;
@ -441,10 +424,10 @@ int sd_booted(void) {
/* We simply test whether the systemd cgroup hierarchy is
* mounted */
if (lstat("/cgroup", &a) < 0)
if (lstat("/sys/fs/cgroup", &a) < 0)
return 0;
if (lstat("/cgroup/systemd", &b) < 0)
if (lstat("/sys/fs/cgroup/systemd", &b) < 0)
return 0;
return a.st_dev != b.st_dev;

2
dbus/sd-daemon.h
View file

@ -1,4 +1,4 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#ifndef foosddaemonhfoo
#define foosddaemonhfoo