mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-04-23 04:00:39 +02:00
removed applied patches
This commit is contained in:
parent
a28a5a0bd4
commit
383312097c
1 changed files with 0 additions and 98 deletions
|
|
@ -243,27 +243,6 @@ diff -u -r1.36 main.c
|
|||
if (!_dbus_string_init (&config_file))
|
||||
return 1;
|
||||
|
||||
Index: bus/policy.c
|
||||
===================================================================
|
||||
RCS file: /cvs/dbus/dbus/bus/policy.c,v
|
||||
retrieving revision 1.24
|
||||
diff -u -r1.24 policy.c
|
||||
--- bus/policy.c 12 Dec 2006 21:24:07 -0000 1.24
|
||||
+++ bus/policy.c 8 Mar 2007 20:25:40 -0000
|
||||
@@ -324,9 +324,13 @@
|
||||
|
||||
if (!dbus_connection_get_unix_user (connection, &uid))
|
||||
{
|
||||
+#ifdef DBUS_WIN
|
||||
+ _dbus_verbose ("policy.c: dbus_connection_get_unix_user check disabled under windows\n");
|
||||
+#else
|
||||
dbus_set_error (error, DBUS_ERROR_FAILED,
|
||||
"No user ID known for connection, cannot determine security policy\n");
|
||||
goto failed;
|
||||
+#endif
|
||||
}
|
||||
|
||||
if (_dbus_hash_table_get_n_entries (policy->rules_by_uid) > 0)
|
||||
Index: dbus/dbus-bus.c
|
||||
===================================================================
|
||||
RCS file: /cvs/dbus/dbus/dbus/dbus-bus.c,v
|
||||
|
|
@ -455,49 +434,6 @@ diff -u -r1.3 dbus-server-socket.c
|
|||
|
||||
client_fd = _dbus_accept (listen_fd);
|
||||
|
||||
Index: dbus/dbus-server.c
|
||||
===================================================================
|
||||
RCS file: /cvs/dbus/dbus/dbus/dbus-server.c,v
|
||||
retrieving revision 1.54
|
||||
diff -u -r1.54 dbus-server.c
|
||||
--- dbus/dbus-server.c 21 Oct 2006 23:09:18 -0000 1.54
|
||||
+++ dbus/dbus-server.c 8 Mar 2007 20:25:40 -0000
|
||||
@@ -509,8 +509,10 @@
|
||||
DBusServer **server_p,
|
||||
DBusError *error);
|
||||
} listen_funcs[] = {
|
||||
- { _dbus_server_listen_socket },
|
||||
- { _dbus_server_listen_platform_specific }
|
||||
+ { _dbus_server_listen_socket }
|
||||
+#ifndef DBUS_WIN
|
||||
+ , { _dbus_server_listen_platform_specific }
|
||||
+#endif
|
||||
#ifdef DBUS_BUILD_TESTS
|
||||
, { _dbus_server_listen_debug_pipe }
|
||||
#endif
|
||||
@@ -1114,6 +1116,13 @@
|
||||
dbus_bool_t
|
||||
_dbus_server_test (void)
|
||||
{
|
||||
+#if defined(DBUS_WIN) || defined(DBUS_WINCE)
|
||||
+ const char *valid_addresses[] = {
|
||||
+ "tcp:port=1234",
|
||||
+ "tcp:host=localhost,port=1234",
|
||||
+ "tcp:host=localhost,port=1234;tcp:port=5678",
|
||||
+ };
|
||||
+#else
|
||||
const char *valid_addresses[] = {
|
||||
"tcp:port=1234",
|
||||
"unix:path=./boogie",
|
||||
@@ -1121,7 +1130,7 @@
|
||||
"tcp:host=localhost,port=1234;tcp:port=5678",
|
||||
"tcp:port=1234;unix:path=./boogie",
|
||||
};
|
||||
-
|
||||
+#endif
|
||||
DBusServer *server;
|
||||
int i;
|
||||
|
||||
Index: dbus/dbus-spawn.c
|
||||
===================================================================
|
||||
RCS file: /cvs/dbus/dbus/dbus/dbus-spawn.c,v
|
||||
|
|
@ -547,40 +483,6 @@ diff -u -r1.10 dbus-sysdeps-util.c
|
|||
#ifdef DBUS_WIN
|
||||
check_path_absolute ("c:/", TRUE);
|
||||
check_path_absolute ("c:/foo", TRUE);
|
||||
Index: dbus/dbus-sysdeps.c
|
||||
===================================================================
|
||||
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.c,v
|
||||
retrieving revision 1.120
|
||||
diff -u -r1.120 dbus-sysdeps.c
|
||||
--- dbus/dbus-sysdeps.c 1 Jan 2007 21:29:59 -0000 1.120
|
||||
+++ dbus/dbus-sysdeps.c 8 Mar 2007 20:25:41 -0000
|
||||
@@ -119,11 +119,14 @@
|
||||
* will get upset about.
|
||||
*/
|
||||
|
||||
- putenv_value = malloc (len + 1);
|
||||
+ putenv_value = malloc (len + 2);
|
||||
if (putenv_value == NULL)
|
||||
return FALSE;
|
||||
|
||||
strcpy (putenv_value, varname);
|
||||
+#if defined(DBUS_WIN)
|
||||
+ strcat (putenv_value, "=");
|
||||
+#endif
|
||||
|
||||
return (putenv (putenv_value) == 0);
|
||||
#endif
|
||||
@@ -413,6 +416,10 @@
|
||||
ascii_strtod (const char *nptr,
|
||||
char **endptr)
|
||||
{
|
||||
+ /* FIXME: The Win32 C library's strtod() doesn't handle hex.
|
||||
+ * Presumably many Unixes don't either.
|
||||
+ */
|
||||
+
|
||||
char *fail_pos;
|
||||
double val;
|
||||
struct lconv *locale_data;
|
||||
Index: dbus/dbus-sysdeps.h
|
||||
===================================================================
|
||||
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.h,v
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue