[gnome-keyring] daemon: Don't install setuid when filesystem capabilities not avail.
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring] daemon: Don't install setuid when filesystem capabilities not avail.
- Date: Mon, 19 Sep 2011 07:14:31 +0000 (UTC)
commit 3e0d0bbc831f5053dab772e44055472558306d92
Author: Stef Walter <stefw collabora co uk>
Date: Mon Sep 19 09:06:20 2011 +0200
daemon: Don't install setuid when filesystem capabilities not avail.
The code that dropped setuid was removed in commit
66bd5dd32836a770647b8acf3476fb7922be71eb, but Makefile.am didn't
match.
https://bugzilla.gnome.org/show_bug.cgi?id=659402
daemon/Makefile.am | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index f675413..825ab4a 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -85,15 +85,6 @@ if WITH_CAPS
install-exec-hook:
setcap cap_ipc_lock=ep $(DESTDIR)$(bindir)/gnome-keyring-daemon || true
-else # without caps
-
-# The daemon is installed as setuid so as to obtain specialized
-# capabilities, then immediately drops permissions. In other words,
-# it does *not* run as setuid.
-install-exec-hook:
- chown root $(DESTDIR)$(bindir)/gnome-keyring-daemon || true
- chmod u+s $(DESTDIR)$(bindir)/gnome-keyring-daemon || true
-
-endif # without caps
+endif
@INTLTOOL_DESKTOP_RULE@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]