diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | dbus/dbus-server.c | 10 | 
2 files changed, 16 insertions, 3 deletions
| @@ -1,3 +1,12 @@ +2007-05-19  Ralf.Habacker  <ralf.habacker@freenet.de> + +	* dbus/dbus-server.c (listen_funcs):  +	_dbus_server_listen_platform_specific is emtpy on win32,  +	limited to unix only. + +	* dbus/dbus-server.c (valid_addresses): limit unix  +	only addresses to unix.  +  2007-05-18  Havoc Pennington  <hp@redhat.com>  	* doc/dbus-specification.xml: add a GetAll to the Properties diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c index f5c8e7cc..ae2f767f 100644 --- a/dbus/dbus-server.c +++ b/dbus/dbus-server.c @@ -509,8 +509,10 @@ static const struct {                                     DBusServer      **server_p,                                     DBusError        *error);  } listen_funcs[] = { -  { _dbus_server_listen_socket }, -  { _dbus_server_listen_platform_specific } +  { _dbus_server_listen_socket } +#ifdef DBUS_UNIX +  , { _dbus_server_listen_platform_specific } +#endif  #ifdef DBUS_BUILD_TESTS    , { _dbus_server_listen_debug_pipe }  #endif @@ -1116,10 +1118,12 @@ _dbus_server_test (void)  {    const char *valid_addresses[] = {      "tcp:port=1234", -    "unix:path=./boogie",      "tcp:host=localhost,port=1234",      "tcp:host=localhost,port=1234;tcp:port=5678", +#ifdef DBUS_UNIX +    "unix:path=./boogie",      "tcp:port=1234;unix:path=./boogie", +#endif    };    DBusServer *server; | 
