summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2006-08-22 15:36:37 +0000
committerPierre Ossman <ossman@cendio.se>2006-08-22 15:36:37 +0000
commit095f35725d644e0284c4b2d99b6fab71290eaeaa (patch)
tree0c024ac89974f2da13a2e85f7faf0c5b5e7428fc
parent306aea78d35486596627bcbbcb566d5f19bb9e21 (diff)
Proceed with connect even when no cookie is loaded. Allows you to connect
to server which do not require a cookie under all circumstances. git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1324 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulse/context.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c
index 2f9106a5..b700657b 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -434,10 +434,8 @@ static void setup_context(pa_context *c, pa_iochannel *io) {
assert(!c->pdispatch);
c->pdispatch = pa_pdispatch_new(c->mainloop, command_table, PA_COMMAND_MAX);
- if (!c->conf->cookie_valid) {
- pa_context_fail(c, PA_ERR_AUTHKEY);
- goto finish;
- }
+ if (!c->conf->cookie_valid)
+ pa_log_warn("No cookie loaded. Attempting to connect without.");
t = pa_tagstruct_command(c, PA_COMMAND_AUTH, &tag);
pa_tagstruct_putu32(t, PA_PROTOCOL_VERSION);
@@ -463,8 +461,6 @@ static void setup_context(pa_context *c, pa_iochannel *io) {
pa_context_set_state(c, PA_CONTEXT_AUTHORIZING);
-finish:
-
pa_context_unref(c);
}