Attachment 160765 Details for Bug 250324 – diffs for adminutil

[patch] diffs for adminutil

cvsdiffs (text/plain), 2.92 KB, created by Rich Megginson on 2007-08-06 19:13:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-08-06 19:13:39 UTC

Size: 2.92 KB

patch

obsolete

>Index: adminserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminserver/Makefile.am,v
>retrieving revision 1.29
>diff -u -8 -r1.29 Makefile.am
>--- adminserver/Makefile.am	3 Aug 2007 22:06:59 -0000	1.29
>+++ adminserver/Makefile.am	6 Aug 2007 19:11:08 -0000
>@@ -380,16 +380,19 @@
> # now put it in the canonical form
> LIBPATH = $(subst $(SPACE),$(COLON),$(LIBDIRS))
> # nssmoddir is the same
> runtime_nssmoddir=$(nssmoddir)
> runtime_nss_libdir=$(nss_libdir)
> runtime_ldapsdk_libdir=$(ldapsdk_libdir)
> perlpath=$(perldir)
> endif
>+# this is primarily needed for HP-UX and the other platforms
>+# where we bundle all of the components together
>+adminutilpath=$(datadir)/$(PACKAGE_BASE_NAME)/adminutil
> 
> # The root resource bundle is based on English (en) locale;
> # This bundle must be always distributed and there is no need to have
> # *_en.properties resource bundle source files.
> RESOURCE_BUNDLES_ROOT = \
> 	admserv/cgi-src40/admpw_root.res \
> 	admserv/cgi-src40/security_root.res admserv/cgi-src40/config_root.res \
> 	admserv/cgi-src40/stopsrv_root.res \
>@@ -472,17 +475,18 @@
> 	-e 's,@vendor\@,$(vendor),g' \
> 	-e 's,@helpdir\@,$(helpdir),g' \
> 	-e 's,@mimemagic\@,$(mimemagic),g' \
> 	-e 's,@initdir\@,$(initdir),g' \
> 	-e 's,@perlpath\@,$(perlpath),g' \
> 	-e 's,@perlexec\@,@perlexec@,g' \
> 	-e 's,@infdir\@,$(infdir),g' \
> 	-e 's,@dslibdir\@,$(dslibdir),g' \
>-	-e 's,@ldifdir\@,$(ldifdir),g'
>+	-e 's,@ldifdir\@,$(ldifdir),g' \
>+	-e 's,@adminutilpath\@,$(adminutilpath),g'
> 
> # because the source may be either httpd.conf.in or httpd-2.2.conf.in
> admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC)
> 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
> 	$(fixupcmd) $< > $@
> 
> % : %.in
> 	if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
>Index: adminserver/admserv/cfgstuff/admserv.conf.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf.in,v
>retrieving revision 1.6
>diff -u -8 -r1.6 admserv.conf.in
>--- adminserver/admserv/cfgstuff/admserv.conf.in	1 Aug 2007 18:14:53 -0000	1.6
>+++ adminserver/admserv/cfgstuff/admserv.conf.in	6 Aug 2007 19:11:08 -0000
>@@ -25,16 +25,22 @@
> ADMServerVersionString "@capbrand@-Administrator/@PACKAGE_VERSION@"
> ADMConfigDir "@configdir@"
> 
> ScriptAlias /bin/admin/admin/bin/ "@cgibindir@/"
> ScriptAlias /dist/ "@cgibindir@/"
> ScriptAlias /manual/help/ "@cgibindir@/"
> 
> SetEnv LD_LIBRARY_PATH @LIBPATH@
>+# this is primarily needed for HP-UX and the other platforms
>+# where we bundle all of the components together
>+# so that adminutil can find its property files
>+# In FHS or explicit prefix installs, this is not needed
>+# nor used
>+SetEnv ADMINUTIL_CONF_DIR @adminutilpath@
> 
> # all access is explicitly denied by default in httpd.conf
> # the following Directory directives turn on access for specific
> # directories
> <Directory "@htmldir@/">
>     AllowOverride None
>     Options None
>     Order allow,deny

Actions: View | Diff

Attachments on bug 250324: 160354 | 160376 | 160446 | 160765 | 160767