Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch from Paul Haas:
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
1a638db
..
f5a74ee
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-80,6
+80,9
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
if (!user) user = getenv("LOGNAME");
if (verbose >= 2) {
if (!user) user = getenv("LOGNAME");
if (verbose >= 2) {
+ /* FIXME: If we're going to use a socket program for
+ * testing, then this message is wrong. We need to
+ * say something like "(except really using %s)" */
rprintf(FINFO, "opening tcp connection to %s port %d\n",
host, rsync_port);
}
rprintf(FINFO, "opening tcp connection to %s port %d\n",
host, rsync_port);
}
@@
-287,6
+290,7
@@
static int rsync_module(int fd, int i)
}
if (am_root) {
}
if (am_root) {
+#ifdef HAVE_SETGROUPS
/* Get rid of any supplementary groups this process
* might have inheristed. */
if (setgroups(0, NULL)) {
/* Get rid of any supplementary groups this process
* might have inheristed. */
if (setgroups(0, NULL)) {
@@
-294,6
+298,7
@@
static int rsync_module(int fd, int i)
io_printf(fd, "@ERROR: setgroups failed\n");
return -1;
}
io_printf(fd, "@ERROR: setgroups failed\n");
return -1;
}
+#endif
/* XXXX: You could argue that if the daemon is started
* by a non-root user and they explicitly specify a
/* XXXX: You could argue that if the daemon is started
* by a non-root user and they explicitly specify a