X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=d3594255f2877f4ce341102fc0cc158da65ddf04;hp=929e9b91f89041bac996ea1eacd43ab4f1fc0c57;hb=a42a8dde45fe95aa3fd3f7f15a74c5166efe3633;hpb=6be5d4f5b67764115b37528d2fe01bd245b3cd3e

diff --git a/src/tincd.c b/src/tincd.c
index 929e9b91..d3594255 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -161,7 +161,7 @@ static bool parse_options(int argc, char **argv)
 
 			case 'L':				/* no detach */
 #ifndef HAVE_MLOCKALL
-				logger(LOG_ERR, _("mlockall() not supported on this platform!"));
+				logger(LOG_ERR, _("%s not supported on this platform"), "mlockall()");
 				return false;
 #else
 				do_mlock = true;
@@ -457,7 +457,8 @@ static bool drop_privs() {
 		uid = pw->pw_uid;
 		if (initgroups(switchuser, pw->pw_gid) != 0 ||
 		    setgid(pw->pw_gid) != 0) {
-			logger(LOG_ERR, _("%s failed"), "initgroups()");
+			logger(LOG_ERR, _("System call `%s' failed: %s"),
+			       "initgroups", strerror(errno));
 			return false;
 		}
 		endgrent();
@@ -465,8 +466,9 @@ static bool drop_privs() {
 	}
 	if (do_chroot) {
 		tzset();	/* for proper timestamps in logs */
-		if (chroot(confbase) != 0 || chdir(".") != 0) {
-			logger(LOG_ERR, _("%s failed"), "chroot()");
+		if (chroot(confbase) != 0 || chdir("/") != 0) {
+			logger(LOG_ERR, _("System call `%s' failed: %s"),
+			       "chroot", strerror(errno));
 			return false;
 		}
 		free(confbase);
@@ -474,13 +476,23 @@ static bool drop_privs() {
 	}
 	if (switchuser)
 		if (setuid(uid) != 0) {
-			logger(LOG_ERR, _("%s failed"), "setuid()");
+			logger(LOG_ERR, _("System call `%s' failed: %s"),
+			       "setuid", strerror(errno));
 			return false;
 		}
 #endif
 	return true;
 }
 
+#ifdef HAVE_MINGW
+# define setpriority(level) SetPriorityClass(GetCurrentProcess(), level);
+#else
+# define NORMAL_PRIORITY_CLASS 0
+# define BELOW_NORMAL_PRIORITY_CLASS 10
+# define HIGH_PRIORITY_CLASS -10
+# define setpriority(level) nice(level)
+#endif
+
 int main(int argc, char **argv)
 {
 	program_name = argv[0];
@@ -577,6 +589,23 @@ int main2(int argc, char **argv)
 	if(!setup_network())
 		goto end;
 
+        /* Change process priority */
+
+        char *priority = 0;
+
+        if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &priority)) {
+                if(!strcasecmp(priority, "Normal"))
+                        setpriority(NORMAL_PRIORITY_CLASS);
+                else if(!strcasecmp(priority, "Low"))
+                        setpriority(BELOW_NORMAL_PRIORITY_CLASS);
+                else if(!strcasecmp(priority, "High"))
+                        setpriority(HIGH_PRIORITY_CLASS);
+                else {
+                        logger(LOG_ERR, _("Invalid priority `%s`!"), priority);
+                        goto end;
+                }
+        }
+
 	/* drop privileges */
 	if (!drop_privs())
 		goto end;