[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.26, 1.27

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18305

Modified Files:
	ldapserver.spec.tmpl 
Log Message:
Added admserv-conf-admpw.patch to fix the use of admpw for basic auth in the actual config file



Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ldapserver.spec.tmpl	1 Mar 2006 14:58:27 -0000	1.26
+++ ldapserver.spec.tmpl	1 Mar 2006 15:21:47 -0000	1.27
@@ -139,10 +139,14 @@
     if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch ] ; then
         patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch > /dev/null 2>&1
     fi
-# patch file to fix use of admpw for basic auth
+# patch file to fix use of admpw for basic auth in the template file
     if [ -f $RPM_INSTALL_PREFIX/setup/admserv-conf-tmpl.patch ] ; then
         patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/admserv-conf-tmpl.patch > /dev/null 2>&1
     fi
+# patch file to fix use of admpw for basic auth in the real config file
+    if [ -f $RPM_INSTALL_PREFIX/setup/admserv-conf-admpw.patch ] ; then
+        patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/admserv-conf-admpw.patch > /dev/null 2>&1
+    fi
 # fix up file permissions
     testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf
     if [ ! -f $testfile ] ; then
@@ -177,7 +181,7 @@
 
 %changelog
 * Wed Mar  1 2006 Rich Megginson <rmeggins at redhat.com> - 1.0.2-1
-- Added admserv-conf-tmpl.patch to fix the use of admpw for basic auth
+- Added admserv-conf-tmpl.patch and admserv-conf-admpw.patch to fix the use of admpw for basic auth
 
 * Wed Feb 22 2006 Rich Megginson <rmeggins at redhat.com> - 1.0.2-1
 - Add patch to fix admin server httpd module load order; you