changeset 20361:4bb526ae0989 v8.2.0736

patch 8.2.0736: some files not recognized as pamenv Commit: https://github.com/vim/vim/commit/aacc6afdb8cdeb2558e6942dcd65ca0079bec1ee Author: Bram Moolenaar <Bram@vim.org> Date: Mon May 11 19:46:36 2020 +0200 patch 8.2.0736: some files not recognized as pamenv Problem: Some files not recognized as pamenv. Solution: Add pam_inv.conf. (closes https://github.com/vim/vim/issues/6065)
author Bram Moolenaar <Bram@vim.org>
date Mon, 11 May 2020 20:00:04 +0200
parents 0af966ee7337
children 56a7fdb97a5d
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1134,7 +1134,7 @@ au BufNewFile,BufRead pf.conf			setf pf
 au BufNewFile,BufRead */etc/pam.conf		setf pamconf
 
 " Pam environment
-au BufNewFile,BufRead .pam_environment		setf pamenv
+au BufNewFile,BufRead pam_env.conf,.pam_environment	setf pamenv
 
 " PApp
 au BufNewFile,BufRead *.papp,*.pxml,*.pxsl	setf papp
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -322,7 +322,7 @@ let s:filename_checks = {
     \ 'openroad': ['file.or'],
     \ 'ora': ['file.ora'],
     \ 'pamconf': ['/etc/pam.conf'],
-    \ 'pamenv': ['/home/user/.pam_environment'],
+    \ 'pamenv': ['/etc/security/pam_env.conf', '/home/user/.pam_environment'],
     \ 'papp': ['file.papp', 'file.pxml', 'file.pxsl'],
     \ 'pascal': ['file.pas', 'file.dpr'],
     \ 'passwd': ['any/etc/passwd', 'any/etc/passwd-', 'any/etc/passwd.edit', 'any/etc/shadow', 'any/etc/shadow-', 'any/etc/shadow.edit', 'any/var/backups/passwd.bak', 'any/var/backups/shadow.bak'],
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    736,
+/**/
     735,
 /**/
     734,