From 4db285c800a68245ad7593e606ca8cb2c21a1329 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 5 May 2005 22:02:11 +0000 Subject: 2005-05-05 Havoc Pennington * configure.in (LT_*): add notes on how the libtool versioning works to save thinking. Increment soname to indicate protocol breakage (though really the library interface hasn't changed I guess) * dbus/dbus-transport.c (_dbus_transport_get_is_authenticated): verify the GUID received from server matches what we were expecting, if we had an expectation * dbus/dbus-auth.c (send_ok): send GUID along with the OK command (_dbus_auth_get_guid_from_server): new function (send_begin): parse the OK args * doc/dbus-specification.xml: add GUID to the auth protocol --- doc/dbus-specification.xml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'doc/dbus-specification.xml') diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml index ff625447..0ea43a87 100644 --- a/doc/dbus-specification.xml +++ b/doc/dbus-specification.xml @@ -1337,7 +1337,7 @@ REJECTED <space-separated list of mechanism names> - OK + OK <GUID in hex> DATA <data in hex encoding> ERROR @@ -1478,6 +1478,10 @@ The server must not accept additional commands using this protocol after the OK command has been sent. + + The OK command has one argument, which is the GUID of the server. + See for more on server GUIDs. + ERROR Command @@ -1516,7 +1520,7 @@ (MAGIC_COOKIE is a made up mechanism) C: AUTH MAGIC_COOKIE 3138363935333137393635383634 - S: OK + S: OK 1234deadbeef C: BEGIN @@ -1528,7 +1532,7 @@ C: AUTH SKEY 7ab83f32ee S: DATA 8799cabb2ea93e C: DATA 8ac876e8f68ee9809bfa876e6f9876g8fa8e76e98f - S: OK + S: OK 1234deadbeef C: BEGIN @@ -1538,7 +1542,7 @@ C: FOOBAR S: ERROR C: AUTH MAGIC_COOKIE 3736343435313230333039 - S: OK + S: OK 1234deadbeef C: BEGIN @@ -1550,7 +1554,7 @@ C: AUTH SKEY 7ab83f32ee S: DATA 8799cabb2ea93e C: DATA 8ac876e8f68ee9809bfa876e6f9876g8fa8e76e98f - S: OK + S: OK 1234deadbeef C: BEGIN @@ -1566,7 +1570,7 @@ C: AUTH SKEY 7ab83f32ee S: DATA 8799cabb2ea93e C: DATA 8ac876e8f68ee9809bfa876e6f9876g8fa8e76e98f - S: OK + S: OK 1234deadbeef C: BEGIN @@ -1582,7 +1586,7 @@ C: AUTH SKEY 7ab83f32ee S: DATA 8799cabb2ea93e C: DATA 8ac876e8f68ee9809bfa876e6f9876g8fa8e76e98f - S: OK + S: OK 1234deadbeef C: BEGIN -- cgit