X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=rsh.c;h=5d1cb9d578a8e679fc190a9d7d2c842ad811223f;hb=000182eacf99cde27d5916aa415921924b82972c;hp=4d6a90bf6c1b290975fb2ac22f25979be56cb476;hpb=6eb7ed5403b7d57d5ed7e30d0cd0b312888ee95c;p=git.git

diff --git a/rsh.c b/rsh.c
index 4d6a90bf..5d1cb9d5 100644
--- a/rsh.c
+++ b/rsh.c
@@ -1,6 +1,7 @@
 #include "rsh.h"
 
 #include <string.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 
 #include "cache.h"
@@ -35,8 +36,8 @@ int setup_connection(int *fd_in, int *fd_out, char *remote_prog,
 	*(path++) = '\0';
 	/* ssh <host> 'cd /<path>; stdio-pull <arg...> <commit-id>' */
 	snprintf(command, COMMAND_SIZE, 
-		 "cd /%s; SHA1_FILE_DIRECTORY=objects %s",
-		 path, remote_prog);
+		 "cd /%s; %s=objects %s",
+		 path, DB_ENVIRONMENT, remote_prog);
 	posn = command + strlen(command);
 	for (i = 0; i < rmt_argc; i++) {
 		*(posn++) = ' ';
@@ -47,7 +48,7 @@ int setup_connection(int *fd_in, int *fd_out, char *remote_prog,
 		}
 	}
 	strcpy(posn, " -");
-	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, sv)) {
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv)) {
 		return error("Couldn't create socket");
 	}
 	if (!fork()) {