diff options
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/remote-store.cc | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 88a2fca8aedd..14412b8c8b60 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -137,14 +137,26 @@ void RemoteStore::connectToDaemon() string socketPath = nixStateDir + DEFAULT_SOCKET_PATH; + /* Urgh, sockaddr_un allows path names of only 108 characters. So + chdir to the socket directory so that we can pass a relative + path name. !!! this is probably a bad idea in multi-threaded + applications... */ + AutoCloseFD fdPrevDir = open(".", O_RDONLY); + if (fdPrevDir == -1) throw SysError("couldn't open current directory"); + chdir(dirOf(socketPath).c_str()); + Path socketPathRel = "./" + baseNameOf(socketPath); + struct sockaddr_un addr; addr.sun_family = AF_UNIX; - if (socketPath.size() >= sizeof(addr.sun_path)) - throw Error(format("socket path `%1%' is too long") % socketPath); - strcpy(addr.sun_path, socketPath.c_str()); + if (socketPathRel.size() >= sizeof(addr.sun_path)) + throw Error(format("socket path `%1%' is too long") % socketPathRel); + strcpy(addr.sun_path, socketPathRel.c_str()); if (connect(fdSocket, (struct sockaddr *) &addr, sizeof(addr)) == -1) throw SysError(format("cannot connect to daemon at `%1%'") % socketPath); + + if (fchdir(fdPrevDir) == -1) + throw SysError("couldn't change back to previous directory"); } |