X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fchroot.c;h=ccd56be090cc6b64d4454a5d8b4f804af7267fc2;hb=7a5b2f69af7d36d6cd4153142f125fa011784e03;hp=4420c41d8105ffe382a8e7895f721f007be20a01;hpb=908e491f7d55209acfbb2595ab1ef5b24502d641;p=catta

diff --git a/avahi-daemon/chroot.c b/avahi-daemon/chroot.c
index 4420c41..ccd56be 100644
--- a/avahi-daemon/chroot.c
+++ b/avahi-daemon/chroot.c
@@ -64,15 +64,15 @@ static const char* const get_file_name_table[AVAHI_CHROOT_MAX] = {
     NULL,
     "/etc/resolv.conf",
 #ifdef HAVE_DBUS
-    AVAHI_DBUS_INTROSPECTION_DIR"/Server.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/EntryGroup.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/AddressResolver.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/DomainBrowser.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/HostNameResolver.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/ServiceBrowser.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/ServiceResolver.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/ServiceTypeBrowser.introspect",
-    AVAHI_DBUS_INTROSPECTION_DIR"/RecordBrowser.introspect",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.Server.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.EntryGroup.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.AddressResolver.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.DomainBrowser.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.HostNameResolver.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.ServiceBrowser.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.ServiceResolver.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.ServiceTypeBrowser.xml",
+    AVAHI_DBUS_INTROSPECTION_DIR"/org.freedesktop.Avahi.RecordBrowser.xml",
 #endif
     NULL,
     NULL
@@ -104,8 +104,8 @@ static int send_fd(int fd, int payload_fd) {
     struct iovec iov;
     struct msghdr msg;
     union {
-	struct cmsghdr hdr;
-	char buf[CMSG_SPACE(sizeof(int))];
+        struct cmsghdr hdr;
+        char buf[CMSG_SPACE(sizeof(int))];
     } cmsg;
 
     /* Send a file descriptor over the socket */
@@ -144,8 +144,8 @@ static int recv_fd(int fd) {
     struct iovec iov;
     struct msghdr msg;
     union {
-	struct cmsghdr hdr;
-	char buf[CMSG_SPACE(sizeof(int))];
+        struct cmsghdr hdr;
+        char buf[CMSG_SPACE(sizeof(int))];
     } cmsg;
 
     /* Receive a file descriptor from a socket */
@@ -307,8 +307,6 @@ int avahi_chroot_helper_start(const char *argv0) {
         return -1;
     } else if (pid == 0) {
 
-        setsid();
-
         /* Drop all remaining capabilities */
         avahi_caps_drop_all();
 
@@ -396,12 +394,14 @@ int avahi_chroot_helper_unlink(const char *fname) {
             return -1;
         }
 
-        if (write(helper_fd, &command, sizeof(command)) < 0) {
+        if (write(helper_fd, &command, sizeof(command)) < 0 &&
+            (errno != EPIPE && errno != ECONNRESET)) {
             avahi_log_error("write() failed: %s\n", strerror(errno));
             return -1;
         }
 
-        if ((r = read(helper_fd, &c, sizeof(c))) < 0) {
+        if ((r = read(helper_fd, &c, sizeof(c))) < 0 &&
+            (errno != EPIPE && errno != ECONNRESET)) {
             avahi_log_error("read() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
             return -1;
         }