From 97a49721274c5538f121811195e802669424c316 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 3 Jun 2016 16:14:18 +0200 Subject: guess the right user after the switch to polkit adjust the env variable to look at (mga#18288) --- perl-install/NEWS | 1 + perl-install/run_program.pm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index 03799a6d7..db9743e06 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,6 @@ - running commands as user: o fix the fallback when the helper didn't provide the real UID (mga#18288) + o guess the right user after the switch to polkit (mga#18288) Version 17.33 - 27 May 2016 diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm index 0b5776a2d..300179832 100644 --- a/perl-install/run_program.pm +++ b/perl-install/run_program.pm @@ -160,7 +160,7 @@ Runs $name with @args parameters. $options is a hash ref that can contains: =item * B: $name will be chrooted in $root prior to run -=item * B: $name will be run as $ENV{USERHELPER_UID} or with the UID of parent process. Implies I +=item * B: $name will be run as $ENV{PKEXEC_UID} or with the UID of parent process. Implies I =item * B: parameters will be hidden in logs (b/c eg there's a password) @@ -199,7 +199,7 @@ sub raw { my $home; if ($options->{as_user}) { my $uid; - $uid = $ENV{USERHELPER_UID} && getpwuid($ENV{USERHELPER_UID}); + $uid = $ENV{PKEXEC_UID} && getpwuid($ENV{PKEXEC_UID}); $uid ||= common::get_parent_uid(); my ($full_user) = grep { $_->[2] eq $uid } list_passwd(); $options->{setuid} = getpwnam($full_user->[0]) if $full_user->[0]; -- cgit v1.2.1