export CALLER_UID

[ikiwiki.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 6dc25403e795ae980296272dfb754b00710dbafc..eb6228dc314dd2b24d6740f34e08c8f73e437512 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -28,7 +28,7 @@ sub gen_wrapper () { #{{{
        my @envsave;
        push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
                       CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
        my @envsave;
        push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
                       CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE

-                      HTTP_COOKIE REMOTE_USER} if $config{cgi};
+                      HTTP_COOKIE REMOTE_USER HTTPS} if $config{cgi};

        my $envsave="";
        foreach my $var (@envsave) {
                $envsave.=<<"EOF"
        my $envsave="";
        foreach my $var (@envsave) {
                $envsave.=<<"EOF"


@@ -55,7 +55,7 @@ EOF
 #include <string.h>
 
 extern char **environ;
 #include <string.h>
 
 extern char **environ;

-char *newenviron[$#envsave+5];
+char *newenviron[$#envsave+6];

 int i=0;
 
 addenv(char *var, char *val) {
 int i=0;
 
 addenv(char *var, char *val) {


@@ -72,6 +72,7 @@ int main (int argc, char **argv) {
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
        newenviron[i++]="WRAPPED_OPTIONS=$configstring";
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
        newenviron[i++]="WRAPPED_OPTIONS=$configstring";

+       asprintf(newenviron[i++], "CALLER_UID=%i", getuid());

        newenviron[i]=NULL;
        environ=newenviron;
 
        newenviron[i]=NULL;
        environ=newenviron;