first call $rpcenv->get_user() if user was 'undef'. if that doesn't
return then we set it to root@pam.

Signed-off-by: Oguz Bektas <o.bek...@proxmox.com>
---
v1->v2:
* do get_user() first, set to 'root@pam' as fallback
* drop first patch for pve-container (not needed anymore)

 src/PVE/RESTEnvironment.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/PVE/RESTEnvironment.pm b/src/PVE/RESTEnvironment.pm
index 1b2af08..bc5b8b5 100644
--- a/src/PVE/RESTEnvironment.pm
+++ b/src/PVE/RESTEnvironment.pm
@@ -492,7 +492,12 @@ sub fork_worker {
     $dtype = 'unknown' if !defined ($dtype);
     $id = '' if !defined ($id);
 
-    $user = 'root@pve' if !defined ($user);
+    $user = $self->get_user() if !defined($user);
+
+    if (!defined($user)) {
+       warn 'internal error: Worker user was not specified, defaulting to 
"root@pam"!';
+       $user = 'root@pam';
+    }
 
     my $sync = ($self->{type} eq 'cli' && !$background) ? 1 : 0;
 
-- 
2.30.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Reply via email to