From 7ddea03684df47c861c264216b83e7653d6784fd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 26 Oct 2008 14:03:18 -0400
Subject: move untrusted committer test into the wrapper

This saves around 1/4th second per trusted commit since ikiwiki
doesn't need to start up.
---
 IkiWiki/Wrapper.pm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Wrapper.pm')

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 0a2b8d4f8..fd8a0e5b0 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -36,7 +36,13 @@ sub gen_wrapper () { #{{{
 		addenv("$var", s);
 EOF
 	}
-	
+
+	my $test_receive="";
+	if ($config{test_receive}) {
+		require IkiWiki::Receive;
+		$test_receive=IkiWiki::Receive::gen_wrapper();
+	}
+
 	$Data::Dumper::Indent=0; # no newlines
 	my $configstring=Data::Dumper->Dump([\%config], ['*config']);
 	$configstring=~s/\\/\\\\/g;
@@ -67,13 +73,12 @@ addenv(char *var, char *val) {
 }
 
 int main (int argc, char **argv) {
-	/* Sanitize environment. */
 	char *s;
+
+$test_receive
 $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
 	newenviron[i++]="WRAPPED_OPTIONS=$configstring";
-	asprintf(&s, "CALLER_UID=%i", getuid());
-	newenviron[i++]=s;
 	newenviron[i]=NULL;
 	environ=newenviron;
 
-- 
cgit v1.2.3