From 7dabd7fd841a2781b00d709cdfdf443238714d69 Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Aug 04 2016 23:33:17 +0000
Subject: Bug 1236635 - 389-admin TPS srpmtest failure


Bug Description: In case configure is repeated with rpm -U and
*.rpmnew files are generated, configure fails with the error:
  Could not find the mod_nss pass phrase helper /nss_pcache

Fix Description: NSSPassPhraseHelper should avoid files unless
the file name ends with ".conf".

---

diff --git a/m4/mod_nss.m4 b/m4/mod_nss.m4
index 7a228c6..294bf59 100644
--- a/m4/mod_nss.m4
+++ b/m4/mod_nss.m4
@@ -54,7 +54,7 @@ AC_MSG_RESULT(no))
 if test -z "$modnssbindir" ; then
     nsspcache=`grep NSSPassPhraseHelper $httpdconf|awk '{print $2}'`
     if test -z "$nsspcache" ; then
-        nsspcache=`grep NSSPassPhraseHelper $httpd_root/conf.d/* | awk '{print $2}'`
+        nsspcache=`grep NSSPassPhraseHelper $httpd_root/conf.d/*.conf | awk '{print $2}'`
     fi
     if test -z "$nsspcache" ; then
         # same directory as Apache?