On Sat, Dec 26, 2015 at 12:46:03AM -0700, Sebastien Marie wrote:
> CVSROOT:      /cvs
> Module name:  src
> Changes by:   sema...@cvs.openbsd.org 2015/12/26 00:46:03
> 
> Modified files:
>       usr.bin/ssh    : clientloop.c mux.c 
> 
> Log message:
> adjust pledge promises for ControlMaster: when using "ask" or "autoask", the 
> process will use ssh-askpass for asking confirmation.
> 
> problem found by halex@
> 
> ok halex@
> 

I missed to comments some changes done on mux.c:

While here, I reconsidered a bit the pledge(2) calls inside mux.c. As I         
                                                           
saw some problems too.                                                          
                                                           
                                                                                
                                                           
I removed the first pledge call inside muxclient() as on error the              
                                                           
function will return and code-path will continue while we were pledged          
                                                           
for mux session (so it will be killed later).                                   
                                                           
                                                                                
                                                           
And I moved the pledge call inside mux_client_request_session() more            
                                                           
later: there are error condition that could make the function returns           
                                                           
(and continue outside...)                                                       
                                                           
-- 
Sebastien Marie

Reply via email to