Bram Moolenaar wrote the following on 30.09.2011 12:20 Hello David,
>>> Hi,
>>>
>>> I have noticed that the syntax file for SSH config files is a little bit
>>> behind with some new config options that have been introduced with OpenSSH
>>> 5.6.
>>
>> ditto here
>> I have upated it local just yesterday.
>> They (ssh{,d}config.vim) are broken in means of verifying input, too.
>> See e.g. ssh_config(5) on my system:
>>
>> ,----[ ssh_config(5) ]--------
>>
>> The possible keywords and their meanings are as follows (note
>> that keywords are case-insensitive and arguments are case-sensi‐
>> tive):
>>
>> `---------------------------------------------
>>
>> ..same for sshd_config(5). I have therefor aplied the needed "syn case
>> {match,ignore} in there.
>> Additionally i much prefer to have only one keyword per line. This
>> mucho grande eases the pain of maintenance. The attached patches are
>> therefore rather great. sorry.
>
> Did you send this to the maintainer?
i have updated ssh{,d}config.vim with some missing keywords and also added
"syn case {match,ignore}" according to the manpage see above.
It would be nice to see them updated in vim runtime files.
Thank you.
Regards,
--
bye Thilo
4096R/0xC70B1A8F
721B 1BA0 095C 1ABA 3FC6 7C18 89A4 A2A0 C70B 1A8F
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
sshconfig.vim
Description: application/wine-extension-vim
--- sshconfig.vim.orig 2011-05-15 11:50:48.000000000 +0000 +++ sshconfig.vim 2011-09-30 18:27:58.000000000 +0000 @@ -1,7 +1,10 @@ " Vim syntax file -" Language: OpenSSH client configuration file (ssh_config) -" Maintainer: David Necas (Yeti) <[email protected]> -" Last Change: 2009-07-09 +" Language: OpenSSH client configuration file (ssh_config) +" Maintainer: David Necas (Yeti) <[email protected]> +" Modified By: Thilo Six +" Originally: 2009-07-09 +" Last Change: 2011 Sep 30 +" " Setup if version >= 600 @@ -18,23 +21,29 @@ set iskeyword=_,-,a-z,A-Z,48-57 endif -syn case ignore + +" case on +syn case match + " Comments -syn match sshconfigComment "#.*$" contains=sshconfigTodo -syn keyword sshconfigTodo TODO FIXME NOT contained +syn match sshconfigComment "^#.*$" contains=sshconfigTodo +syn match sshconfigComment "\s#.*$" contains=sshconfigTodo + +syn keyword sshconfigTodo TODO FIXME NOTE contained + " Constants syn keyword sshconfigYesNo yes no ask syn keyword sshconfigYesNo any auto -syn keyword sshconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc -syn keyword sshconfigCipher aes192-cbc aes256-cbc aes128-ctr aes256-ctr +syn keyword sshconfigCipher 3des aes128-cbc 3des-cbc blowfish-cbc cast128-cbc +syn keyword sshconfigCipher aes192-cbc aes256-cbc aes128-ctr aes192-ctr aes256-ctr syn keyword sshconfigCipher arcfour arcfour128 arcfour256 cast128-cbc syn keyword sshconfigMAC hmac-md5 hmac-sha1 hmac-ripemd160 hmac-sha1-96 syn keyword sshconfigMAC hmac-md5-96 syn match sshconfigMAC "\<umac-64@openssh\.com\>" syn keyword sshconfigHostKeyAlg ssh-rsa ssh-dss -syn keyword sshconfigPreferredAuth hostbased publickey password +syn keyword sshconfigPreferredAuth hostbased publickey password gssapi-with-mic syn keyword sshconfigPreferredAuth keyboard-interactive syn keyword sshconfigLogLevel QUIET FATAL ERROR INFO VERBOSE syn keyword sshconfigLogLevel DEBUG DEBUG1 DEBUG2 DEBUG3 @@ -47,41 +56,85 @@ syn match sshconfigHostPort "\<\([-a-zA-Z0-9]\+\.\)\+[-a-zA-Z0-9]\{2,}\(:\d\+\)\?\>" syn match sshconfigHostPort "\<\(\x\{,4}:\)\+\x\{,4}[:/]\d\+\>" + +" case off +syn case ignore + + " Keywords syn keyword sshconfigHostSect Host + syn keyword sshconfigKeyword AddressFamily -syn keyword sshconfigKeyword BatchMode BindAddress -syn keyword sshconfigKeyword ChallengeResponseAuthentication CheckHostIP -syn keyword sshconfigKeyword Cipher Ciphers ClearAllForwardings -syn keyword sshconfigKeyword Compression CompressionLevel ConnectTimeout -syn keyword sshconfigKeyword ConnectionAttempts ControlMaster -syn keyword sshconfigKeyword ControlPath DynamicForward -syn keyword sshconfigKeyword EnableSSHKeysign EscapeChar ExitOnForwardFailure -syn keyword sshconfigKeyword ForwardAgent ForwardX11 +syn keyword sshconfigKeyword BatchMode +syn keyword sshconfigKeyword BindAddress +syn keyword sshconfigKeyword ChallengeResponseAuthentication +syn keyword sshconfigKeyword CheckHostIP +syn keyword sshconfigKeyword Cipher +syn keyword sshconfigKeyword Ciphers +syn keyword sshconfigKeyword ClearAllForwardings +syn keyword sshconfigKeyword Compression +syn keyword sshconfigKeyword CompressionLevel +syn keyword sshconfigKeyword ConnectTimeout +syn keyword sshconfigKeyword ConnectionAttempts +syn keyword sshconfigKeyword ControlMaster +syn keyword sshconfigKeyword ControlPath +syn keyword sshconfigKeyword DynamicForward +syn keyword sshconfigKeyword EnableSSHKeysign +syn keyword sshconfigKeyword EscapeChar +syn keyword sshconfigKeyword ExitOnForwardFailure +syn keyword sshconfigKeyword ForwardAgent +syn keyword sshconfigKeyword ForwardX11 syn keyword sshconfigKeyword ForwardX11Trusted syn keyword sshconfigKeyword GSSAPIAuthentication -syn keyword sshconfigKeyword GSSAPIDelegateCredentials GatewayPorts +syn keyword sshconfigKeyword GSSAPIClientIdentity +syn keyword sshconfigKeyword GSSAPIDelegateCredentials +syn keyword sshconfigKeyword GSSAPIKeyExchange +syn keyword sshconfigKeyword GSSAPIRenewalForcesRekey +syn keyword sshconfigKeyword GSSAPITrustDNS +syn keyword sshconfigKeyword GSSAPITrustDns +syn keyword sshconfigKeyword GatewayPorts syn keyword sshconfigKeyword GlobalKnownHostsFile -syn keyword sshconfigKeyword HostKeyAlgorithms HashKnownHosts -syn keyword sshconfigKeyword HostKeyAlias HostName HostbasedAuthentication -syn keyword sshconfigKeyword IdentitiesOnly IdentityFile -syn keyword sshconfigKeyword KbdInteractiveAuthentication KbdInteractiveDevices -syn keyword sshconfigKeyword LocalCommand LocalForward LogLevel +syn keyword sshconfigKeyword HashKnownHosts +syn keyword sshconfigKeyword HostKeyAlgorithms +syn keyword sshconfigKeyword HostKeyAlias +syn keyword sshconfigKeyword HostName +syn keyword sshconfigKeyword HostbasedAuthentication +syn keyword sshconfigKeyword IdentitiesOnly +syn keyword sshconfigKeyword IdentityFile +syn keyword sshconfigKeyword KbdInteractiveAuthentication +syn keyword sshconfigKeyword KbdInteractiveDevices +syn keyword sshconfigKeyword LocalCommand +syn keyword sshconfigKeyword LocalForward +syn keyword sshconfigKeyword LogLevel syn keyword sshconfigKeyword MACs syn keyword sshconfigKeyword NoHostAuthenticationForLocalhost syn keyword sshconfigKeyword NumberOfPasswordPrompts -syn keyword sshconfigKeyword PasswordAuthentication PermitLocalCommand -syn keyword sshconfigKeyword Port PreferredAuthentications Protocol -syn keyword sshconfigKeyword ProxyCommand PubkeyAuthentication +syn keyword sshconfigKeyword PKCS11Provider +syn keyword sshconfigKeyword PasswordAuthentication syn keyword sshconfigKeyword PermitLocalCommand -syn keyword sshconfigKeyword RSAAuthentication RemoteForward RekeyLimit +syn keyword sshconfigKeyword Port +syn keyword sshconfigKeyword PreferredAuthentications +syn keyword sshconfigKeyword Protocol +syn keyword sshconfigKeyword ProxyCommand +syn keyword sshconfigKeyword PubkeyAuthentication +syn keyword sshconfigKeyword RSAAuthentication +syn keyword sshconfigKeyword RekeyLimit +syn keyword sshconfigKeyword RemoteForward syn keyword sshconfigKeyword RhostsRSAAuthentication -syn keyword sshconfigKeyword SendEnv ServerAliveCountMax ServerAliveInterval -syn keyword sshconfigKeyword SmartcardDevice StrictHostKeyChecking -syn keyword sshconfigKeyword Tunnel TunnelDevice -syn keyword sshconfigKeyword TCPKeepAlive UsePrivilegedPort User +syn keyword sshconfigKeyword SendEnv +syn keyword sshconfigKeyword ServerAliveCountMax +syn keyword sshconfigKeyword ServerAliveInterval +syn keyword sshconfigKeyword SmartcardDevice +syn keyword sshconfigKeyword StrictHostKeyChecking +syn keyword sshconfigKeyword TCPKeepAlive +syn keyword sshconfigKeyword Tunnel +syn keyword sshconfigKeyword TunnelDevice +syn keyword sshconfigKeyword UseBlacklistedKeys +syn keyword sshconfigKeyword UsePrivilegedPort +syn keyword sshconfigKeyword User syn keyword sshconfigKeyword UserKnownHostsFile -syn keyword sshconfigKeyword VerifyHostKeyDNS VisualHostKey +syn keyword sshconfigKeyword VerifyHostKeyDNS +syn keyword sshconfigKeyword VisualHostKey syn keyword sshconfigKeyword XAuthLocation " Define the default highlighting @@ -114,3 +167,5 @@ endif let b:current_syntax = "sshconfig" + +" vim:set ts=8 sw=2 sts=2:
sshdconfig.vim
Description: application/wine-extension-vim
--- sshdconfig.vim.orig 2011-05-15 11:50:48.000000000 +0000 +++ sshdconfig.vim 2011-09-30 18:27:39.000000000 +0000 @@ -1,7 +1,10 @@ " Vim syntax file -" Language: OpenSSH server configuration file (sshd_config) -" Maintainer: David Necas (Yeti) <[email protected]> -" Last Change: 2009-07-09 +" Language: OpenSSH server configuration file (sshd_config) +" Maintainer: David Necas (Yeti) <[email protected]> +" Modified By: Thilo Six +" Originally: 2009-07-09 +" Last Change: 2011 Sep 30 +" " Setup if version >= 600 @@ -18,17 +21,22 @@ set iskeyword=_,-,a-z,A-Z,48-57 endif -syn case ignore + +" case on +syn case match + " Comments -syn match sshdconfigComment "#.*$" contains=sshdconfigTodo -syn keyword sshdconfigTodo TODO FIXME NOT contained +syn match sshdconfigComment "^#.*$" contains=sshdconfigTodo +syn match sshdconfigComment "\s#.*$" contains=sshdconfigTodo + +syn keyword sshdconfigTodo TODO FIXME NOTE contained " Constants syn keyword sshdconfigYesNo yes no none syn keyword sshdconfigAddressFamily any inet inet6 syn keyword sshdconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc -syn keyword sshdconfigCipher aes192-cbc aes256-cbc aes128-ctr aes256-ctr +syn keyword sshdconfigCipher aes192-cbc aes256-cbc aes128-ctr aes192-ctr aes256-ctr syn keyword sshdconfigCipher arcfour arcfour128 arcfour256 cast128-cbc syn keyword sshdconfigMAC hmac-md5 hmac-sha1 hmac-ripemd160 hmac-sha1-96 syn keyword sshdconfigMAC hmac-md5-96 @@ -46,38 +54,89 @@ syn match sshdconfigHostPort "\<\(\x\{,4}:\)\+\x\{,4}:\d\+\>" syn match sshdconfigTime "\<\(\d\+[sSmMhHdDwW]\)\+\>" + +" case off +syn case ignore + + " Keywords syn keyword sshdconfigMatch Host User Group Address -syn keyword sshdconfigKeyword AcceptEnv AddressFamily AllowAgentForwarding -syn keyword sshdconfigKeyword AllowGroups AllowTcpForwarding -syn keyword sshdconfigKeyword AllowUsers AuthorizedKeysFile + +syn keyword sshdconfigKeyword AcceptEnv +syn keyword sshdconfigKeyword AddressFamily +syn keyword sshdconfigKeyword AllowAgentForwarding +syn keyword sshdconfigKeyword AllowGroups +syn keyword sshdconfigKeyword AllowTcpForwarding +syn keyword sshdconfigKeyword AllowUsers +syn keyword sshdconfigKeyword AuthorizedKeysFile syn keyword sshdconfigKeyword Banner -syn keyword sshdconfigKeyword ChallengeResponseAuthentication ChrootDirectory -syn keyword sshdconfigKeyword Ciphers ClientAliveCountMax -syn keyword sshdconfigKeyword ClientAliveInterval Compression -syn keyword sshdconfigKeyword DenyGroups DenyUsers +syn keyword sshdconfigKeyword ChallengeResponseAuthentication +syn keyword sshdconfigKeyword ChrootDirectory +syn keyword sshdconfigKeyword Ciphers +syn keyword sshdconfigKeyword ClientAliveCountMax +syn keyword sshdconfigKeyword ClientAliveInterval +syn keyword sshdconfigKeyword Compression +syn keyword sshdconfigKeyword DebianBanner +syn keyword sshdconfigKeyword DenyGroups +syn keyword sshdconfigKeyword DenyUsers syn keyword sshdconfigKeyword ForceCommand -syn keyword sshdconfigKeyword GatewayPorts GSSAPIAuthentication +syn keyword sshdconfigKeyword GSSAPIAuthentication syn keyword sshdconfigKeyword GSSAPICleanupCredentials -syn keyword sshdconfigKeyword HostbasedAuthentication HostKey -syn keyword sshdconfigKeyword IgnoreRhosts IgnoreUserKnownHosts -syn keyword sshdconfigKeyword KerberosAuthentication KerberosGetAFSToken -syn keyword sshdconfigKeyword KerberosOrLocalPasswd KerberosTicketCleanup +syn keyword sshdconfigKeyword GSSAPIKeyExchange +syn keyword sshdconfigKeyword GSSAPIStoreCredentialsOnRekey +syn keyword sshdconfigKeyword GSSAPIStrictAcceptorCheck +syn keyword sshdconfigKeyword GatewayPorts +syn keyword sshdconfigKeyword HostCertificate +syn keyword sshdconfigKeyword HostKey +syn keyword sshdconfigKeyword HostbasedAuthentication +syn keyword sshdconfigKeyword HostbasedUsesNameFromPacketOnly +syn keyword sshdconfigKeyword IgnoreRhosts +syn keyword sshdconfigKeyword IgnoreUserKnownHosts +syn keyword sshdconfigKeyword KerberosAuthentication +syn keyword sshdconfigKeyword KerberosGetAFSToken +syn keyword sshdconfigKeyword KerberosOrLocalPasswd +syn keyword sshdconfigKeyword KerberosTicketCleanup syn keyword sshdconfigKeyword KeyRegenerationInterval -syn keyword sshdconfigKeyword ListenAddress LoginGraceTime LogLevel -syn keyword sshdconfigKeyword MACs Match MaxAuthTries MaxSessions MaxStartups -syn keyword sshdconfigKeyword PasswordAuthentication PermitEmptyPasswords -syn keyword sshdconfigKeyword PermitRootLogin PermitOpen PermitTunnel -syn keyword sshdconfigKeyword PermitUserEnvironment PidFile Port -syn keyword sshdconfigKeyword PrintLastLog PrintMotd Protocol +syn keyword sshdconfigKeyword ListenAddress +syn keyword sshdconfigKeyword LogLevel +syn keyword sshdconfigKeyword LoginGraceTime +syn keyword sshdconfigKeyword MACs +syn keyword sshdconfigKeyword Match +syn keyword sshdconfigKeyword MaxAuthTries +syn keyword sshdconfigKeyword MaxSessions +syn keyword sshdconfigKeyword MaxStartups +syn keyword sshdconfigKeyword PasswordAuthentication +syn keyword sshdconfigKeyword PermitBlacklistedKeys +syn keyword sshdconfigKeyword PermitEmptyPasswords +syn keyword sshdconfigKeyword PermitOpen +syn keyword sshdconfigKeyword PermitRootLogin +syn keyword sshdconfigKeyword PermitTunnel +syn keyword sshdconfigKeyword PermitUserEnvironment +syn keyword sshdconfigKeyword PidFile +syn keyword sshdconfigKeyword Port +syn keyword sshdconfigKeyword PrintLastLog +syn keyword sshdconfigKeyword PrintMotd +syn keyword sshdconfigKeyword Protocol syn keyword sshdconfigKeyword PubkeyAuthentication -syn keyword sshdconfigKeyword RhostsRSAAuthentication RSAAuthentication -syn keyword sshdconfigKeyword ServerKeyBits ShowPatchLevel StrictModes -syn keyword sshdconfigKeyword Subsystem SyslogFacility +syn keyword sshdconfigKeyword RSAAuthentication +syn keyword sshdconfigKeyword RevokedKeys +syn keyword sshdconfigKeyword RhostsRSAAuthentication +syn keyword sshdconfigKeyword ServerKeyBits +syn keyword sshdconfigKeyword ShowPatchLevel +syn keyword sshdconfigKeyword StrictModes +syn keyword sshdconfigKeyword Subsystem +syn keyword sshdconfigKeyword SyslogFacility syn keyword sshdconfigKeyword TCPKeepAlive -syn keyword sshdconfigKeyword UseDNS UseLogin UsePAM UsePrivilegeSeparation -syn keyword sshdconfigKeyword X11DisplayOffset X11Forwarding -syn keyword sshdconfigKeyword X11UseLocalhost XAuthLocation +syn keyword sshdconfigKeyword TrustedUserCAKeys +syn keyword sshdconfigKeyword UseDNS +syn keyword sshdconfigKeyword UseLogin +syn keyword sshdconfigKeyword UsePAM +syn keyword sshdconfigKeyword UsePrivilegeSeparation +syn keyword sshdconfigKeyword X11DisplayOffset +syn keyword sshdconfigKeyword X11Forwarding +syn keyword sshdconfigKeyword X11UseLocalhost +syn keyword sshdconfigKeyword XAuthLocation + " Define the default highlighting if version >= 508 || !exists("did_sshdconfig_syntax_inits") @@ -109,3 +168,5 @@ endif let b:current_syntax = "sshdconfig" + +" vim:set ts=8 sw=2 sts=2:
