X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=b0e95beff502b7677d5825dbf77730a3a31bcd37;hp=a8a0146dfc32a87813ab3d00f04a65c8e9b61ff5;hb=54cb6b1aecb06a1ca44a7a60c74dd0d65b0043dd;hpb=ec316aa32e8567395a88c4583007f01ffae008ce

diff --git a/src/tincd.c b/src/tincd.c
index a8a0146d..b0e95bef 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -160,8 +160,14 @@ static bool parse_options(int argc, char **argv)
 				break;
 
 			case 'L':				/* no detach */
+#ifndef HAVE_MLOCKALL
+			/*	logger(LOG_ERR, _("%s not supported on this platform"), "mlockall()"); */
+				logger(LOG_ERR, _("mlockall() not supported on this platform!"));
+				return false;
+#else
 				do_mlock = true;
 				break;
+#endif
 
 			case 'd':				/* inc debug level */
 				if(optarg)
@@ -452,7 +458,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();
@@ -460,8 +467,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);
@@ -469,7 +477,8 @@ 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
@@ -511,20 +520,6 @@ int main(int argc, char **argv)
 
 	openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR);
 
-	/* Lock all pages into memory if requested */
-
-	if(do_mlock)
-#ifdef HAVE_MLOCKALL
-		if(mlockall(MCL_CURRENT | MCL_FUTURE)) {
-			logger(LOG_ERR, _("System call `%s' failed: %s"), "mlockall",
-				   strerror(errno));
-#else
-	{
-		logger(LOG_ERR, _("mlockall() not supported on this platform!"));
-#endif
-		return -1;
-	}
-
 	g_argv = argv;
 
 	init_configuration(&config_tree);
@@ -570,6 +565,17 @@ int main2(int argc, char **argv)
 	if(!detach())
 		return 1;
 
+#ifdef HAVE_MLOCKALL
+	/* Lock all pages into memory if requested.
+	 * This has to be done after daemon()/fork() so it works for child.
+	 * No need to do that in parent as it's very short-lived. */
+	if(do_mlock && mlockall(MCL_CURRENT | MCL_FUTURE) != 0) {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "mlockall",
+		   strerror(errno));
+		return 1;
+	}
+#endif
+
 	/* Setup sockets and open device. */
 
 	if(!setup_network())