From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 2 Jan 2008 00:10:21 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.18~23
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/93a3707e9bedfa0f5f89e2b4419a10f7c8956691?hp=0c26e5027d7d89cd07a0c8d110a69003019f5016

Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
---

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index dcf3e5c36..16e5bd350 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -91,8 +91,14 @@ $envsave
 	newenviron[i]=NULL;
 	environ=newenviron;
 
-	if (setregid(getegid(), -1) != 0 || setreuid(geteuid(), -1) != 0) {
-		perror("failed to drop real uid/gid");
+	if (setregid(getegid(), -1) != 0 &&
+	    setregid(getegid(), -1) != 0) {
+		perror("failed to drop real gid");
+		exit(1);
+	}
+	if (setreuid(geteuid(), -1) != 0 &&
+	    setreuid(geteuid(), -1) != 0) {
+		perror("failed to drop real uid");
 		exit(1);
 	}
 
diff --git a/debian/changelog b/debian/changelog
index 640192d55..1fe89256c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (2.18) UNRELEASED; urgency=low
+
+  * Split error messages for failures to drop real uid and gid.
+  * Retry dropping uid and gid, possibly this will help with the "Resource
+    temporarily unavailable" failures I've experienced under xen.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 01 Jan 2008 18:46:59 -0500
+
 ikiwiki (2.17) unstable; urgency=low
 
   * Improved parentlinks special case for index pages.