patch 8.2.0736: some files not recognized as pamenv

Problem:    Some files not recognized as pamenv.
Solution:   Add pam_inv.conf. (closes #6065)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 6d26ea098d80273c2ce01f3966075b1ac3665e11..7157f092b65a9e50f3cbacecd1f07caecd395ded 100644 (file)
--- 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

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 117b5207237db87e3179269e60abab980b357d1f..c881fdedce7cfa4df21f39aa4010c5175e410c8d 100644 (file)
--- 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'],

diff --git a/src/version.c b/src/version.c
index 96ca8898ae6085721684ea88fa8f9d93fc8541c6..7fcef28487652ae1b6abdbb9c477d796a0087b96 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    736,
 /**/
     735,
 /**/