Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11725
Modified Files:
admserv.conf.in
Log Message:
Resolves: bug 480869
Bug Description: DS console: Can not delete DS instance
Reviewed by: nkinder (Thanks!)
Fix Description: Enabling the password pipe breaks the other tasks - so the real solution
is to enable the password pipe only for the remove task, and leave it disabled for the
other tasks.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: admserv.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- admserv.conf.in 21 Jan 2009 21:27:04 -0000 1.12
+++ admserv.conf.in 22 Jan 2009 22:03:01 -0000 1.13
@@ -119,7 +119,22 @@
# Handle Stop, Start, Restart, Instance Creation - invoke mod_restartd
# need to add instance creation because you may want to create an instance
# of DS on a low port, and instance creation starts the instance as well
-<LocationMatch
/*/[tT]asks/[Oo]peration/(?i:stop|start|restart|startconfigds|create|remove)$>
+<LocationMatch
/*/[tT]asks/[Oo]peration/(?i:stop|start|restart|startconfigds|create)$>
+ AuthUserFile @configdir@/admpw
+ AuthType basic
+ AuthName "Admin Server"
+ Require valid-user
+## turn off the password pipe when using mod_restartd
+ AdminSDK off
+ ADMCgiBinDir @cgibindir@
+ Options +ExecCGI
+ RetainPerms on
+ Order allow,deny
+ Allow from all
+</LocationMatch>
+
+# special case for the remove task - it needs to use the password pipe
+<LocationMatch /*/[tT]asks/[Oo]peration/(?i:remove)$>
AuthUserFile @configdir@/admpw
AuthType basic
AuthName "Admin Server"
Show replies by date