lxc_abstract_unix_connect: accomodate containers started before Oct 28

commit aae93dd3 fixed the command socket name to use the right pathlen instead of always passing in the max socket namelen. However, this breaks lxc-info/lxc-list/etc for containers started before that commit. So if the correct command sock name doesn't work, try the preexising one. Note we can probably undo this "after awhile". Maybe in august 2014. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

lxc_abstract_unix_connect: accomodate containers started before Oct 28
bdb3f441 · Serge Hallyn · 293ec758 · bdb3f441
Commit bdb3f441 authored Nov 11, 2013 by Serge Hallyn
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

af_unix.c src/lxc/af_unix.c +3 -0

No files found.
--- a/src/lxc/af_unix.c
+++ b/src/lxc/af_unix.c
@@ -135,6 +135,9 @@ int lxc_abstract_unix_connect(const char *path)
 	if (connect(fd, (struct sockaddr *)&addr, offsetof(struct sockaddr_un, sun_path) + len)) {
 		int tmp = errno;
+		/* special case to connect to older containers */
+		if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == 0)
+			return fd;
 		process_lock();
 		close(fd);
 		process_unlock();