diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/config-scripts/cups-systemd.m4

--- cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket	2011-08-05 15:09:00.789855786 +0100

+++ cups-1.5.0/config-scripts/cups-systemd.m4	2011-08-05 15:09:00.789855786 +0100

@@ -0,0 +1,25 @@

+dnl

+dnl "$Id$"

+dnl

+dnl   systemd stuff for CUPS.

+

+dnl Find whether systemd is available

+

+AC_ARG_WITH([systemdsystemunitdir],

+        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),

+        [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])

+if test "x$with_systemdsystemunitdir" != xno; then

+        AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])

+fi

+

+if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then

+        SYSTEMD_UNITS="cups.service cups.socket cups.path"

+else

+        SYSTEMD_UNITS=""

+fi

+

+AC_SUBST(SYSTEMD_UNITS)

+

+dnl

+dnl "$Id$"

+dnl

diff -up cups-1.5.0/configure.in.systemd-socket cups-1.5.0/configure.in

--- cups-1.5.0/configure.in.systemd-socket	2010-11-20 01:03:46.000000000 +0000

+++ cups-1.5.0/configure.in	2011-08-05 15:09:00.789855786 +0100

@@ -37,6 +37,7 @@ sinclude(config-scripts/cups-pam.m4)

 sinclude(config-scripts/cups-largefile.m4)

 sinclude(config-scripts/cups-dnssd.m4)

 sinclude(config-scripts/cups-launchd.m4)

+sinclude(config-scripts/cups-systemd.m4)

 sinclude(config-scripts/cups-defaults.m4)

 sinclude(config-scripts/cups-pdf.m4)

 sinclude(config-scripts/cups-scripting.m4)

@@ -71,6 +72,9 @@ AC_OUTPUT(Makedefs

 	  conf/snmp.conf

 	  cups-config

 	  data/testprint

+          data/cups.service

+          data/cups.socket

+          data/cups.path

 	  desktop/cups.desktop

 	  doc/help/ref-cupsd-conf.html

 	  doc/help/standard.html

diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.in

--- cups-1.5.0/data/cups.path.in.systemd-socket	2011-08-05 15:09:00.790855758 +0100

+++ cups-1.5.0/data/cups.path.in	2011-08-05 15:09:00.790855758 +0100

@@ -0,0 +1,8 @@

+[Unit]

+Description=CUPS Printer Service Spool

+

+[Path]

+PathExistsGlob=@CUPS_REQUESTS@/d*

+

+[Install]

+WantedBy=multi-user.target

diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.service.in

--- cups-1.5.0/data/cups.service.in.systemd-socket	2011-08-05 15:09:00.791855730 +0100

+++ cups-1.5.0/data/cups.service.in	2011-08-05 15:09:00.791855730 +0100

@@ -0,0 +1,9 @@

+[Unit]

+Description=CUPS Printing Service

+

+[Service]

+ExecStart=@sbindir@/cupsd -f

+

+[Install]

+Also=cups.socket cups.path

+WantedBy=printer.target

diff -up cups-1.5.0/data/cups.socket.in.systemd-socket cups-1.5.0/data/cups.socket.in

--- cups-1.5.0/data/cups.socket.in.systemd-socket	2011-08-05 15:09:00.791855730 +0100

+++ cups-1.5.0/data/cups.socket.in	2011-08-05 15:09:00.791855730 +0100

@@ -0,0 +1,9 @@

+[Unit]

+Description=CUPS Printing Service Sockets

+

+[Socket]

+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@

+ListenStream=631

+

+[Install]

+WantedBy=sockets.target

diff -up cups-1.5.0/data/Makefile.systemd-socket cups-1.5.0/data/Makefile

--- cups-1.5.0/data/Makefile.systemd-socket	2011-05-12 06:21:56.000000000 +0100

+++ cups-1.5.0/data/Makefile	2011-08-05 15:09:00.790855758 +0100

@@ -112,6 +112,12 @@ install-data:

 		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \

 	done

 	$(INSTALL_DIR) -m 755 $(DATADIR)/profiles

+	if test "x$(SYSTEMD_UNITS)" != "x" ; then \

+		$(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \

+		for file in $(SYSTEMD_UNITS); do \

+			$(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \

+		done; \

+	fi

 #

@@ -159,6 +165,9 @@ uninstall:

 	-$(RMDIR) $(DATADIR)/charsets

 	-$(RMDIR) $(DATADIR)/banners

 	-$(RMDIR) $(DATADIR)

+	for file in $(SYSTEMD_UNITS); do \

+		$(RM) $(SYSTEMDUNITDIR)/$$file; \

+	done

 #

diff -up cups-1.5.0/Makedefs.in.systemd-socket cups-1.5.0/Makedefs.in

--- cups-1.5.0/Makedefs.in.systemd-socket	2011-08-05 15:08:39.672435367 +0100

+++ cups-1.5.0/Makedefs.in	2011-08-05 15:09:00.788855814 +0100

@@ -143,6 +143,7 @@ CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@

 CXXLIBS		=	@CXXLIBS@

 DBUS_NOTIFIER	=	@DBUS_NOTIFIER@

 DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@

+SYSTEMD_UNITS   =       @SYSTEMD_UNITS@

 DNSSD_BACKEND	=	@DNSSD_BACKEND@

 DSOFLAGS	=	-L../cups @DSOFLAGS@

 DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)

@@ -267,6 +268,7 @@ PAMFILE		=	@PAMFILE@

 DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@

 DBUSDIR		=	@DBUSDIR@

+SYSTEMDUNITDIR  =       $(BUILDROOT)@systemdsystemunitdir@

 #

diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c

--- cups-1.5.0/scheduler/main.c.systemd-socket	2011-08-05 15:08:39.755433088 +0100

+++ cups-1.5.0/scheduler/main.c	2011-08-05 15:09:00.795855621 +0100

@@ -26,6 +26,8 @@

  *   launchd_checkin()     - Check-in with launchd and collect the listening

  *                           fds.

  *   launchd_checkout()    - Update the launchd KeepAlive file as needed.

+ *   systemd_checkin()     - Check-in with systemd and collect the

+ *                           listening fds.

  *   parent_handler()      - Catch USR1/CHLD signals...

  *   process_children()    - Process all dead children...

  *   select_timeout()      - Calculate the select timeout value.

@@ -62,6 +64,8 @@

 #  endif /* !LAUNCH_JOBKEY_SERVICEIPC */

 #endif /* HAVE_LAUNCH_H */

+#include "sd-daemon.h"

+

 #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)

 #  include <malloc.h>

 #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */

@@ -78,6 +82,7 @@

 static void		launchd_checkin(void);

 static void		launchd_checkout(void);

 #endif /* HAVE_LAUNCHD */

+static void		systemd_checkin(void);

 static void		parent_handler(int sig);

 static void		process_children(void);

 static void		sigchld_handler(int sig);

@@ -538,6 +543,11 @@ main(int  argc,				/* I - Number of comm

 #endif /* HAVE_LAUNCHD */

  /*

+  * If we were started by systemd get the listen sockets file descriptors...

+  */

+  systemd_checkin();

+

+ /*

   * Startup the server...

   */

@@ -760,6 +770,12 @@ main(int  argc,				/* I - Number of comm

 #endif /* HAVE_LAUNCHD */

        /*

+        * If we were started by systemd get the listen sockets file descriptors...

+        */

+

+        systemd_checkin();

+

+       /*

         * Startup the server...

         */

@@ -1584,6 +1600,97 @@ launchd_checkout(void)

 }

 #endif /* HAVE_LAUNCHD */

+static void

+systemd_checkin(void)

+{

+  int n, fd;

+

+  n = sd_listen_fds(1);

+  if (n < 0)

+  {

+    cupsdLogMessage(CUPSD_LOG_ERROR,

+           "systemd_checkin: Failed to acquire sockets from systemd - %s",

+           strerror(-n));

+    exit(EXIT_FAILURE);

+    return;

+  }

+

+  if (n == 0)

+    return;

+

+  for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++)

+  {

+    http_addr_t addr;

+    socklen_t addrlen;

+    int r;

+    cupsd_listener_t *lis;

+    char s[256];

+

+    r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1);

+    if (r < 0) {

+      cupsdLogMessage(CUPSD_LOG_ERROR,

+             "systemd_checkin: Unable to verify socket type - %s",

+             strerror(-r));

+      continue;

+    }

+

+    if (!r) {

+      cupsdLogMessage(CUPSD_LOG_ERROR,

+             "systemd_checkin: Socket not of the right type");

+      continue;

+    }

+

+    if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))

+    {

+      cupsdLogMessage(CUPSD_LOG_ERROR,

+             "systemd_checkin: Unable to get local address - %s",

+             strerror(errno));

+      continue;

+    }

+

+     /*

+    * Try to match the systemd socket address to one of the listeners...

+    */

+

+    for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);

+       lis;

+       lis = (cupsd_listener_t *)cupsArrayNext(Listeners))

+      if (httpAddrEqual(&lis->address, &addr))

+      break;

+

+    if (lis)

+    {

+      cupsdLogMessage(CUPSD_LOG_DEBUG,

+                      "systemd_checkin: Matched existing listener %s with fd %d...",

+                      httpAddrString(&(lis->address), s, sizeof(s)), fd);

+    }

+    else

+    {

+      cupsdLogMessage(CUPSD_LOG_DEBUG,

+                      "systemd_checkin: Adding new listener %s with fd %d...",

+                      httpAddrString(&addr, s, sizeof(s)), fd);

+

+      if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)

+      {

+        cupsdLogMessage(CUPSD_LOG_ERROR,

+                        "systemd_checkin: Unable to allocate listener - "

+                        "%s.", strerror(errno));

+        exit(EXIT_FAILURE);

+      }

+

+      cupsArrayAdd(Listeners, lis);

+

+      memcpy(&lis->address, &addr, sizeof(lis->address));

+    }

+

+    lis->fd = fd;

+

+#  ifdef HAVE_SSL

+    if (_httpAddrPort(&(lis->address)) == 443)

+      lis->encryption = HTTP_ENCRYPT_ALWAYS;

+#  endif /* HAVE_SSL */

+  }

+}

 /*

  * 'parent_handler()' - Catch USR1/CHLD signals...

diff -up cups-1.5.0/scheduler/Makefile.systemd-socket cups-1.5.0/scheduler/Makefile

--- cups-1.5.0/scheduler/Makefile.systemd-socket	2011-08-05 15:08:39.765432815 +0100

+++ cups-1.5.0/scheduler/Makefile	2011-08-05 15:09:22.170268932 +0100

@@ -41,6 +41,7 @@ CUPSDOBJS =	\

 		server.o \

 		statbuf.o \

 		subscriptions.o \

+		sd-daemon.o \

 		sysman.o \

 		timeout.o

 LIBOBJS =	\

@@ -571,6 +572,14 @@ sloc:

 #

+# Update sd-daemon.[ch] drop-in file from upstream git

+#

+

+update-systemd:

+	curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c

+	curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h

+

+#

 # Dependencies...

 #

diff -up cups-1.5.0/scheduler/sd-daemon.c.systemd-socket cups-1.5.0/scheduler/sd-daemon.c

--- cups-1.5.0/scheduler/sd-daemon.c.systemd-socket	2011-08-05 15:09:00.796855594 +0100

+++ cups-1.5.0/scheduler/sd-daemon.c	2011-08-05 15:09:00.796855594 +0100

@@ -0,0 +1,520 @@

+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/

+

+/***

+  Copyright 2010 Lennart Poettering

+

+  Permission is hereby granted, free of charge, to any person

+  obtaining a copy of this software and associated documentation files

+  (the "Software"), to deal in the Software without restriction,

+  including without limitation the rights to use, copy, modify, merge,

+  publish, distribute, sublicense, and/or sell copies of the Software,

+  and to permit persons to whom the Software is furnished to do so,

+  subject to the following conditions:

+

+  The above copyright notice and this permission notice shall be

+  included in all copies or substantial portions of the Software.

+

+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+  SOFTWARE.

+***/

+

+#ifndef _GNU_SOURCE

+#define _GNU_SOURCE

+#endif

+

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <sys/socket.h>

+#include <sys/un.h>

+#include <sys/fcntl.h>

+#include <netinet/in.h>

+#include <stdlib.h>

+#include <errno.h>

+#include <unistd.h>

+#include <string.h>

+#include <stdarg.h>

+#include <stdio.h>

+#include <stddef.h>

+#include <limits.h>

+

+#if defined(__linux__)

+#include <mqueue.h>

+#endif

+

+#include "sd-daemon.h"

+

+#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS)

+#define _sd_hidden_ __attribute__ ((visibility("hidden")))

+#else

+#define _sd_hidden_

+#endif

+

+_sd_hidden_ int sd_listen_fds(int unset_environment) {

+

+#if defined(DISABLE_SYSTEMD) || !defined(__linux__)

+        return 0;

+#else

+        int r, fd;

+        const char *e;

+        char *p = NULL;

+        unsigned long l;

+

+        if (!(e = getenv("LISTEN_PID"))) {

+                r = 0;

+                goto finish;

+        }

+

+        errno = 0;

+        l = strtoul(e, &p, 10);

+

+        if (errno != 0) {

+                r = -errno;

+                goto finish;

+        }

+

+        if (!p || *p || l <= 0) {

+                r = -EINVAL;

+                goto finish;

+        }

+

+        /* Is this for us? */

+        if (getpid() != (pid_t) l) {

+                r = 0;

+                goto finish;

+        }

+

+        if (!(e = getenv("LISTEN_FDS"))) {

+                r = 0;

+                goto finish;

+        }

+

+        errno = 0;

+        l = strtoul(e, &p, 10);

+

+        if (errno != 0) {

+                r = -errno;

+                goto finish;

+        }

+

+        if (!p || *p) {

+                r = -EINVAL;

+                goto finish;

+        }

+

+        for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) {

+                int flags;

+

+                if ((flags = fcntl(fd, F_GETFD)) < 0) {

+                        r = -errno;

+                        goto finish;

+                }

+

+                if (flags & FD_CLOEXEC)

+                        continue;

+

+                if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) {

+                        r = -errno;

+                        goto finish;

+                }

+        }

+

+        r = (int) l;

+

+finish:

+        if (unset_environment) {

+                unsetenv("LISTEN_PID");

+                unsetenv("LISTEN_FDS");

+        }

+

+        return r;

+#endif

+}

+

+_sd_hidden_ int sd_is_fifo(int fd, const char *path) {

+        struct stat st_fd;

+

+        if (fd < 0)

+                return -EINVAL;

+

+        memset(&st_fd, 0, sizeof(st_fd));

+        if (fstat(fd, &st_fd) < 0)

+                return -errno;

+

+        if (!S_ISFIFO(st_fd.st_mode))

+                return 0;

+

+        if (path) {

+                struct stat st_path;

+

+                memset(&st_path, 0, sizeof(st_path));

+                if (stat(path, &st_path) < 0) {

+

+                        if (errno == ENOENT || errno == ENOTDIR)

+                                return 0;

+

+                        return -errno;

+                }

+

+                return

+                        st_path.st_dev == st_fd.st_dev &&

+                        st_path.st_ino == st_fd.st_ino;

+        }

+

+        return 1;

+}

+

+_sd_hidden_ int sd_is_special(int fd, const char *path) {

+        struct stat st_fd;

+

+        if (fd < 0)

+                return -EINVAL;

+

+        if (fstat(fd, &st_fd) < 0)

+                return -errno;

+

+        if (!S_ISREG(st_fd.st_mode) && !S_ISCHR(st_fd.st_mode))

+                return 0;

+

+        if (path) {

+                struct stat st_path;

+

+                if (stat(path, &st_path) < 0) {

+

+                        if (errno == ENOENT || errno == ENOTDIR)

+                                return 0;

+

+                        return -errno;

+                }

+

+                if (S_ISREG(st_fd.st_mode) && S_ISREG(st_path.st_mode))

+                        return

+                                st_path.st_dev == st_fd.st_dev &&

+                                st_path.st_ino == st_fd.st_ino;

+                else if (S_ISCHR(st_fd.st_mode) && S_ISCHR(st_path.st_mode))

+                        return st_path.st_rdev == st_fd.st_rdev;

+                else

+                        return 0;

+        }

+

+        return 1;

+}

+

+static int sd_is_socket_internal(int fd, int type, int listening) {

+        struct stat st_fd;

+

+        if (fd < 0 || type < 0)

+                return -EINVAL;

+

+        if (fstat(fd, &st_fd) < 0)

+                return -errno;

+

+        if (!S_ISSOCK(st_fd.st_mode))

+                return 0;

+

+        if (type != 0) {

+                int other_type = 0;

+                socklen_t l = sizeof(other_type);

+

+                if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0)

+                        return -errno;

+

+                if (l != sizeof(other_type))

+                        return -EINVAL;

+

+                if (other_type != type)

+                        return 0;

+        }

+

+        if (listening >= 0) {

+                int accepting = 0;

+                socklen_t l = sizeof(accepting);

+

+                if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0)

+                        return -errno;

+

+                if (l != sizeof(accepting))

+                        return -EINVAL;

+

+                if (!accepting != !listening)

+                        return 0;

+        }

+

+        return 1;

+}

+

+union sockaddr_union {

+        struct sockaddr sa;

+        struct sockaddr_in in4;

+        struct sockaddr_in6 in6;

+        struct sockaddr_un un;

+        struct sockaddr_storage storage;

+};

+

+_sd_hidden_ int sd_is_socket(int fd, int family, int type, int listening) {

+        int r;

+

+        if (family < 0)

+                return -EINVAL;

+

+        if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)

+                return r;

+

+        if (family > 0) {

+                union sockaddr_union sockaddr;

+                socklen_t l;

+

+                memset(&sockaddr, 0, sizeof(sockaddr));

+                l = sizeof(sockaddr);

+

+                if (getsockname(fd, &sockaddr.sa, &l) < 0)

+                        return -errno;

+

+                if (l < sizeof(sa_family_t))

+                        return -EINVAL;

+

+                return sockaddr.sa.sa_family == family;

+        }

+

+        return 1;

+}

+

+_sd_hidden_ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) {

+        union sockaddr_union sockaddr;

+        socklen_t l;

+        int r;

+

+        if (family != 0 && family != AF_INET && family != AF_INET6)

+                return -EINVAL;

+

+        if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)

+                return r;

+

+        memset(&sockaddr, 0, sizeof(sockaddr));

+        l = sizeof(sockaddr);

+

+        if (getsockname(fd, &sockaddr.sa, &l) < 0)

+                return -errno;

+

+        if (l < sizeof(sa_family_t))

+                return -EINVAL;

+

+        if (sockaddr.sa.sa_family != AF_INET &&

+            sockaddr.sa.sa_family != AF_INET6)

+                return 0;

+

+        if (family > 0)

+                if (sockaddr.sa.sa_family != family)

+                        return 0;

+

+        if (port > 0) {

+                if (sockaddr.sa.sa_family == AF_INET) {

+                        if (l < sizeof(struct sockaddr_in))

+                                return -EINVAL;

+

+                        return htons(port) == sockaddr.in4.sin_port;

+                } else {

+                        if (l < sizeof(struct sockaddr_in6))

+                                return -EINVAL;

+

+                        return htons(port) == sockaddr.in6.sin6_port;

+                }

+        }

+

+        return 1;

+}

+

+_sd_hidden_ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {

+        union sockaddr_union sockaddr;

+        socklen_t l;

+        int r;

+

+        if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)

+                return r;

+

+        memset(&sockaddr, 0, sizeof(sockaddr));

+        l = sizeof(sockaddr);

+

+        if (getsockname(fd, &sockaddr.sa, &l) < 0)

+                return -errno;

+

+        if (l < sizeof(sa_family_t))

+                return -EINVAL;

+

+        if (sockaddr.sa.sa_family != AF_UNIX)

+                return 0;

+

+        if (path) {

+                if (length <= 0)

+                        length = strlen(path);

+

+                if (length <= 0)

+                        /* Unnamed socket */

+                        return l == offsetof(struct sockaddr_un, sun_path);

+

+                if (path[0])

+                        /* Normal path socket */

+                        return

+                                (l >= offsetof(struct sockaddr_un, sun_path) + length + 1) &&

+                                memcmp(path, sockaddr.un.sun_path, length+1) == 0;

+                else

+                        /* Abstract namespace socket */

+                        return

+                                (l == offsetof(struct sockaddr_un, sun_path) + length) &&

+                                memcmp(path, sockaddr.un.sun_path, length) == 0;

+        }

+

+        return 1;

+}

+

+_sd_hidden_ int sd_is_mq(int fd, const char *path) {

+#if !defined(__linux__)

+        return 0;

+#else

+        struct mq_attr attr;

+

+        if (fd < 0)

+                return -EINVAL;

+

+        if (mq_getattr(fd, &attr) < 0)

+                return -errno;

+

+        if (path) {

+                char fpath[PATH_MAX];

+                struct stat a, b;

+

+                if (path[0] != '/')

+                        return -EINVAL;

+

+                if (fstat(fd, &a) < 0)

+                        return -errno;

+

+                strncpy(stpcpy(fpath, "/dev/mqueue"), path, sizeof(fpath) - 12);

+                fpath[sizeof(fpath)-1] = 0;

+

+                if (stat(fpath, &b) < 0)

+                        return -errno;

+

+                if (a.st_dev != b.st_dev ||

+                    a.st_ino != b.st_ino)

+                        return 0;

+        }

+

+        return 1;

+#endif

+}

+

+_sd_hidden_ int sd_notify(int unset_environment, const char *state) {

+#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC)

+        return 0;

+#else

+        int fd = -1, r;

+        struct msghdr msghdr;

+        struct iovec iovec;

+        union sockaddr_union sockaddr;

+        const char *e;

+

+        if (!state) {

+                r = -EINVAL;

+                goto finish;

+        }

+

+        if (!(e = getenv("NOTIFY_SOCKET")))

+                return 0;

+

+        /* Must be an abstract socket, or an absolute path */

+        if ((e[0] != '@' && e[0] != '/') || e[1] == 0) {

+                r = -EINVAL;

+                goto finish;

+        }

+

+        if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {

+                r = -errno;

+                goto finish;

+        }

+

+        memset(&sockaddr, 0, sizeof(sockaddr));

+        sockaddr.sa.sa_family = AF_UNIX;

+        strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path));

+

+        if (sockaddr.un.sun_path[0] == '@')

+                sockaddr.un.sun_path[0] = 0;

+

+        memset(&iovec, 0, sizeof(iovec));

+        iovec.iov_base = (char*) state;

+        iovec.iov_len = strlen(state);

+

+        memset(&msghdr, 0, sizeof(msghdr));

+        msghdr.msg_name = &sockaddr;

+        msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e);

+

+        if (msghdr.msg_namelen > sizeof(struct sockaddr_un))

+                msghdr.msg_namelen = sizeof(struct sockaddr_un);

+

+        msghdr.msg_iov = &iovec;

+        msghdr.msg_iovlen = 1;

+

+        if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) {

+                r = -errno;

+                goto finish;

+        }

+

+        r = 1;

+

+finish:

+        if (unset_environment)

+                unsetenv("NOTIFY_SOCKET");

+

+        if (fd >= 0)

+                close(fd);

+

+        return r;

+#endif

+}

+

+_sd_hidden_ int sd_notifyf(int unset_environment, const char *format, ...) {

+#if defined(DISABLE_SYSTEMD) || !defined(__linux__)

+        return 0;

+#else

+        va_list ap;

+        char *p = NULL;

+        int r;

+

+        va_start(ap, format);

+        r = vasprintf(&p, format, ap);

+        va_end(ap);

+

+        if (r < 0 || !p)

+                return -ENOMEM;

+

+        r = sd_notify(unset_environment, p);

+        free(p);

+

+        return r;

+#endif

+}

+

+_sd_hidden_ int sd_booted(void) {

+#if defined(DISABLE_SYSTEMD) || !defined(__linux__)

+        return 0;

+#else

+

+        struct stat a, b;

+

+        /* We simply test whether the systemd cgroup hierarchy is

+         * mounted */

+

+        if (lstat("/sys/fs/cgroup", &a) < 0)

+                return 0;

+

+        if (lstat("/sys/fs/cgroup/systemd", &b) < 0)

+                return 0;

+

+        return a.st_dev != b.st_dev;

+#endif

+}

diff -up cups-1.5.0/scheduler/sd-daemon.h.systemd-socket cups-1.5.0/scheduler/sd-daemon.h

--- cups-1.5.0/scheduler/sd-daemon.h.systemd-socket	2011-08-05 15:09:00.797855566 +0100

+++ cups-1.5.0/scheduler/sd-daemon.h	2011-08-05 15:09:00.797855566 +0100

@@ -0,0 +1,277 @@

+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/

+

+#ifndef foosddaemonhfoo

+#define foosddaemonhfoo

+

+/***

+  Copyright 2010 Lennart Poettering

+

+  Permission is hereby granted, free of charge, to any person

+  obtaining a copy of this software and associated documentation files

+  (the "Software"), to deal in the Software without restriction,

+  including without limitation the rights to use, copy, modify, merge,

+  publish, distribute, sublicense, and/or sell copies of the Software,

+  and to permit persons to whom the Software is furnished to do so,

+  subject to the following conditions:

+

+  The above copyright notice and this permission notice shall be

+  included in all copies or substantial portions of the Software.

+

+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

+  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

+  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+  SOFTWARE.

+***/

+

+#include <sys/types.h>

+#include <inttypes.h>

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+/*

+  Reference implementation of a few systemd related interfaces for