]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
lxc_abstract_unix_connect: remove the workaround-code 1685/head
authorLong Wang <w@laoqinren.net>
Sat, 8 Jul 2017 02:48:15 +0000 (10:48 +0800)
committerLong Wang <w@laoqinren.net>
Sat, 8 Jul 2017 02:52:17 +0000 (10:52 +0800)
commit bdb3f44147bc1a55a97131b4b39d42844ae4fb9e says that we may undo
the change in august 2014.

I think that it is time to do that.

Signed-off-by: Long Wang <w@laoqinren.net>
src/lxc/af_unix.c

index 074fabb4405bba1ffdf901fb66e4987a7e77cd9d..e6ba81fb89006ea20461fc210b83e5edc0ad4e6d 100644 (file)
@@ -123,12 +123,7 @@ int lxc_abstract_unix_connect(const char *path)
        strncpy(&addr.sun_path[1], &path[1], strlen(&path[1]));
 
        if (connect(fd, (struct sockaddr *)&addr, offsetof(struct sockaddr_un, sun_path) + len + 1)) {
-               int tmp = errno;
-               /* special case to connect to older containers */
-               if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == 0)
-                       return fd;
                close(fd);
-               errno = tmp;
                return -1;
        }