summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorunknown <unknown@redhat.com>2006-03-01 15:21:49 +0000
committerunknown <unknown@redhat.com>2006-03-01 15:21:49 +0000
commita7499423ad7a6f81ef8f79081bd5e33a694af41b (patch)
tree7a08cadbbd31cabb12daf2c735c43d11d4f24b4d
parent0402bb5e22f9c422ce2942d0c07735aee76fe1f4 (diff)
parent20b37715c9c4daa5b87837fb99ed84ec85e0e65e (diff)
downloadds-a7499423ad7a6f81ef8f79081bd5e33a694af41b.tar.gz
ds-a7499423ad7a6f81ef8f79081bd5e33a694af41b.tar.xz
ds-a7499423ad7a6f81ef8f79081bd5e33a694af41b.zip
This commit was manufactured by cvs2git to create tagFedoraDirSvr_20060223_RTC
'FedoraDirSvr_20060223_RTC'.
-rw-r--r--ldapserver.spec.tmpl11
1 files changed, 11 insertions, 0 deletions
diff --git a/ldapserver.spec.tmpl b/ldapserver.spec.tmpl
index 7b7b643c..3b1518a0 100644
--- a/ldapserver.spec.tmpl
+++ b/ldapserver.spec.tmpl
@@ -139,6 +139,14 @@ if [ "$1" -gt 1 ] ; then
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 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
@@ -172,6 +180,9 @@ if [ "$1" = 0 ] ; then
fi
%changelog
+* Wed Mar 1 2006 Rich Megginson <rmeggins@redhat.com> - 1.0.2-1
+- 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@redhat.com> - 1.0.2-1
- Add patch to fix admin server httpd module load order; you
- must now run setup after an upgrade; copy in the new 00core.ldif