X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=service%2Finstance.c;h=917b003b3907c5e06014129db9e9ca95bdf17100;hb=dfb68f8556df63878add145ad9c656381bc20656;hp=35804de7c19e2e4d1c666d92c1316ddbbec1e213;hpb=b39c362c6d1c6a0515e12f14f808c6fc79d5ec2d;p=project%2Fprocd.git

diff --git a/service/instance.c b/service/instance.c
index 35804de..917b003 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -17,6 +17,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
+#include <grp.h>
 #include <net/if.h>
 #include <unistd.h>
 #include <stdint.h>
@@ -241,8 +242,7 @@ instance_removepid(struct service_instance *in) {
 	if (!in->pidfile)
 		return 0;
 	if (unlink(in->pidfile)) {
-		ERROR("Failed to removed pidfile: %s: %d - %s\n",
-			in->pidfile, errno, strerror(errno));
+		ERROR("Failed to removed pidfile: %s: %m\n", in->pidfile);
 		return 1;
 	}
 	return 0;
@@ -258,19 +258,16 @@ instance_writepid(struct service_instance *in)
 	}
 	_pidfile = fopen(in->pidfile, "w");
 	if (_pidfile == NULL) {
-		ERROR("failed to open pidfile for writing: %s: %d (%s)",
-			in->pidfile, errno, strerror(errno));
+		ERROR("failed to open pidfile for writing: %s: %m", in->pidfile);
 		return 1;
 	}
 	if (fprintf(_pidfile, "%d\n", in->proc.pid) < 0) {
-		ERROR("failed to write pidfile: %s: %d (%s)",
-			in->pidfile, errno, strerror(errno));
+		ERROR("failed to write pidfile: %s: %m", in->pidfile);
 		fclose(_pidfile);
 		return 2;
 	}
 	if (fclose(_pidfile)) {
-		ERROR("failed to close pidfile: %s: %d (%s)",
-			in->pidfile, errno, strerror(errno));
+		ERROR("failed to close pidfile: %s: %m", in->pidfile);
 		return 3;
 	}
 
@@ -283,7 +280,6 @@ instance_run(struct service_instance *in, int _stdout, int _stderr)
 	struct blobmsg_list_node *var;
 	struct blob_attr *cur;
 	char **argv;
-	char *ld_preload;
 	int argc = 1; /* NULL terminated */
 	int rem, _stdin;
 	bool seccomp = !in->trace && !in->has_jail && in->seccomp;
@@ -301,8 +297,8 @@ instance_run(struct service_instance *in, int _stdout, int _stderr)
 	if (seccomp)
 		setenv("SECCOMP_FILE", in->seccomp, 1);
 
-	if (setlbf && asprintf(&ld_preload, "LD_PRELOAD=/lib/libsetlbf.so") > 0)
-		putenv(ld_preload);
+	if (setlbf)
+		setenv("LD_PRELOAD", "/lib/libsetlbf.so", 1);
 
 	blobmsg_list_for_each(&in->limits, var)
 		instance_limits(blobmsg_name(var->data), blobmsg_data(var->data));
@@ -352,12 +348,16 @@ instance_run(struct service_instance *in, int _stdout, int _stderr)
 		closefd(_stderr);
 	}
 
+	if (in->user && in->gid && initgroups(in->user, in->gid)) {
+		ERROR("failed to initgroups() for user %s: %m\n", in->user);
+		exit(127);
+	}
 	if (in->gid && setgid(in->gid)) {
-		ERROR("failed to set group id %d: %d (%s)\n", in->gid, errno, strerror(errno));
+		ERROR("failed to set group id %d: %m\n", in->gid);
 		exit(127);
 	}
 	if (in->uid && setuid(in->uid)) {
-		ERROR("failed to set user id %d: %d (%s)\n", in->uid, errno, strerror(errno));
+		ERROR("failed to set user id %d: %m\n", in->uid);
 		exit(127);
 	}
 
@@ -407,14 +407,14 @@ instance_start(struct service_instance *in)
 	instance_free_stdio(in);
 	if (in->_stdout.fd.fd > -2) {
 		if (pipe(opipe)) {
-			ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
+			ULOG_WARN("pipe() failed: %m\n");
 			opipe[0] = opipe[1] = -1;
 		}
 	}
 
 	if (in->_stderr.fd.fd > -2) {
 		if (pipe(epipe)) {
-			ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
+			ULOG_WARN("pipe() failed: %m\n");
 			epipe[0] = epipe[1] = -1;
 		}
 	}
@@ -592,6 +592,11 @@ instance_restart(struct service_instance *in)
 	uloop_timeout_set(&in->timeout, in->term_timeout * 1000);
 }
 
+static bool string_changed(const char *a, const char *b)
+{
+	return !((!a && !b) || (a && b && !strcmp(a, b)));
+}
+
 static bool
 instance_config_changed(struct service_instance *in, struct service_instance *in_new)
 {
@@ -613,20 +618,16 @@ instance_config_changed(struct service_instance *in, struct service_instance *in
 	if (in->nice != in_new->nice)
 		return true;
 
-	if (in->uid != in_new->uid)
+	if (string_changed(in->user, in_new->user))
 		return true;
 
-	if (in->gid != in_new->gid)
+	if (in->uid != in_new->uid)
 		return true;
 
-	if (in->pidfile && in_new->pidfile)
-		if (strcmp(in->pidfile, in_new->pidfile))
-			return true;
-
-	if (in->pidfile && !in_new->pidfile)
+	if (in->gid != in_new->gid)
 		return true;
 
-	if (!in->pidfile && in_new->pidfile)
+	if (string_changed(in->pidfile, in_new->pidfile))
 		return true;
 
 	if (in->respawn_retry != in_new->respawn_retry)
@@ -869,8 +870,10 @@ instance_config_parse(struct service_instance *in)
 	}
 
 	if (tb[INSTANCE_ATTR_USER]) {
-		struct passwd *p = getpwnam(blobmsg_get_string(tb[INSTANCE_ATTR_USER]));
+		const char *user = blobmsg_get_string(tb[INSTANCE_ATTR_USER]);
+		struct passwd *p = getpwnam(user);
 		if (p) {
+			in->user = strdup(user);
 			in->uid = p->pw_uid;
 			in->gid = p->pw_gid;
 		}
@@ -989,6 +992,7 @@ instance_free(struct service_instance *in)
 	watch_del(in);
 	instance_config_cleanup(in);
 	free(in->config);
+	free(in->user);
 	free(in);
 }