View | Details | Raw Unified | Return to bug 1856 | Differences between
and this patch

Collapse All | Expand All

(-)readconf.c (-2 / +2 lines)
Lines 1312-1320 fill_default_options(Options * options) Link Here
1312 
	if (options->zero_knowledge_password_authentication == -1)
 1312 
	if (options->zero_knowledge_password_authentication == -1)
1313 
		options->zero_knowledge_password_authentication = 0;
 1313 
		options->zero_knowledge_password_authentication = 0;
1314 
	if (options->ip_qos_interactive == -1)
 1314 
	if (options->ip_qos_interactive == -1)
1315 
		options->ip_qos_interactive = IPTOS_LOWDELAY;
 1315 
		options->ip_qos_interactive = IPTOS_DSCP_AF21;
1316 
	if (options->ip_qos_bulk == -1)
 1316 
	if (options->ip_qos_bulk == -1)
1317 
		options->ip_qos_bulk = IPTOS_THROUGHPUT;
 1317 
		options->ip_qos_bulk = IPTOS_DSCP_AF11;
1318 
	/* options->local_command should not be set by default */
 1318 
	/* options->local_command should not be set by default */
1319 
	/* options->proxy_command should not be set by default */
 1319 
	/* options->proxy_command should not be set by default */
1320 
	/* options->user will be set in the main program if appropriate */
 1320 
	/* options->user will be set in the main program if appropriate */
(-)servconf.c (-2 / +2 lines)
Lines 278-286 fill_default_server_options(ServerOption Link Here
278 
	if (options->zero_knowledge_password_authentication == -1)
 278 
	if (options->zero_knowledge_password_authentication == -1)
279 
		options->zero_knowledge_password_authentication = 0;
 279 
		options->zero_knowledge_password_authentication = 0;
280 
	if (options->ip_qos_interactive == -1)
 280 
	if (options->ip_qos_interactive == -1)
281 
		options->ip_qos_interactive = IPTOS_LOWDELAY;
 281 
		options->ip_qos_interactive = IPTOS_DSCP_AF21;
282 
	if (options->ip_qos_bulk == -1)
 282 
	if (options->ip_qos_bulk == -1)
283 
		options->ip_qos_bulk = IPTOS_THROUGHPUT;
 283 
		options->ip_qos_bulk = IPTOS_DSCP_AF11;
284 

          284
          

        

        

          285
          
	/* Turn privilege separation on by default */

          285
          
	/* Turn privilege separation on by default */

        

        

          286
          
	if (use_privsep == -1)

          286
          
	if (use_privsep == -1)

        



(-)ssh_config
      (+1 lines)




  

    
      
            Lines 45-47
          
      
      
        Link Here
      
    
  

        

          45
          
#   PermitLocalCommand no

          45
          
#   PermitLocalCommand no

        

        

          46
          
#   VisualHostKey no

          46
          
#   VisualHostKey no

        

        

          47
          
#   ProxyCommand ssh -q -W %h:%p gateway.example.com

          47
          
#   ProxyCommand ssh -q -W %h:%p gateway.example.com

        

            

              
              
              48
              
#   IPQoS AF21 AF11

            



(-)ssh_config.5
      (-2 / +2 lines)




  

    
      
            Lines 662-670
          If one argument is specified, it is used
      
      
        Link Here
      
    
  

        

          662
          
If two values are specified, the first is automatically selected for

          662
          
If two values are specified, the first is automatically selected for

        

        

          663
          
interactive sessions and the second for non-interactive sessions.

          663
          
interactive sessions and the second for non-interactive sessions.

        

        

          664
          
The default is

          664
          
The default is

        

          
            

              665
              
.Dq lowdelay


              665
              
.Dq af21

            

        

          666
          
for interactive sessions and

          666
          
for interactive sessions and

        

          
            

              667
              
.Dq throughput


              667
              
.Dq af11

            

        

          668
          
for non-interactive sessions.

          668
          
for non-interactive sessions.

        

        

          669
          
.It Cm KbdInteractiveAuthentication

          669
          
.It Cm KbdInteractiveAuthentication

        

        

          670
          
Specifies whether to use keyboard-interactive authentication.

          670
          
Specifies whether to use keyboard-interactive authentication.

        



(-)sshd_config
      (+3 lines)




  

    
      
            Lines 108-113
          
      
      
        Link Here
      
    
  

        

          108
          
# no default banner path

          108
          
# no default banner path

        

        

          109
          
#Banner none

          109
          
#Banner none

        

        

          110
          

          110
          

        

            

              
              
              111
              
# operate in DSCP (RFC-4594) environment

            

            

              112
              
#IPQoS AF21 AF11

            

            

              113
              

            

        

          111
          
# override default of no subsystems

          114
          
# override default of no subsystems

        

        

          112
          
Subsystem	sftp	/usr/libexec/sftp-server

          115
          
Subsystem	sftp	/usr/libexec/sftp-server

        

        

          113
          

          116
          

        



(-)sshd_config.5
      (-2 / +2 lines)




  

    
      
            Lines 545-553
          If one argument is specified, it is used
      
      
        Link Here
      
    
  

        

          545
          
If two values are specified, the first is automatically selected for

          545
          
If two values are specified, the first is automatically selected for

        

        

          546
          
interactive sessions and the second for non-interactive sessions.

          546
          
interactive sessions and the second for non-interactive sessions.

        

        

          547
          
The default is

          547
          
The default is

        

          
            

              548
              
.Dq lowdelay


              548
              
.Dq af21

            

        

          549
          
for interactive sessions and

          549
          
for interactive sessions and

        

          
            

              550
              
.Dq throughput


              550
              
.Dq af11

            

        

          551
          
for non-interactive sessions.

          551
          
for non-interactive sessions.

        

        

          552
          
.It Cm KerberosAuthentication

          552
          
.It Cm KerberosAuthentication

        

        

          553
          
Specifies whether the password provided by the user for

          553
          
Specifies whether the password provided by the user for

        






  

  Return to bug 1856