View | Details | Raw Unified | Return to bug 1621
Collapse All | Expand All

(-)a/mux.c (-1 / +5 lines)
Lines 514-519 muxclient(const char *path) Link Here
514 
	switch (options.control_master) {
 514 
	switch (options.control_master) {
515 
	case SSHCTL_MASTER_AUTO:
 515 
	case SSHCTL_MASTER_AUTO:
516 
	case SSHCTL_MASTER_AUTO_ASK:
 516 
	case SSHCTL_MASTER_AUTO_ASK:
517 
	case SSHCTL_MASTER_REQUIRED:
517 
		debug("auto-mux: Trying existing master");
 518 
		debug("auto-mux: Trying existing master");
518 
		/* FALLTHROUGH */
 519 
		/* FALLTHROUGH */
519 
	case SSHCTL_MASTER_NO:
 520 
	case SSHCTL_MASTER_NO:
Lines 546-551 muxclient(const char *path) Link Here
546 
			    strerror(errno));
 547 
			    strerror(errno));
547 
		}
 548 
		}
548 
		close(sock);
 549 
		close(sock);
550 
		if (options.control_master == SSHCTL_MASTER_REQUIRED)
551 
			cleanup_exit(255);
549 
		return;
 552 
		return;
550 
	}
 553 
	}
551 

          554
          

        

  

    
      
            Lines 582-588
          muxclient(const char *path)
      
      
        Link Here
      
    
  

        

          582
          
 muxerr:

          585
          
 muxerr:

        

        

          583
          
		close(sock);

          586
          
		close(sock);

        

        

          584
          
		buffer_free(&m);

          587
          
		buffer_free(&m);

        

          
            

              585
              
		if (muxclient_command != SSHMUX_COMMAND_OPEN)


              588
              
		if (options.control_master == SSHCTL_MASTER_REQUIRED

            

            

              
              

              589
              
			|| muxclient_command != SSHMUX_COMMAND_OPEN)

            

        

          586
          
			cleanup_exit(255);

          590
          
			cleanup_exit(255);

        

        

          587
          
		logit("Falling back to non-multiplexed connection");

          591
          
		logit("Falling back to non-multiplexed connection");

        

        

          588
          
		xfree(options.control_path);

          592
          
		xfree(options.control_path);

        



(-)a/readconf.c
      (+2 lines)




  

    
      
            Lines 850-855
          parse_int:
      
      
        Link Here
      
    
  

        

          850
          
			value = SSHCTL_MASTER_YES;

          850
          
			value = SSHCTL_MASTER_YES;

        

        

          851
          
		else if (strcmp(arg, "no") == 0 || strcmp(arg, "false") == 0)

          851
          
		else if (strcmp(arg, "no") == 0 || strcmp(arg, "false") == 0)

        

        

          852
          
			value = SSHCTL_MASTER_NO;

          852
          
			value = SSHCTL_MASTER_NO;

        

            

              
              
              853
              
                else if (strcmp(arg, "required") == 0)

            

            

              854
              
                        value = SSHCTL_MASTER_REQUIRED;

            

        

          853
          
		else if (strcmp(arg, "auto") == 0)

          855
          
		else if (strcmp(arg, "auto") == 0)

        

        

          854
          
			value = SSHCTL_MASTER_AUTO;

          856
          
			value = SSHCTL_MASTER_AUTO;

        

        

          855
          
		else if (strcmp(arg, "ask") == 0)

          857
          
		else if (strcmp(arg, "ask") == 0)

        



(-)a/readconf.h
      (-1 / +1 lines)




  

    
      
            Lines 130-135
          typedef struct {
      
      
        Link Here
      
    
  

        

          130
          
#define SSHCTL_MASTER_AUTO	2

          130
          
#define SSHCTL_MASTER_AUTO	2

        

        

          131
          
#define SSHCTL_MASTER_ASK	3

          131
          
#define SSHCTL_MASTER_ASK	3

        

        

          132
          
#define SSHCTL_MASTER_AUTO_ASK	4

          132
          
#define SSHCTL_MASTER_AUTO_ASK	4

        

            

              
              
              133
              
#define SSHCTL_MASTER_REQUIRED  5

            

        

          133
          

          134
          

        

        

          134
          
void     initialize_options(Options *);

          135
          
void     initialize_options(Options *);

        

        

          135
          
void     fill_default_options(Options *);

          136
          
void     fill_default_options(Options *);

        

            

              136
              
- 

              
              
            






  

  Return to bug 1621