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

(-)usr.bin/ssh/ssh.c (+8 lines)
Lines 1400-1405 main(int ac, char **av) Link Here
1400 
		options.identity_agent = cp;
 1400 
		options.identity_agent = cp;
1401 
	}
 1401 
	}
1402 

          1402
          

        

            

              
              
              1403
              
	if (options.revoked_host_keys != NULL) {

            

            

              1404
              
		p = tilde_expand_filename(options.revoked_host_keys, getuid());

            

            

              1405
              
		cp = default_client_percent_dollar_expand(p, cinfo);

            

            

              1406
              
		free(p);

            

            

              1407
              
		free(options.revoked_host_keys);

            

            

              1408
              
		options.revoked_host_keys = cp;

            

            

              1409
              
	}

            

            

              1410
              

            

        

          1403
          
	if (options.forward_agent_sock_path != NULL) {

          1411
          
	if (options.forward_agent_sock_path != NULL) {

        

        

          1404
          
		p = tilde_expand_filename(options.forward_agent_sock_path,

          1412
          
		p = tilde_expand_filename(options.forward_agent_sock_path,

        

        

          1405
          
		    getuid());

          1413
          
		    getuid());

        



(-)usr.bin/ssh/ssh_config.5
      (+9 lines)




  

    
      
            Lines 1666-1671
          an OpenSSH Key Revocation List (KRL) as 
      
      
        Link Here
      
    
  

        

          1666
          
.Xr ssh-keygen 1 .

          1666
          
.Xr ssh-keygen 1 .

        

        

          1667
          
For more information on KRLs, see the KEY REVOCATION LISTS section in

          1667
          
For more information on KRLs, see the KEY REVOCATION LISTS section in

        

        

          1668
          
.Xr ssh-keygen 1 .

          1668
          
.Xr ssh-keygen 1 .

        

            

              
              
              1669
              
Arguments to

            

            

              1670
              
.Cm RevokedHostKeys

            

            

              1671
              
may use the tilde syntax to refer to a user's home directory,

            

            

              1672
              
the tokens described in the

            

            

              1673
              
.Sx TOKENS

            

            

              1674
              
section and environment variables as described in the

            

            

              1675
              
.Sx ENVIRONMENT VARIABLES

            

            

              1676
              
section.

            

        

          1669
          
.It Cm SecurityKeyProvider

          1677
          
.It Cm SecurityKeyProvider

        

        

          1670
          
Specifies a path to a library that will be used when loading any

          1678
          
Specifies a path to a library that will be used when loading any

        

        

          1671
          
FIDO authenticator-hosted keys, overriding the default of using

          1679
          
FIDO authenticator-hosted keys, overriding the default of using

        

  

    
      
            Lines 2136-2141
          The local username.
      
      
        Link Here
      
    
  

        

          2136
          
.Cm Match exec ,

          2144
          
.Cm Match exec ,

        

        

          2137
          
.Cm RemoteCommand ,

          2145
          
.Cm RemoteCommand ,

        

        

          2138
          
.Cm RemoteForward ,

          2146
          
.Cm RemoteForward ,

        

            

              
              
              2147
              
.Cm RevokedHostKeys ,

            

        

          2139
          
and

          2148
          
and

        

        

          2140
          
.Cm UserKnownHostsFile

          2149
          
.Cm UserKnownHostsFile

        

        

          2141
          
accept the tokens %%, %C, %d, %h, %i, %k, %L, %l, %n, %p, %r, and %u.

          2150
          
accept the tokens %%, %C, %d, %h, %i, %k, %L, %l, %n, %p, %r, and %u.

        



(-)regress/usr.bin/ssh/percent.sh
      (-1 / +2 lines)




  

    
      
            Lines 61-67
          trial()
      
      
        Link Here
      
    
  

        

          61
          
}

          61
          
}

        

        

          62
          

          62
          

        

        

          63
          
for i in matchexec localcommand remotecommand controlpath identityagent \

          63
          
for i in matchexec localcommand remotecommand controlpath identityagent \

        

          
            

              64
              
    forwardagent localforward remoteforward userknownhostsfile; do


              64
              
    forwardagent localforward remoteforward revokedhostkeys \

            

            

              
              

              65
              
    userknownhostsfile; do

            

        

          65
          
	verbose $tid $i percent

          66
          
	verbose $tid $i percent

        

        

          66
          
	case "$i" in

          67
          
	case "$i" in

        

        

          67
          
	localcommand|userknownhostsfile)

          68
          
	localcommand|userknownhostsfile)

        






  

  Return to bug 3552