diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-08-04 22:52:53 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-08-04 22:52:53 +0000 |
| commit | 9087526185a70cc5f3304e7900eac6a3fa3c5aff (patch) | |
| tree | 5588659104e938f0bb0d362c4949df8db2c1487a | |
| parent | 7c262538ce08376d5509b02bd4976f7c698faaa9 (diff) | |
| download | illumos-joyent-9087526185a70cc5f3304e7900eac6a3fa3c5aff.tar.gz | |
OS-4598 after updating dbus on Ubuntu 15.04, login hits a 30s delay - dropping a capability causes svc death/restart loop
| -rw-r--r-- | usr/src/uts/common/brand/lx/syscall/lx_prctl.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/usr/src/uts/common/brand/lx/syscall/lx_prctl.c b/usr/src/uts/common/brand/lx/syscall/lx_prctl.c index 5fe28cb162..091a6f547b 100644 --- a/usr/src/uts/common/brand/lx/syscall/lx_prctl.c +++ b/usr/src/uts/common/brand/lx/syscall/lx_prctl.c @@ -191,6 +191,15 @@ lx_prctl(int opt, uintptr_t data) return (0); } + case LX_PR_CAPBSET_DROP: { + /* + * On recent versions of Linux the login svc drops capabilities + * and if that fails the svc dies and is restarted by systemd. + * For now we pretend dropping capabilities succeeded. + */ + return (0); + } + default: break; } |