summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--bus/connection.c12
-rw-r--r--doc/config-file.txt3
3 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3db6d96f..602e2c42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-24 Havoc Pennington <hp@pobox.com>
+
+ * bus/connection.c (bus_connections_setup_connection): set up
+ the "can this user connect" function, but it always returns
+ TRUE until we have a config file parser so we can have a config
+ file that allows connections.
+
2003-03-23 Havoc Pennington <hp@pobox.com>
* dbus/dbus-threads.c (dbus_mutex_new, dbus_condvar_new): with
diff --git a/bus/connection.c b/bus/connection.c
index 773ed5ef..4cb98f65 100644
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -159,6 +159,9 @@ bus_connection_disconnected (DBusConnection *connection)
NULL))
_dbus_assert_not_reached ("setting timeout functions to NULL failed");
+ dbus_connection_set_unix_user_function (connection,
+ NULL, NULL, NULL);
+
bus_connection_remove_transactions (connection);
_dbus_list_remove (&d->connections->list, connection);
@@ -245,6 +248,8 @@ allow_user_function (DBusConnection *connection,
d = BUS_CONNECTION_DATA (connection);
_dbus_assert (d != NULL);
+
+ return TRUE; /* FIXME - this is just until we can parse a config file */
return bus_context_allow_user (d->connections->context, uid);
}
@@ -375,6 +380,10 @@ bus_connections_setup_connection (BusConnections *connections,
connection, NULL))
goto out;
+
+ dbus_connection_set_unix_user_function (connection,
+ allow_user_function,
+ NULL, NULL);
/* Setup the connection with the dispatcher */
if (!bus_dispatch_add_connection (connection))
@@ -408,6 +417,9 @@ bus_connections_setup_connection (BusConnections *connections,
connection,
NULL))
_dbus_assert_not_reached ("setting timeout functions to NULL failed");
+
+ dbus_connection_set_unix_user_function (connection,
+ NULL, NULL, NULL);
}
return retval;
diff --git a/doc/config-file.txt b/doc/config-file.txt
index 093cb413..c35d05c6 100644
--- a/doc/config-file.txt
+++ b/doc/config-file.txt
@@ -58,6 +58,9 @@ Elements:
Lists permitted authorization mechanisms. If this element doesn't
exist, then all known mechanisms are allowed. If there are
multiple <auth> elements, the last one wins (they are not merged).
+
+ Example: <auth>EXTERNAL</auth>
+ Example: <auth>DBUS_COOKIE_SHA1</auth>
<policy>
context="(default|mandatory)" one of the context/user/group