X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/943882a289da2ad2d6ae1ef9c8bba494d769ba50..e1b3d5c4be46ee0b17a98aa48cb7cb152c4a008b:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 7ce08e6d..92d9b2c0 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -174,7 +174,7 @@ static int rsync_module(int fd, int i)
 	}
 
 	p = lp_exclude_from(i);
-	add_exclude_file(p, 1);
+	add_exclude_file(p, 1, 0);
 
 	p = lp_exclude(i);
 	add_exclude_line(p);
@@ -362,6 +362,11 @@ int daemon_main(void)
 {
 	extern char *config_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)) {
 		/* we are running via inetd */
 		return start_daemon(STDIN_FILENO);