web commit by JeremyReed: Document account_creation_password -- some of this text...

[ikiwiki.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 6687cace221afc7cca17c35d99a85c3557fd9223..2103ea53a501b4a048192ebc289ec0eade86741a 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -3,7 +3,7 @@
 use warnings;
 use strict;
 use Cwd q{abs_path};
-use Data::Dumper;
+use Data::Dumper ;
 use IkiWiki;
 
 package IkiWiki;
@@ -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);
        }
 
@@ -102,7 +108,9 @@ $envsave
 }
 EOF
        close OUT;
-       if (system("gcc", "$wrapper.c", "-o", "$wrapper.new") != 0) {
+
+       my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
+       if (system($cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {
                #translators: The parameter is a C filename.
                error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
        }