fix the operation not permitted error when rsync --daemon is NOT exec…

…uted by root for rsync > 3.1 (#3)
Qihoo360 · Jun 25, 2018 · 94a49a8 · 94a49a8
1 parent 0057f6f
commit 94a49a8
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/slash/src/rsync.cc b/slash/src/rsync.cc
@@ -31,8 +31,11 @@ int StartRsync(const std::string& raw_path, const std::string& module, const std
     log_warn("Open rsync conf file failed!");
     return -1;
   }
-  conf_stream << "uid = root" << std::endl;
-  conf_stream << "gid = root" << std::endl;
+
+  if (geteuid() == 0) {
+    conf_stream << "uid = root" << std::endl;
+    conf_stream << "gid = root" << std::endl;
+  }
   conf_stream << "use chroot = no" << std::endl;
   conf_stream << "max connections = 10" << std::endl;
   conf_stream << "lock file = " << rsync_path + kRsyncLockFile << std::endl;