diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2006-03-01 15:21:47 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2006-03-01 15:21:47 +0000 |
| commit | 20b37715c9c4daa5b87837fb99ed84ec85e0e65e (patch) | |
| tree | c1f3088fe9fb5375402169c7b318004648c1e4f6 | |
| parent | 9c428b5b97db979514be45030cca235cb1133bc1 (diff) | |
| download | ds-20b37715c9c4daa5b87837fb99ed84ec85e0e65e.tar.gz ds-20b37715c9c4daa5b87837fb99ed84ec85e0e65e.tar.xz ds-20b37715c9c4daa5b87837fb99ed84ec85e0e65e.zip | |
Added admserv-conf-admpw.patch to fix the use of admpw for basic auth in the actual config file
| -rw-r--r-- | ldapserver.spec.tmpl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ldapserver.spec.tmpl b/ldapserver.spec.tmpl index 13af4317..3b1518a0 100644 --- a/ldapserver.spec.tmpl +++ b/ldapserver.spec.tmpl @@ -139,10 +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 +# 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 @@ fi %changelog * Wed Mar 1 2006 Rich Megginson <rmeggins@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@redhat.com> - 1.0.2-1 - Add patch to fix admin server httpd module load order; you |