X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5865fcdd6370cef7d3a4997500a9a28f3114ad7f..c226b7c2fdd6cc4357337514b22c3042195ab091:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 557eb5fd..7b0dd161 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -212,7 +212,7 @@ static int rsync_module(int fd, int i)
 			return -1;
 		}
 
-		if (chdir("/")) {
+		if (!push_dir("/", 0)) {
 			rprintf(FERROR,"chdir %s failed\n", lp_path(i));
 			io_printf(fd,"@ERROR: chdir failed\n");
 			return -1;
@@ -422,11 +422,6 @@ int daemon_main(void)
 	extern char *config_file;
 	char *pid_file;
 
-	/* this ensures that we don't call getcwd after the chroot,
-           which doesn't work on platforms that use popen("pwd","r")
-           for getcwd */
-	push_dir("/", 0);
-
 	if (is_a_socket(STDIN_FILENO)) {
 		int i;