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
Moved a function.
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
a2bbfe8
..
468553c
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-266,7
+266,7
@@
static int rsync_module(int f_in, int f_out, int i)
module_id = i;
module_id = i;
- am_root = (
getuid
() == 0);
+ am_root = (
MY_UID
() == 0);
if (am_root) {
p = lp_uid(i);
if (am_root) {
p = lp_uid(i);
@@
-383,7
+383,7
@@
static int rsync_module(int f_in, int f_out, int i)
return -1;
}
return -1;
}
- am_root = (
getuid
() == 0);
+ am_root = (
MY_UID
() == 0);
}
io_printf(f_out, "@RSYNCD: OK\n");
}
io_printf(f_out, "@RSYNCD: OK\n");
@@
-457,7
+457,8
@@
static int rsync_module(int f_in, int f_out, int i)
#ifndef DEBUG
/* don't allow the logs to be flooded too fast */
#ifndef DEBUG
/* don't allow the logs to be flooded too fast */
- if (verbose > 1) verbose = 1;
+ if (verbose > lp_max_verbosity())
+ verbose = lp_max_verbosity();
#endif
if (protocol_version < 23) {
#endif
if (protocol_version < 23) {