From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 11 May 2020 17:46:36 +0000 (+0200)
Subject: patch 8.2.0736: some files not recognized as pamenv
X-Git-Tag: v8.2.0736
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aacc6afdb8cdeb2558e6942dcd65ca0079bec1ee;p=vim

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 6d26ea098..7157f092b 100644
--- 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 117b52072..c881fdedc 100644
--- 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 96ca8898a..7fcef2848 100644
--- 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,
 /**/