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
Make sure the log file is always opened before root privileges (if any)
[rsync/rsync.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
a0debcd
..
b4d078c
100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-247,7
+247,10
@@
void start_accept_loop(int port, int (*fn)(int ))
struct sockaddr addr;
int in_addrlen = sizeof(addr);
struct sockaddr addr;
int in_addrlen = sizeof(addr);
- log_release();
+ /* close log file before the potentially very long select so
+ file can be trimmed by another process instead of growing
+ forever */
+ log_close();
FD_ZERO(&fds);
FD_SET(s, &fds);
FD_ZERO(&fds);
FD_SET(s, &fds);
@@
-274,6
+277,10
@@
void start_accept_loop(int port, int (*fn)(int ))
if (fork()==0) {
close(s);
if (fork()==0) {
close(s);
+ /* open log file in child before possibly giving
+ up privileges */
+ log_open();
+
_exit(fn(fd));
}
_exit(fn(fd));
}