Last of the cleanup before the patching starts.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 963d9fe..f96d5e6 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;
 
-       am_root = (getuid() == 0);
+       am_root = (MY_UID() == 0);
 
        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;
                }
 
-               am_root = (getuid() == 0);
+               am_root = (MY_UID() == 0);
        }
 
        io_printf(f_out, "@RSYNCD: OK\n");
@@ -423,19 +423,6 @@ static int rsync_module(int f_in, int f_out, int i)
                }
        }
 
-       if (sanitize_paths) {
-               /*
-                * Note that this is applied to all parameters, whether or not
-                *    they are filenames, but no other legal parameters contain
-                *    the forms that need to be sanitized so it doesn't hurt;
-                *    it is not known at this point which parameters are files
-                *    and which aren't.
-                */
-               for (i = 1; i < argc; i++) {
-                       sanitize_path(argv[i], NULL);
-               }
-       }
-
        argp = argv;
        ret = parse_arguments(&argc, (const char ***) &argp, 0);
 
@@ -457,7 +444,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 */
-       if (verbose > 1) verbose = 1;
+       if (verbose > lp_max_verbosity())
+               verbose = lp_max_verbosity();
 #endif
 
        if (protocol_version < 23) {
@@ -614,7 +602,7 @@ int daemon_main(void)
        if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
                char pidbuf[16];
                int fd;
-               int pid = (int) getpid();
+               pid_t pid = getpid();
                cleanup_set_pid(pid);
                if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC,
                                        0666 & ~orig_umask)) == -1) {
@@ -622,7 +610,7 @@ int daemon_main(void)
                        rsyserr(FLOG, errno, "failed to create pid file %s", pid_file);
                        exit_cleanup(RERR_FILEIO);
                }
-               snprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);
+               snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid);
                write(fd, pidbuf, strlen(pidbuf));
                close(fd);
        }