diff options
| author | Colin Guthrie <pulse@colin.guthr.ie> | 2008-06-09 18:21:56 +0000 |
|---|---|---|
| committer | Colin Guthrie <pulse@colin.guthr.ie> | 2008-06-09 18:21:56 +0000 |
| commit | 71fefa77dbd1101a39afefa6a3f5b4dd01f28a36 (patch) | |
| tree | f5abb52740fc231a8ae8dff86c652e25d7e3c274 /src | |
| parent | 3e4afae7f611ce7b70471fbceaca69a696e10a06 (diff) | |
Do not invalidate the cookie if no file was specified.
Only invalidate it when a cookie-file is specified and it is not loaded/parsed correctly.
This fixes a bug introduced in r2494
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2498 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
| -rw-r--r-- | src/pulse/client-conf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c index 75f44182..17334a49 100644 --- a/src/pulse/client-conf.c +++ b/src/pulse/client-conf.c @@ -178,11 +178,11 @@ int pa_client_conf_env(pa_client_conf *c) { int pa_client_conf_load_cookie(pa_client_conf* c) { pa_assert(c); - c->cookie_valid = FALSE; - if (!c->cookie_file) return -1; + c->cookie_valid = FALSE; + if (pa_authkey_load_auto(c->cookie_file, c->cookie, sizeof(c->cookie)) < 0) return -1; |