summaryrefslogtreecommitdiff
path: root/test/data
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2005-01-18 20:42:15 +0000
committerHavoc Pennington <hp@redhat.com>2005-01-18 20:42:15 +0000
commit8873c90f99303f9cc308f15f8d03e637911f5b9e (patch)
tree03e459881912388cc6c3759d91fb0cf75739a5a7 /test/data
parent4fce285052c143296cd9e08a48de0175b5207853 (diff)
2005-01-18 Havoc Pennington <hp@redhat.com>
* Throughout, grand renaming to strip out the use of "service", just say "name" instead (or "bus name" when ambiguous). Did not change the internal code of the message bus itself, only the programmer-facing API and messages. * doc/dbus-specification.xml: further update the message bus section * bus/config-parser.c (all_are_equiv): fix bug using freed string in error case
Diffstat (limited to 'test/data')
-rw-r--r--test/data/equiv-config-files/basic/basic-1.conf6
-rw-r--r--test/data/valid-config-files/basic.conf6
-rw-r--r--test/data/valid-config-files/many-rules.conf6
3 files changed, 9 insertions, 9 deletions
diff --git a/test/data/equiv-config-files/basic/basic-1.conf b/test/data/equiv-config-files/basic/basic-1.conf
index 4500ad70..99f41e80 100644
--- a/test/data/equiv-config-files/basic/basic-1.conf
+++ b/test/data/equiv-config-files/basic/basic-1.conf
@@ -14,12 +14,12 @@
<limit name="max_incoming_bytes">5000</limit>
<limit name="max_outgoing_bytes">5000</limit>
<limit name="max_message_size">300</limit>
- <limit name="activation_timeout">5000</limit>
+ <limit name="service_start_timeout">5000</limit>
<limit name="auth_timeout">6000</limit>
<limit name="max_completed_connections">50</limit>
<limit name="max_incomplete_connections">80</limit>
<limit name="max_connections_per_user">64</limit>
- <limit name="max_pending_activations">64</limit>
- <limit name="max_services_per_connection">256</limit>
+ <limit name="max_pending_service_starts">64</limit>
+ <limit name="max_names_per_connection">256</limit>
</busconfig>
diff --git a/test/data/valid-config-files/basic.conf b/test/data/valid-config-files/basic.conf
index 73bd02ac..5297097d 100644
--- a/test/data/valid-config-files/basic.conf
+++ b/test/data/valid-config-files/basic.conf
@@ -14,13 +14,13 @@
<limit name="max_incoming_bytes">5000</limit>
<limit name="max_outgoing_bytes">5000</limit>
<limit name="max_message_size">300</limit>
- <limit name="activation_timeout">5000</limit>
+ <limit name="service_start_timeout">5000</limit>
<limit name="auth_timeout">6000</limit>
<limit name="max_completed_connections">50</limit>
<limit name="max_incomplete_connections">80</limit>
<limit name="max_connections_per_user">64</limit>
- <limit name="max_pending_activations">64</limit>
- <limit name="max_services_per_connection">256</limit>
+ <limit name="max_pending_service_starts">64</limit>
+ <limit name="max_names_per_connection">256</limit>
<selinux>
<associate own="org.freedesktop.FrobationaryMeasures"
diff --git a/test/data/valid-config-files/many-rules.conf b/test/data/valid-config-files/many-rules.conf
index 0c675828..ab05909f 100644
--- a/test/data/valid-config-files/many-rules.conf
+++ b/test/data/valid-config-files/many-rules.conf
@@ -46,13 +46,13 @@
<limit name="max_incoming_bytes">5000</limit>
<limit name="max_outgoing_bytes">5000</limit>
<limit name="max_message_size">300</limit>
- <limit name="activation_timeout">5000</limit>
+ <limit name="service_start_timeout">5000</limit>
<limit name="auth_timeout">6000</limit>
<limit name="max_completed_connections">50</limit>
<limit name="max_incomplete_connections">80</limit>
<limit name="max_connections_per_user">64</limit>
- <limit name="max_pending_activations">64</limit>
- <limit name="max_services_per_connection">256</limit>
+ <limit name="max_pending_service_starts">64</limit>
+ <limit name="max_names_per_connection">256</limit>
<limit name="max_match_rules_per_connection">512</limit>
</busconfig>