summaryrefslogtreecommitdiffstats
path: root/bus
diff options
context:
space:
mode:
Diffstat (limited to 'bus')
-rw-r--r--bus/activation-exit-codes.h2
-rw-r--r--bus/activation-helper-bin.c2
-rw-r--r--bus/activation-helper.c2
-rw-r--r--bus/activation-helper.h2
-rw-r--r--bus/activation.c2
-rw-r--r--bus/activation.h2
-rw-r--r--bus/bus.c2
-rw-r--r--bus/bus.h2
-rw-r--r--bus/config-loader-expat.c2
-rw-r--r--bus/config-loader-libxml.c2
-rw-r--r--bus/config-parser-common.c2
-rw-r--r--bus/config-parser-common.h2
-rw-r--r--bus/config-parser-trivial.c2
-rw-r--r--bus/config-parser-trivial.h2
-rw-r--r--bus/config-parser.c4
-rw-r--r--bus/config-parser.h2
-rw-r--r--bus/connection.c2
-rw-r--r--bus/connection.h2
-rw-r--r--bus/desktop-file.c2
-rw-r--r--bus/desktop-file.h2
-rw-r--r--bus/dir-watch-default.c2
-rw-r--r--bus/dir-watch-dnotify.c2
-rw-r--r--bus/dir-watch-inotify.c6
-rw-r--r--bus/dir-watch-kqueue.c2
-rw-r--r--bus/dir-watch.h2
-rw-r--r--bus/dispatch.c2
-rw-r--r--bus/dispatch.h2
-rw-r--r--bus/driver.c2
-rw-r--r--bus/driver.h2
-rw-r--r--bus/expirelist.c7
-rw-r--r--bus/expirelist.h2
-rw-r--r--bus/main.c2
-rw-r--r--bus/policy.c2
-rw-r--r--bus/policy.h2
-rw-r--r--bus/selinux.c2
-rw-r--r--bus/selinux.h2
-rw-r--r--bus/services.c2
-rw-r--r--bus/services.h2
-rw-r--r--bus/session.conf.in1
-rw-r--r--bus/signals.c2
-rw-r--r--bus/signals.h2
-rw-r--r--bus/test-launch-helper.c2
-rw-r--r--bus/test-main.c2
-rw-r--r--bus/test-system.c2
-rw-r--r--bus/test.c2
-rw-r--r--bus/test.h2
-rw-r--r--bus/utils.c2
-rw-r--r--bus/utils.h2
48 files changed, 55 insertions, 51 deletions
diff --git a/bus/activation-exit-codes.h b/bus/activation-exit-codes.h
index af6952e9..bbb98dca 100644
--- a/bus/activation-exit-codes.h
+++ b/bus/activation-exit-codes.h
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/activation-helper-bin.c b/bus/activation-helper-bin.c
index 4a359726..a360acc7 100644
--- a/bus/activation-helper-bin.c
+++ b/bus/activation-helper-bin.c
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/activation-helper.c b/bus/activation-helper.c
index 36006a4c..baba8f04 100644
--- a/bus/activation-helper.c
+++ b/bus/activation-helper.c
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/activation-helper.h b/bus/activation-helper.h
index aee50108..361a4c6a 100644
--- a/bus/activation-helper.h
+++ b/bus/activation-helper.h
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/activation.c b/bus/activation.c
index a273c4ad..782ffed8 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include "activation.h"
diff --git a/bus/activation.h b/bus/activation.h
index 56e22836..2dff812a 100644
--- a/bus/activation.h
+++ b/bus/activation.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/bus.c b/bus/bus.c
index 129b2e6c..f6ff1803 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/bus.h b/bus/bus.h
index aba17043..94c64c7e 100644
--- a/bus/bus.h
+++ b/bus/bus.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c
index 4b29f32b..c0620aed 100644
--- a/bus/config-loader-expat.c
+++ b/bus/config-loader-expat.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/config-loader-libxml.c b/bus/config-loader-libxml.c
index 2c323c75..3d82a633 100644
--- a/bus/config-loader-libxml.c
+++ b/bus/config-loader-libxml.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/config-parser-common.c b/bus/config-parser-common.c
index 5cdbba26..ebcb7177 100644
--- a/bus/config-parser-common.c
+++ b/bus/config-parser-common.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/config-parser-common.h b/bus/config-parser-common.h
index 2c296433..dc0e0eda 100644
--- a/bus/config-parser-common.h
+++ b/bus/config-parser-common.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c
index 98d554e8..fd016a84 100644
--- a/bus/config-parser-trivial.c
+++ b/bus/config-parser-trivial.c
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/config-parser-trivial.h b/bus/config-parser-trivial.h
index bb760dd5..ce542bfb 100644
--- a/bus/config-parser-trivial.h
+++ b/bus/config-parser-trivial.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/config-parser.c b/bus/config-parser.c
index 784c8315..a4a01914 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include "config-parser-common.h"
@@ -448,7 +448,7 @@ bus_config_parser_new (const DBusString *basedir,
*/
parser->limits.max_match_rules_per_connection = 512;
- parser->limits.reply_timeout = 5 * 60 * 1000; /* 5 minutes */
+ parser->limits.reply_timeout = -1; /* never */
/* this is effectively a limit on message queue size for messages
* that require a reply
diff --git a/bus/config-parser.h b/bus/config-parser.h
index bb3a30f4..3aac1ed3 100644
--- a/bus/config-parser.h
+++ b/bus/config-parser.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/connection.c b/bus/connection.c
index 9159c898..50807f1a 100644
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include "connection.h"
diff --git a/bus/connection.h b/bus/connection.h
index 4f352169..4b9a754b 100644
--- a/bus/connection.h
+++ b/bus/connection.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/desktop-file.c b/bus/desktop-file.c
index e925b2ea..9f88d6e7 100644
--- a/bus/desktop-file.c
+++ b/bus/desktop-file.c
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include <dbus/dbus-sysdeps.h>
diff --git a/bus/desktop-file.h b/bus/desktop-file.h
index 549f89a4..7f43458a 100644
--- a/bus/desktop-file.h
+++ b/bus/desktop-file.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#ifndef BUS_DESKTOP_FILE_H
diff --git a/bus/dir-watch-default.c b/bus/dir-watch-default.c
index 927f6721..6f8f1e99 100644
--- a/bus/dir-watch-default.c
+++ b/bus/dir-watch-default.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/dir-watch-dnotify.c b/bus/dir-watch-dnotify.c
index 0f6390cd..b38d7d19 100644
--- a/bus/dir-watch-dnotify.c
+++ b/bus/dir-watch-dnotify.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
index 12fdbb07..ee580d74 100644
--- a/bus/dir-watch-inotify.c
+++ b/bus/dir-watch-inotify.c
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -97,7 +97,11 @@ bus_watch_directory (const char *dir, BusContext *context)
_dbus_assert (dir != NULL);
if (inotify_fd == -1) {
+#ifdef HAVE_INOTIFY_INIT1
+ inotify_fd = inotify_init1 (IN_CLOEXEC);
+#else
inotify_fd = inotify_init ();
+#endif
if (inotify_fd <= 0) {
_dbus_warn ("Cannot initialize inotify\n");
goto out;
diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c
index d491284d..16741dd0 100644
--- a/bus/dir-watch-kqueue.c
+++ b/bus/dir-watch-kqueue.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/dir-watch.h b/bus/dir-watch.h
index 171ade93..8e322a6e 100644
--- a/bus/dir-watch.h
+++ b/bus/dir-watch.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/dispatch.c b/bus/dispatch.c
index fa5874d2..a69a929c 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -19,7 +19,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/dispatch.h b/bus/dispatch.h
index 47144c92..fb5ba7a5 100644
--- a/bus/dispatch.h
+++ b/bus/dispatch.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/driver.c b/bus/driver.c
index b5138067..4a6a3243 100644
--- a/bus/driver.c
+++ b/bus/driver.c
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/driver.h b/bus/driver.h
index 770b6d9f..713b2764 100644
--- a/bus/driver.h
+++ b/bus/driver.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/expirelist.c b/bus/expirelist.c
index d718d9ff..58e1f6d1 100644
--- a/bus/expirelist.c
+++ b/bus/expirelist.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -157,7 +157,8 @@ do_expiration_with_current_time (BusExpireList *list,
item->added_tv_usec,
tv_sec, tv_usec);
- if (elapsed >= (double) list->expire_after)
+ if (((item->added_tv_sec == 0) && (item->added_tv_usec == 0)) ||
+ ((list->expire_after > 0) && (elapsed >= (double) list->expire_after)))
{
_dbus_verbose ("Expiring an item %p\n", item);
@@ -173,7 +174,7 @@ do_expiration_with_current_time (BusExpireList *list,
break;
}
}
- else
+ else if (list->expire_after > 0)
{
double to_wait;
diff --git a/bus/expirelist.h b/bus/expirelist.h
index af0a0729..887cb97b 100644
--- a/bus/expirelist.h
+++ b/bus/expirelist.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/main.c b/bus/main.c
index d86825a5..59651957 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include "bus.h"
diff --git a/bus/policy.c b/bus/policy.c
index ef31800f..bc1d2d9d 100644
--- a/bus/policy.c
+++ b/bus/policy.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/policy.h b/bus/policy.h
index a75e0dd9..1782dbf3 100644
--- a/bus/policy.h
+++ b/bus/policy.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/selinux.c b/bus/selinux.c
index 46a18a93..df9a00b1 100644
--- a/bus/selinux.c
+++ b/bus/selinux.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include <dbus/dbus-internals.h>
diff --git a/bus/selinux.h b/bus/selinux.h
index 462a79b4..3bab36de 100644
--- a/bus/selinux.h
+++ b/bus/selinux.h
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/services.c b/bus/services.c
index 94715bfd..b260c633 100644
--- a/bus/services.c
+++ b/bus/services.c
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include <dbus/dbus-hash.h>
diff --git a/bus/services.h b/bus/services.h
index 3ecd6d20..056dd9fa 100644
--- a/bus/services.h
+++ b/bus/services.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/session.conf.in b/bus/session.conf.in
index aed320eb..85395c52 100644
--- a/bus/session.conf.in
+++ b/bus/session.conf.in
@@ -59,6 +59,5 @@
<limit name="max_names_per_connection">50000</limit>
<limit name="max_match_rules_per_connection">50000</limit>
<limit name="max_replies_per_connection">50000</limit>
- <limit name="reply_timeout">300000</limit>
</busconfig>
diff --git a/bus/signals.c b/bus/signals.c
index c90149b2..b020a76c 100644
--- a/bus/signals.c
+++ b/bus/signals.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include "signals.h"
diff --git a/bus/signals.h b/bus/signals.h
index ab3c33aa..4ea10755 100644
--- a/bus/signals.h
+++ b/bus/signals.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/test-launch-helper.c b/bus/test-launch-helper.c
index e7ac18b9..d78ca519 100644
--- a/bus/test-launch-helper.c
+++ b/bus/test-launch-helper.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/test-main.c b/bus/test-main.c
index 2583f9a8..000bdd5a 100644
--- a/bus/test-main.c
+++ b/bus/test-main.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/test-system.c b/bus/test-system.c
index 2ecca7e7..6224ab5e 100644
--- a/bus/test-system.c
+++ b/bus/test-system.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/test.c b/bus/test.c
index e6716ca9..8dfe098c 100644
--- a/bus/test.c
+++ b/bus/test.c
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/test.h b/bus/test.h
index 6d36b9c4..090768ca 100644
--- a/bus/test.h
+++ b/bus/test.h
@@ -17,7 +17,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/utils.c b/bus/utils.c
index 8e9353e4..7d248727 100644
--- a/bus/utils.c
+++ b/bus/utils.c
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/bus/utils.h b/bus/utils.h
index 1d8bdb29..f533895f 100644
--- a/bus/utils.h
+++ b/bus/utils.h
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/