mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	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
This commit is contained in:
		
							parent
							
								
									306aea78d3
								
							
						
					
					
						commit
						095f35725d
					
				
					 1 changed files with 2 additions and 6 deletions
				
			
		| 
						 | 
					@ -434,10 +434,8 @@ static void setup_context(pa_context *c, pa_iochannel *io) {
 | 
				
			||||||
    assert(!c->pdispatch);
 | 
					    assert(!c->pdispatch);
 | 
				
			||||||
    c->pdispatch = pa_pdispatch_new(c->mainloop, command_table, PA_COMMAND_MAX);
 | 
					    c->pdispatch = pa_pdispatch_new(c->mainloop, command_table, PA_COMMAND_MAX);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (!c->conf->cookie_valid) {
 | 
					    if (!c->conf->cookie_valid)
 | 
				
			||||||
        pa_context_fail(c, PA_ERR_AUTHKEY);
 | 
					        pa_log_warn("No cookie loaded. Attempting to connect without.");
 | 
				
			||||||
        goto finish;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    t = pa_tagstruct_command(c, PA_COMMAND_AUTH, &tag);
 | 
					    t = pa_tagstruct_command(c, PA_COMMAND_AUTH, &tag);
 | 
				
			||||||
    pa_tagstruct_putu32(t, PA_PROTOCOL_VERSION);
 | 
					    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);
 | 
					    pa_context_set_state(c, PA_CONTEXT_AUTHORIZING);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
finish:
 | 
					 | 
				
			||||||
    
 | 
					 | 
				
			||||||
    pa_context_unref(c);
 | 
					    pa_context_unref(c);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue