summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-03-23 07:41:54 +0000
committerHavoc Pennington <hp@redhat.com>2003-03-23 07:41:54 +0000
commita26607ab68bf0878f23d2dbddec781b4b760d034 (patch)
treefe9153c14712ce893b605a7b23b47e4e7e8d17d8 /doc
parentb6ffea177fccb6cc4e65992da7d8b390054277f7 (diff)
2003-03-23 Havoc Pennington <hp@pobox.com>
* bus/policy.c, bus/bus.c, bus/connection.c: implement allow/deny policies code * dbus/dbus-hash.h: add ULONG hash keys * dbus/dbus-sysdeps.c (_dbus_get_groups): new (_dbus_get_group_id): new function
Diffstat (limited to 'doc')
-rw-r--r--doc/config-file.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/config-file.txt b/doc/config-file.txt
index ae581924..093cb413 100644
--- a/doc/config-file.txt
+++ b/doc/config-file.txt
@@ -60,7 +60,7 @@ Elements:
multiple <auth> elements, the last one wins (they are not merged).
<policy>
- context="(default|required)" one of the context/user/group
+ context="(default|mandatory)" one of the context/user/group
attributes is mandatory
user="username or userid"
group="group name or gid"
@@ -72,8 +72,10 @@ Elements:
Policies are applied to a connection as follows:
- all context="default" policies are applied
- all group="connection's user's group" policies are applied
+ in undefined order
- all user="connection's auth user" policies are applied
- - all context="required" policies are applied
+ in undefined order
+ - all context="mandatory" policies are applied
Policies applied later will override those applied earlier,
when the policies overlap. Multiple policies with the same
@@ -157,4 +159,4 @@ Elements:
- \ No newline at end of file
+