diff options
author | Ryan Lortie <desrt@desrt.ca> | 2005-03-09 23:12:24 +0000 |
---|---|---|
committer | Ryan Lortie <desrt@desrt.ca> | 2005-03-09 23:12:24 +0000 |
commit | b61b94a14488f22ab7f136dc0a9f6c7787d3f510 (patch) | |
tree | 1878d5c76eddd11c13585ae213c1b66c1d7065a3 /bus | |
parent | 59948748b24ca6f266b1eb957849e3d3127242bd (diff) |
This commit was manufactured by cvs2svn to create tag 'dbus-0.23.3'.dbus-0.23.3
Diffstat (limited to 'bus')
-rw-r--r-- | bus/policy.c | 5 | ||||
-rw-r--r-- | bus/session.conf.in | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/bus/policy.c b/bus/policy.c index 7759dfad..c0244bdc 100644 --- a/bus/policy.c +++ b/bus/policy.c @@ -453,8 +453,9 @@ bus_policy_allow_user (BusPolicy *policy, uid); return FALSE; } - - allowed = FALSE; + + /* Default to "user owning bus" or root can connect */ + allowed = uid == _dbus_getuid (); allowed = list_allows_user (allowed, &policy->default_rules, diff --git a/bus/session.conf.in b/bus/session.conf.in index 8b6d65f7..1a6dfda5 100644 --- a/bus/session.conf.in +++ b/bus/session.conf.in @@ -19,8 +19,6 @@ <allow eavesdrop="true"/> <!-- Allow anyone to own anything --> <allow own="*"/> - <!-- Allow any user to connect --> - <allow user="*"/> </policy> <!-- This is included last so local configuration can override what's |