From 1446f4ac0b364c041d7de0e5a186e9709a300388 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 3 Jun 2016 17:40:42 +0200
Subject: uid guess: fix the fallback (mga#18288)

(when the helper didn't provide the real UID)
---
 perl-install/NEWS           | 3 +++
 perl-install/run_program.pm | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 3adbfad3d..03799a6d7 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- running commands as user:
+  o fix the fallback when the helper didn't provide the real UID (mga#18288)
+
 Version 17.33 - 27 May 2016
 
 - list all drivers needing a proprietary driver
diff --git a/perl-install/run_program.pm b/perl-install/run_program.pm
index fc73c294a..0b5776a2d 100644
--- a/perl-install/run_program.pm
+++ b/perl-install/run_program.pm
@@ -201,8 +201,8 @@ sub raw {
         my $uid;
         $uid = $ENV{USERHELPER_UID} && getpwuid($ENV{USERHELPER_UID});
         $uid ||= common::get_parent_uid();
-        $options->{setuid} = getpwnam($uid) if $uid;
         my ($full_user) = grep { $_->[2] eq $uid } list_passwd();
+        $options->{setuid} = getpwnam($full_user->[0]) if $full_user->[0];
         $home = $full_user->[7] if $full_user;
     }
     local $ENV{HOME} = $home if $home;
-- 
cgit v1.2.1