[gentoo-commits] proj/openrc:0.22.x commit in: src/rc/

[gentoo-commits] proj/openrc:0.22.x commit in: src/rc/

[William Hubbs]

commit:     0e925c511d202257b04b27a6ff2a4563bf2f1469
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 09:30:02 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 18:20:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=0e925c51

do_service: Initialize idx to 0

If index is not explicitly specified for service_started_daemon, it will
look for daemons by random index.

This fixes #100.

 src/rc/do_service.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rc/do_service.c b/src/rc/do_service.c
index 3c39d35..a36a09c 100644
--- a/src/rc/do_service.c
+++ b/src/rc/do_service.c
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
 	bool ok = false;
 	char *service;
 	char *exec;
-	int idx;
+	int idx = 0;
 	RC_SERVICE state, bit;
 
 	applet = basename_c(argv[0]);

[gentoo-commits] proj/openrc:0.22.x commit in: src/rc/

[William Hubbs]

commit:     c094c75f34776ccae2a89dcb8b6c19d7a8155f56
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Oct 24 17:39:14 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 18:20:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=c094c75f

src/rc/rc-misc.c: report error if call to flock() fails

X-Gentoo-Bug: 597390
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=597390

 src/rc/rc-misc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c
index 250b369..8afff0a 100644
--- a/src/rc/rc-misc.c
+++ b/src/rc/rc-misc.c
@@ -228,6 +228,7 @@ svc_lock(const char *applet)
 	if (fd == -1)
 		return -1;
 	if (flock(fd, LOCK_EX | LOCK_NB) == -1) {
+		eerror("Call to flock failed: %s", strerror(errno));
 		close(fd);
 		return -1;
 	}

[gentoo-commits] proj/openrc:0.22.x commit in: src/rc/

[William Hubbs]

commit:     b16625e62502c2924f9c00ab144845b93857f6c7
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Nov  1 22:31:35 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 18:20:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b16625e6

src/rc/rc: do not try to start services if fork fails

 src/rc/rc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/rc/rc.c b/src/rc/rc.c
index 118c2d1..110591e 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -683,6 +683,8 @@ do_start_services(const RC_STRINGLIST *start_services, bool parallel)
 		}
 
 		pid = service_start(service->value);
+		if (pid == -1)
+			break;
 		/* Remember the pid if we're running in parallel */
 		if (pid > 0) {
 			add_pid(pid);

[gentoo-commits] proj/openrc:0.22.x commit in: src/rc/

[William Hubbs]

commit:     a8b79601c86232fe942c7a5aa6725799ba25aed2
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Wed Nov 16 04:55:49 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 18:05:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a8b79601

selinux: fix SIGSEGV with invalid contexts

Fixes: https://github.com/openrc/openrc/issues/104

 src/rc/rc-selinux.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/rc/rc-selinux.c b/src/rc/rc-selinux.c
index a792fe2..2eb631a 100644
--- a/src/rc/rc-selinux.c
+++ b/src/rc/rc-selinux.c
@@ -334,7 +334,19 @@ void selinux_setup(char **argv)
 
 	/* extract the type from the context */
 	curr_con = context_new(curr_context);
-	curr_t = xstrdup(context_type_get(curr_con));
+	if (!curr_con) {
+		free(curr_context);
+		goto out;
+	}
+
+	curr_t = context_type_get(curr_con);
+	if (!curr_t) {
+		context_free(curr_con);
+		free(curr_context);
+		goto out;
+	}
+
+	curr_t = xstrdup(curr_t);
 	/* dont need them anymore so free() now */
 	context_free(curr_con);
 	free(curr_context);