From 14c31804ad4e48c7dcf12e5f96198d5ee19b6a2f Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 22 Dec 2009 10:07:37 +0100 Subject: [PATCH 1/3] fixed install root when using msvc ide --- dbus/dbus-sysdeps-win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 2a8100ab..c323820b 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -3208,6 +3208,8 @@ _dbus_get_install_root(char *prefix, int len) //the Latin "bin", but that is not likely I think... if (lastSlash - prefix > 3 && strncmp(lastSlash - 4, "\\bin", 4) == 0) lastSlash[-3] = 0; + else if (lastSlash - prefix > 3 && (strncmp(lastSlash - 10, "\\bin\\Debug", 10) == 0 || strncmp(lastSlash - 10, "\\bin\\Release", 10) == 0)) + lastSlash[-9] = 0; return TRUE; } From fdf24b805e9e2883bcd08335924e08a9c68ab719 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Wed, 23 Dec 2009 10:40:48 +0100 Subject: [PATCH 2/3] nonce tcp support requires _dbus_string_equal_len also when build without tests --- dbus/dbus-string.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c index b7a8b992..d9cf18ed 100644 --- a/dbus/dbus-string.c +++ b/dbus/dbus-string.c @@ -2311,7 +2311,6 @@ _dbus_string_equal (const DBusString *a, return TRUE; } -#ifdef DBUS_BUILD_TESTS /** * Tests two DBusString for equality up to the given length. * The strings may be shorter than the given length. @@ -2356,7 +2355,6 @@ _dbus_string_equal_len (const DBusString *a, return TRUE; } -#endif /* DBUS_BUILD_TESTS */ /** * Tests two sub-parts of two DBusString for equality. The specified From 658be8be7befff984e71b4e60d8c796900fd05be Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Wed, 23 Dec 2009 11:09:42 +0100 Subject: [PATCH 3/3] added initial tcp transport section --- doc/dbus-specification.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml index be9c9ffb..901e6657 100644 --- a/doc/dbus-specification.xml +++ b/doc/dbus-specification.xml @@ -2426,6 +2426,22 @@ would be padded by Nul bytes. + + TCP Sockets + + The tcp transport provides TCP/IP based connections between clients + located on the same or different hosts. + + + Windows notes: Because the tcp stack on windows do not provide sending + credentials over a tcp connection, the EXTERNAL authentification + mechanismus do not work. + + + Using tcp transport without any additional secure authentification mechanismus + over a network is unsecure. + + Nonce-secured TCP Sockets