Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / IkiWiki / Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 225f2b9abf33ab995f94576a8a735db9c67fb80b..332ba7c2c378d45123c915115c243379940e9bbf 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -35,12 +35,19 @@ EOF
                        }
                        "u != $uid";
                } @{$config{untrusted_committers}}).
                        }
                        "u != $uid";
                } @{$config{untrusted_committers}}).

-               ") exit(0);\n";
+               ") {\n";

 
        
        $ret.=<<"EOF";
 
        
        $ret.=<<"EOF";

-               asprintf(&s, "CALLER_UID=%i", u);
-               newenviron[i++]=s;
+                       /* Trusted user.
+                        * Consume all stdin before exiting, as git may
+                        * otherwise be unhappy. */
+                       char buf[256];
+                       while (read(0, &buf, 256) != 0) {}
+                       exit(0);
+               }
+               asprintf(&s, "%i", u);
+               addenv("CALLER_UID", s);

        }
 EOF
        return $ret;
        }
 EOF
        return $ret;


@@ -73,7 +80,7 @@ sub test () {
                }) || error("failed adding user");
        }
 
                }) || error("failed adding user");
        }
 

-       check_canchange(
+       IkiWiki::check_canchange(

                cgi => $cgi,
                session => $session,
                changes => [IkiWiki::rcs_receive()]
                cgi => $cgi,
                session => $session,
                changes => [IkiWiki::rcs_receive()]