diff options
| author | Ian Jackson <ian.jackson@eu.citrix.com> | 2018-11-20 11:30:33 +0000 |
|---|---|---|
| committer | Ian Jackson <ian.jackson@eu.citrix.com> | 2018-11-20 11:32:35 +0000 |
| commit | 5c8dbb6c508936416e526cb2e4c6997f082d36d9 (patch) | |
| tree | ed2c424bc3523711fac119c9899ab30e846a7d38 | |
| parent | 79dee035863a6967c1bb946c679f516bd9267b62 (diff) | |
fishdescriptor: Calculate target_root earlier and pass to _sock_dir
No functional change.
We are going to use this in a moment.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -rw-r--r-- | fishdescriptor/py/fishdescriptor/fish.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fishdescriptor/py/fishdescriptor/fish.py b/fishdescriptor/py/fishdescriptor/fish.py index 9d2d3c6..05f89e6 100644 --- a/fishdescriptor/py/fishdescriptor/fish.py +++ b/fishdescriptor/py/fishdescriptor/fish.py @@ -114,7 +114,7 @@ class Donor(): if oe.errno != os.errno.ENOENT: raise oe return False - def _sock_dir(d, target_euid): + def _sock_dir(d, target_euid, target_root): run_dir = '/run/user/%d' % target_euid if d._exists(run_dir): return run_dir + '/fishdescriptor' @@ -133,16 +133,16 @@ class Donor(): def fish(d, fds): # -> list of fds in our process + target_root = '/proc/%d/root' % d.pid + if not d._exists(target_root): + target_root = '' + euid = d._geteuid() - sockdir = d._sock_dir(euid) + sockdir = d._sock_dir(euid, target_root) d.mkdir(sockdir) sockname = '%s/%s,%d' % (sockdir, os.uname().nodename, d.pid) - target_root = '/proc/%d/root' % d.pid - if not d._exists(target_root): - target_root = '' - our_sockname = target_root + sockname s = None |