src/pulse/proplist.h | 2 +- src/pulsecore/core-util.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit 3173358f76a5cf72b06077601f460f8d24863af6 Author: Lennart Poettering <[email protected]> Date: Tue May 15 14:06:46 2012 +0200 proplist: document new meaning of the session ID diff --git a/src/pulse/proplist.h b/src/pulse/proplist.h index 46a9a61..359212a 100644 --- a/src/pulse/proplist.h +++ b/src/pulse/proplist.h @@ -177,7 +177,7 @@ PA_C_DECL_BEGIN /** For clients/streams: the D-Bus host id the application runs on. e.g. "543679e7b01393ed3e3e650047d78f6e" */ #define PA_PROP_APPLICATION_PROCESS_MACHINE_ID "application.process.machine_id" -/** For clients/streams: an id for the login session the application runs in. On Unix the value of $XDG_SESSION_COOKIE. e.g. "543679e7b01393ed3e3e650047d78f6e-1235159798.76193-190367717" */ +/** For clients/streams: an id for the login session the application runs in. On Unix the value of $XDG_SESSION_ID. e.g. "5" */ #define PA_PROP_APPLICATION_PROCESS_SESSION_ID "application.process.session_id" /** For devices: device string in the underlying audio layer's format. e.g. "surround51:0" */ commit 8a55219599879439a25b00069975a0e81927a5a8 Author: Lennart Poettering <[email protected]> Date: Tue May 15 14:04:31 2012 +0200 util: XDG_SESSION_COOKIE is unsuitable as session ID XDG_SESSION_COOKIE was supposed to be used for access control to the session and should not be exposed to other users. Replace usage of XDG_SESSION_COOKIE by XDG_SESSION_ID which is the right choice here since it is actually a proper session ID that may be published. diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index 61f980e..2900e3c 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -2758,7 +2758,8 @@ char *pa_machine_id(void) { char *pa_session_id(void) { const char *e; - if (!(e = getenv("XDG_SESSION_COOKIE"))) + e = getenv("XDG_SESSION_ID"); + if (!e) return NULL; return pa_utf8_filter(e); _______________________________________________ pulseaudio-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
