net-nds/389-admin/files/389-admin-cfgstuff-1.patch

--- 389-admin-1.1.11.rc1.orig/admserv/cfgstuff/httpd-2.2.conf.in
+++ 389-admin-1.1.11.rc1/admserv/cfgstuff/httpd-2.2.conf.in
@@ -143,7 +143,7 @@ LoadModule file_cache_module @moddir@/mo
 LoadModule mem_cache_module @moddir@/mod_mem_cache.so
 LoadModule cgi_module @moddir@/mod_cgi.so
 LoadModule restartd_module     @admmoddir@/mod_restartd.so
-LoadModule nss_module         @nssmoddir@/libmodnss.so
+LoadModule nss_module         @moddir@/mod_nss.so
 LoadModule admserv_module     @admmoddir@/mod_admserv.so
 
 ### Section 2: 'Main' server configuration
@@ -389,15 +389,7 @@ ServerSignature On
 # Alias.
 #
 
-<IfModule mod_cgid.c>
-#
-# Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
-# for setting UNIX socket for communicating with cgid.
-#
-Scriptsock            @piddir@/admin-serv.cgisock
-</IfModule>
-
-# and this one is for mod_restartd because mod_cgid will consume the other one
+# Setup mod_admserv socket handle
 Scriptsock            @piddir@/admin-serv.cgisock
 
 #
--- 389-admin-1.1.11.rc1.orig/admserv/cfgstuff/httpd.conf.in
+++ 389-admin-1.1.11.rc1/admserv/cfgstuff/httpd.conf.in
@@ -142,7 +142,7 @@ LoadModule file_cache_module @moddir@/mo
 LoadModule mem_cache_module @moddir@/mod_mem_cache.so
 LoadModule cgi_module @moddir@/mod_cgi.so
 LoadModule restartd_module     @admmoddir@/mod_restartd.so
-LoadModule nss_module         @nssmoddir@/libmodnss.so
+LoadModule nss_module         @moddir@/mod_nss.so
 LoadModule admserv_module     @admmoddir@/mod_admserv.so
 
 ### Section 2: 'Main' server configuration
@@ -388,15 +388,7 @@ ServerSignature On
 # Alias.
 #
 
-<IfModule mod_cgid.c>
-#
-# Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
-# for setting UNIX socket for communicating with cgid.
-#
-Scriptsock            @piddir@/admin-serv.cgisock
-</IfModule>
-
-# and this one is for mod_restartd because mod_cgid will consume the other one
+# Setup mod_admserv socket handle                                         
 Scriptsock            @piddir@/admin-serv.cgisock
 
 #