picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update sd-daemon.[ch]

Browse source
This commit is contained in:
Kay Sievers 2011-03-23 01:34:29 +01:00
parent 180bac9db8
commit b7822bc498
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
udev/sd-daemon.c
View file

@ -228,7 +228,7 @@ int sd_is_socket(int fd, int family, int type, int listening) {
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
if (l < offsetof(struct sockaddr_un, sun_path))
if (l < sizeof(sa_family_t))
return -EINVAL;
return sockaddr.sa.sa_family == family;
@ -254,7 +254,7 @@ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
if (l < offsetof(struct sockaddr_un, sun_path))
if (l < sizeof(sa_family_t))
return -EINVAL;
if (sockaddr.sa.sa_family != AF_INET &&
@ -296,7 +296,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
if (l < offsetof(struct sockaddr_un, sun_path))
if (l < sizeof(sa_family_t))
return -EINVAL;
if (sockaddr.sa.sa_family != AF_UNIX)

6
udev/sd-daemon.h
View file

@ -185,7 +185,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
READY=1 Tells systemd that daemon startup is finished (only
relevant for services of Type=notify). The passed
argument is a boolean "1" or "0". Since there is
little value in signalling non-readiness the only
little value in signaling non-readiness the only
value daemons should send is "READY=1".
STATUS=... Passes a single-line status string back to systemd
@ -206,7 +206,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
fork off the process itself. Example: "MAINPID=4711"
Daemons can choose to send additional variables. However, it is
recommened to prefix variable names not listed above with X_.
recommended to prefix variable names not listed above with X_.
Returns a negative errno-style error code on failure. Returns > 0
if systemd could be notified, 0 if it couldn't possibly because
@ -252,7 +252,7 @@ int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(
fine. You should NOT protect them with a call to this function. Also
note that this function checks whether the system, not the user
session is controlled by systemd. However the functions above work
for both session and system services.
for both user and system services.
See sd_booted(3) for more information.
*/