May 2007 - 389-commits - Fedora Mailing-Lists

[Fedora-directory-commits] adminserver Makefile.am, 1.1, 1.2 Makefile.in, 1.1, 1.2 aclocal.m4, 1.1, 1.2 configure, 1.1, 1.2 configure.ac, 1.1, 1.2 ltmain.sh, 1.1, 1.2

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24035/adminserver Modified Files: Makefile.am Makefile.in aclocal.m4 configure configure.ac ltmain.sh Log Message: Resolves: bug 239502 Description: adminserver: autotools, FHS, and many bug fixes Fix Description: Many more changes to make admin server more FHS friendly Allow all hardcoded paths to writable directories to be overridden by environment variables Integrate mod_admserv and mod_restartd Allow Admin Server to use Fortitude or standalone mod_nss Better httpd detection and support Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.am 9 May 2007 00:26:29 -0000 1.1 +++ Makefile.am 11 May 2007 19:44:04 -0000 1.2 @@ -20,26 +20,26 @@ NULLSTRING := SPACE := $(NULLSTRING) # the space is between the ) and the # COLON := $(NULLSTRING):# a colon +define NL +\\n +endef # look for included m4 files in the ./m4/ directory ACLOCAL_AMFLAGS = -I m4 -#SUBDIRS = mod_admserv mod_restartd -# however, because the makefiles for the modules ignore a destdir passed -# in to make install, we just skip install for the subdirs . . . -# install-recursive : override SUBDIRS= -# install-exec-recursive : override SUBDIRS= -# # . . . and instead install them ourselves -# install-exec-hook: all-recursive -# @$(NORMAL_INSTALL) -# test -z "$(moddir)" || $(mkdir_p) "$(DESTDIR)$(moddir)" -# @list='mod_admserv mod_restartd'; for p in $$list; do \ -# for p1 in $$p/.libs/libmod*.* \ -# ; do \ -# echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$p1' '$(DESTDIR)$(moddir)'"; \ -# $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) "$$p1" "$(DESTDIR)$(moddir)" || exit 1; \ -# done ; \ -# done +# passed to the mod subdirs - so they know they are being +# built as part of admin server and not standalone +AM_MAKEFLAGS = ADMINSERVER=1 + +if MOD_ADMSERV + MOD_ADMSERV_SUB = mod_admserv +endif + +if MOD_RESTARTD + MOD_RESTARTD_SUB = mod_restartd +endif + +SUBDIRS = $(MOD_ADMSERV_SUB) $(MOD_RESTARTD_SUB) install-data-hook: @for file in $(RESOURCE_BUNDLES_ROOT) ; do \ @@ -59,14 +59,15 @@ propertydir = $(datadir)@propertydir@ htmldir = $(datadir)@htmldir@ icondir = $(datadir)@icondir@ -configdir = @instconfigdir@/@instancename@ -securitydir = $(configdir) # same as configdir for now httpdconf = @httpdconf@ manualdir = $(datadir)@manualdir@ helpdir = $(manualdir)/help initdir = $(sysconfdir)@initdir@ instconfigdir = @instconfigdir@ instancename = @instancename@ +configdir = $(instconfigdir)/$(instancename) +# same as configdir for now +securitydir = $(configdir) piddir = @piddir@ pidfile = @pidfile@ logdir = $(localstatedir)@logdir@/$(instancename) @@ -74,6 +75,7 @@ httpduser = @httpduser@ modnssbindir = @modnssbindir@ ldifdir = $(datadir)@ldifdir@ +admmoddir = $(libdir)@admmoddir@ libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \ lib/base/system.cpp lib/base/nscputil.cpp @@ -96,9 +98,9 @@ AM_CPPFLAGS +=-DPROPERTYDIR=\"$(propertydir)\" -DLIBDIR=\"$(libdir)\" \ -DPIDDIR=\"$(piddir)\" -DHTMLDIR=\"$(htmldir)\" -DICONDIR=\"$(icondir)\" \ -DCMDBINDIR=\"$(cmdbindir)\" -DMANUALDIR=\"$(manualdir)\" \ - -DCONFIGDIR=\"$(instconfigdir)/$(instancename)\" -DSECURITYDIR=\"$(instconfigdir)/$(instancename)\" \ + -DCONFIGDIR=\"$(configdir)\" -DSECURITYDIR=\"$(securitydir)\" \ -DLOGDIR=\"$(logdir)\" -DHTTPD=\"$(HTTPD)\" -DDEFAULT_HTTPDUSER=\"$(httpduser)\" \ - -DPIDFILE=\"$(PIDFILE)\" -DDATADIR=\"$(datadir)\" + -DPIDFILE=\"$(PIDFILE)\" -DDATADIR=\"$(datadir)\" -DLDIFDIR=\"$(ldifdir)\" lib_LTLIBRARIES = libds-admin-serv.la @@ -115,7 +117,7 @@ statusping viewlog htmladmin sec-activate stopsrv download help cgibin_SCRIPTS = admserv/cgi-src40/Cgi.pm -nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-admin admserv/cfgstuff/stop-admin admserv/cfgstuff/restart-admin +nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin cmdbin_PROGRAMS = ds-admin-config ds-admin-remove ds-admin-update @@ -210,12 +212,13 @@ ICU_GENRB = sh $(srcdir)/admserv/genrb_wrapper.sh @icu_bin@ @icu_libdir@ endif +# need a reverse sort +mysort = $(shell echo -e $(subst $(SPACE),$(NL),$2) | sort $1 --key=1,1 -) + # need to create the LD_LIBRARY_PATH,SHLIB_PATH string to use in scripts # sort also strips out duplicates -TMPLIBDIRS = $(sort $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(adminutil_libdir) $(setuputil_libdir) $(icu_libdir)) -# libdir must come at the end, so remove it from the list if it is already there, -# and add it to the end (e.g. ldapsdk_libdir may already be libdir) -LIBDIRS = $(filter-out $(libdir),$(TMPLIBDIRS)) $(libdir) +LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(adminutil_libdir) $(setuputil_libdir) $(icu_libdir) $(libdir) +LIBDIRS = $(call mysort,-ru,$(LIBDIRLIST)) # now put it in the canonical form LIBPATH = $(subst $(SPACE),$(COLON),$(LIBDIRS)) @@ -266,6 +269,7 @@ -e 's,@propertydir\@,$(propertydir),g' \ -e 's,@htmldir\@,$(htmldir),g' \ -e 's,@icondir\@,$(icondir),g' \ + -e 's,@logdir\@,$(logdir),g' \ -e 's,@manualdir\@,$(manualdir),g' \ -e 's,@configdir\@,$(configdir),g' \ -e 's,@securitydir\@,$(securitydir),g' \ @@ -273,12 +277,22 @@ -e 's,@httpdgroup\@,$(httpdgroup),g' \ -e 's,@piddir\@,$(piddir),g' \ -e 's,@pidfile\@,$(pidfile),g' \ - -e 's,@admservport\@,$(admservport),g' - -e 's,@LIBPATH\@,$(LIBPATH),g' + -e 's,@admservport\@,$(admservport),g' \ + -e 's,@LIBPATH\@,$(LIBPATH),g' \ + -e 's,@nspr_libdir\@,$(nspr_libdir),g' \ + -e 's,@nss_libdir\@,$(nss_libdir),g' \ + -e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \ + -e 's,@adminutil_libdir\@,$(adminutil_libdir),g' \ + -e 's,@setuputil_libdir\@,$(setuputil_libdir),g' \ + -e 's,@icu_libdir\@,$(icu_libdir),g' \ + -e 's,@admmoddir\@,$(admmoddir),g' \ + -e 's,@nssmoddir\@,$(nssmoddir),g' \ + -e 's,@instconfigdir\@,$(instconfigdir),g' \ + -e 's,@instancename\@,$(instancename),g' % : %.in - mkdir -p $(dir $@) - $(fixupcmd) $^ > $@ + if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi + $(fixupcmd) $< > $@ # because the source may be either httpd.conf.in or httpd-2.2.conf.in admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC) Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 9 May 2007 00:26:29 -0000 1.1 +++ Makefile.in 11 May 2007 19:44:04 -0000 1.2 @@ -62,7 +62,8 @@ $(top_srcdir)/m4/httpd.m4 $(top_srcdir)/m4/nspr.m4 \ $(top_srcdir)/m4/nss.m4 $(top_srcdir)/m4/mozldap.m4 \ $(top_srcdir)/m4/icu.m4 $(top_srcdir)/m4/adminutil.m4 \ - $(top_srcdir)/m4/setuputil.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/setuputil.m4 $(top_srcdir)/m4/mod_nss.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -222,6 +223,12 @@ $(start_config_ds_SOURCES) $(statpingserv_SOURCES) \ $(statusping_SOURCES) $(stopsrv_SOURCES) $(ugdsconfig_SOURCES) \ $(viewdata_SOURCES) $(viewlog_SOURCES) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive dist_helpDATA_INSTALL = $(INSTALL_DATA) dist_htmlDATA_INSTALL = $(INSTALL_DATA) dist_iconDATA_INSTALL = $(INSTALL_DATA) @@ -232,6 +239,7 @@ $(ldif_DATA) $(nodist_config_DATA) $(nodist_property_DATA) ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = mod_admserv mod_restartd DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -291,8 +299,13 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MOD_ADMSERV_FALSE = @MOD_ADMSERV_FALSE@ +MOD_ADMSERV_TRUE = @MOD_ADMSERV_TRUE@ +MOD_RESTARTD_FALSE = @MOD_RESTARTD_FALSE@ +MOD_RESTARTD_TRUE = @MOD_RESTARTD_TRUE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ +PACKAGE_BASE_NAME = @PACKAGE_BASE_NAME@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ @@ -301,6 +314,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -317,6 +331,7 @@ adminutil_lib = @adminutil_lib@ adminutil_libdir = @adminutil_libdir@ adminutil_ver = @adminutil_ver@ +admmoddir = $(libdir)@admmoddir@ admservport = @admservport@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ @@ -367,6 +382,7 @@ logdir = $(localstatedir)@logdir@/$(instancename) mandir = @mandir@ manualdir = $(datadir)@manualdir@ +mimemagic = @mimemagic@ mkdir_p = @mkdir_p@ moddir = @moddir@ modnssbindir = @modnssbindir@ @@ -376,6 +392,7 @@ nss_inc = @nss_inc@ nss_lib = @nss_lib@ nss_libdir = @nss_libdir@ +nssmoddir = @nssmoddir@ oldincludedir = @oldincludedir@ piddir = @piddir@ pidfile = @pidfile@ @@ -388,6 +405,7 @@ setuputil_lib = @setuputil_lib@ setuputil_libdir = @setuputil_libdir@ sharedstatedir = @sharedstatedir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @@ -416,10 +434,18 @@ # look for included m4 files in the ./m4/ directory ACLOCAL_AMFLAGS = -I m4 -configdir = @instconfigdir@/@instancename@ -securitydir = $(configdir) # same as configdir for now + +# passed to the mod subdirs - so they know they are being +# built as part of admin server and not standalone +AM_MAKEFLAGS = ADMINSERVER=1 +@MOD_ADMSERV_TRUE@MOD_ADMSERV_SUB = mod_admserv +@MOD_RESTARTD_TRUE@MOD_RESTARTD_SUB = mod_restartd +SUBDIRS = $(MOD_ADMSERV_SUB) $(MOD_RESTARTD_SUB) helpdir = $(manualdir)/help initdir = $(sysconfdir)@initdir@ +configdir = $(instconfigdir)/$(instancename) +# same as configdir for now +securitydir = $(configdir) libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \ lib/base/system.cpp lib/base/nscputil.cpp @@ -436,12 +462,11 @@ -DPROPERTYDIR=\"$(propertydir)\" -DLIBDIR=\"$(libdir)\" \ -DPIDDIR=\"$(piddir)\" -DHTMLDIR=\"$(htmldir)\" \ -DICONDIR=\"$(icondir)\" -DCMDBINDIR=\"$(cmdbindir)\" \ - -DMANUALDIR=\"$(manualdir)\" \ - -DCONFIGDIR=\"$(instconfigdir)/$(instancename)\" \ - -DSECURITYDIR=\"$(instconfigdir)/$(instancename)\" \ - -DLOGDIR=\"$(logdir)\" -DHTTPD=\"$(HTTPD)\" \ - -DDEFAULT_HTTPDUSER=\"$(httpduser)\" -DPIDFILE=\"$(PIDFILE)\" \ - -DDATADIR=\"$(datadir)\" + -DMANUALDIR=\"$(manualdir)\" -DCONFIGDIR=\"$(configdir)\" \ + -DSECURITYDIR=\"$(securitydir)\" -DLOGDIR=\"$(logdir)\" \ + -DHTTPD=\"$(HTTPD)\" -DDEFAULT_HTTPDUSER=\"$(httpduser)\" \ + -DPIDFILE=\"$(PIDFILE)\" -DDATADIR=\"$(datadir)\" \ + -DLDIFDIR=\"$(ldifdir)\" lib_LTLIBRARIES = libds-admin-serv.la DEFAULT_LIBS = libds-admin-serv.la @adminutil_lib@ -ladmsslutil@adminutil_ver@ -ladminutil@adminutil_ver@ \ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 \ @@ -450,7 +475,7 @@ SETUPUTIL_LIBS = @setuputil_lib@ -ldsinstall ldif_DATA = admserv/schema/ldif/admintasks.ldif admserv/schema/ldif/adminglobal.ldif cgibin_SCRIPTS = admserv/cgi-src40/Cgi.pm -nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-admin admserv/cfgstuff/stop-admin admserv/cfgstuff/restart-admin +nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES) # source files for our CGI programs @@ -534,12 +559,13 @@ # Resource Bundle Compiler @WINNT_TRUE@ICU_GENRB = @icu_bin(a)/genrb.exe +# need a reverse sort +mysort = $(shell echo -e $(subst $(SPACE),$(NL),$2) | sort $1 --key=1,1 -) + # need to create the LD_LIBRARY_PATH,SHLIB_PATH string to use in scripts # sort also strips out duplicates -TMPLIBDIRS = $(sort $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(adminutil_libdir) $(setuputil_libdir) $(icu_libdir)) -# libdir must come at the end, so remove it from the list if it is already there, -# and add it to the end (e.g. ldapsdk_libdir may already be libdir) -LIBDIRS = $(filter-out $(libdir),$(TMPLIBDIRS)) $(libdir) +LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(adminutil_libdir) $(setuputil_libdir) $(icu_libdir) $(libdir) +LIBDIRS = $(call mysort,-ru,$(LIBDIRLIST)) # now put it in the canonical form LIBPATH = $(subst $(SPACE),$(COLON),$(LIBDIRS)) @@ -574,6 +600,7 @@ -e 's,@propertydir\@,$(propertydir),g' \ -e 's,@htmldir\@,$(htmldir),g' \ -e 's,@icondir\@,$(icondir),g' \ + -e 's,@logdir\@,$(logdir),g' \ -e 's,@manualdir\@,$(manualdir),g' \ -e 's,@configdir\@,$(configdir),g' \ -e 's,@securitydir\@,$(securitydir),g' \ @@ -581,10 +608,21 @@ -e 's,@httpdgroup\@,$(httpdgroup),g' \ -e 's,@piddir\@,$(piddir),g' \ -e 's,@pidfile\@,$(pidfile),g' \ - -e 's,@admservport\@,$(admservport),g' + -e 's,@admservport\@,$(admservport),g' \ + -e 's,@LIBPATH\@,$(LIBPATH),g' \ + -e 's,@nspr_libdir\@,$(nspr_libdir),g' \ + -e 's,@nss_libdir\@,$(nss_libdir),g' \ + -e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \ + -e 's,@adminutil_libdir\@,$(adminutil_libdir),g' \ + -e 's,@setuputil_libdir\@,$(setuputil_libdir),g' \ + -e 's,@icu_libdir\@,$(icu_libdir),g' \ + -e 's,@admmoddir\@,$(admmoddir),g' \ + -e 's,@nssmoddir\@,$(nssmoddir),g' \ + -e 's,@instconfigdir\@,$(instconfigdir),g' \ + -e 's,@instancename\@,$(instancename),g' all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-am + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: .SUFFIXES: .c .cc .cpp .lo .o .obj @@ -1329,6 +1367,77 @@ rm -f "$(DESTDIR)$(propertydir)/$$f"; \ done +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -1339,10 +1448,23 @@ mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -1355,7 +1477,7 @@ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ @@ -1407,6 +1529,21 @@ || exit 1; \ fi; \ done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -1505,22 +1642,23 @@ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am -check: check-am +check: check-recursive all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \ config.h -installdirs: +installdirs: installdirs-recursive +installdirs-am: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -1547,25 +1685,25 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -clean: clean-am +clean: clean-recursive clean-am: clean-cgibinPROGRAMS clean-cmdbinPROGRAMS clean-generic \ clean-libLTLIBRARIES clean-libtool mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf admserv/cgi-src40/$(DEPDIR) admserv/newinst/src/$(DEPDIR) lib/base/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive -info: info-am +info: info-recursive info-am: @@ -1579,29 +1717,29 @@ install-exec-am: install-libLTLIBRARIES -install-info: install-info-am +install-info: install-info-recursive install-man: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache -rm -rf admserv/cgi-src40/$(DEPDIR) admserv/newinst/src/$(DEPDIR) lib/base/$(DEPDIR) lib/libadmin/$(DEPDIR) lib/libsi18n/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: @@ -1612,14 +1750,17 @@ uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \ uninstall-nodist_propertyDATA -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-cgibinPROGRAMS clean-cmdbinPROGRAMS clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags dist dist-all \ - dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \ - distclean distclean-compile distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-cgibinPROGRAMS \ +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-cgibinPROGRAMS clean-cmdbinPROGRAMS \ + clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-recursive distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-cgibinPROGRAMS \ install-cgibinSCRIPTS install-cmdbinPROGRAMS install-data \ install-data-am install-data-hook install-dist_helpDATA \ install-dist_htmlDATA install-dist_iconDATA install-exec \ @@ -1627,33 +1768,21 @@ install-libLTLIBRARIES install-man \ install-nodist_cmdbinSCRIPTS install-nodist_configDATA \ install-nodist_propertyDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-cgibinPROGRAMS \ - uninstall-cgibinSCRIPTS uninstall-cmdbinPROGRAMS \ - uninstall-dist_helpDATA uninstall-dist_htmlDATA \ - uninstall-dist_iconDATA uninstall-info-am uninstall-ldifDATA \ - uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \ - uninstall-nodist_configDATA uninstall-nodist_propertyDATA - - -#SUBDIRS = mod_admserv mod_restartd -# however, because the makefiles for the modules ignore a destdir passed -# in to make install, we just skip install for the subdirs . . . -# install-recursive : override SUBDIRS= -# install-exec-recursive : override SUBDIRS= -# # . . . and instead install them ourselves -# install-exec-hook: all-recursive -# @$(NORMAL_INSTALL) -# test -z "$(moddir)" || $(mkdir_p) "$(DESTDIR)$(moddir)" -# @list='mod_admserv mod_restartd'; for p in $$list; do \ -# for p1 in $$p/.libs/libmod*.* \ -# ; do \ -# echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) '$$p1' '$(DESTDIR)$(moddir)'"; \ -# $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) "$$p1" "$(DESTDIR)$(moddir)" || exit 1; \ -# done ; \ -# done + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-cgibinPROGRAMS uninstall-cgibinSCRIPTS \ + uninstall-cmdbinPROGRAMS uninstall-dist_helpDATA \ + uninstall-dist_htmlDATA uninstall-dist_iconDATA \ + uninstall-info-am uninstall-ldifDATA uninstall-libLTLIBRARIES \ + uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \ + uninstall-nodist_propertyDATA + +define NL +\\n +endef install-data-hook: @for file in $(RESOURCE_BUNDLES_ROOT) ; do \ @@ -1681,11 +1810,10 @@ %_de.res : %_de.properties $(ICU_GENRB) -s. -d. --encoding 8859-2 --package-name $* $+ - -e 's,@LIBPATH\@,$(LIBPATH),g' % : %.in - mkdir -p $(dir $@) - $(fixupcmd) $^ > $@ + if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi + $(fixupcmd) $< > $@ # because the source may be either httpd.conf.in or httpd-2.2.conf.in admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC) Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/adminserver/aclocal.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- aclocal.m4 9 May 2007 00:26:29 -0000 1.1 +++ aclocal.m4 11 May 2007 19:44:04 -0000 1.2 @@ -1578,10 +1578,27 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -4288,6 +4305,9 @@ # Is the compiler the GNU C compiler? with_gcc=$_LT_AC_TAGVAR(GCC, $1) +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -4421,11 +4441,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) +predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) +postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -4437,7 +4457,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) +compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -4517,7 +4537,7 @@ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -6353,6 +6373,7 @@ done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6385,6 +6406,7 @@ done ]) SED=$lt_cv_path_SED +AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) Index: configure =================================================================== RCS file: /cvs/dirsec/adminserver/configure,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- configure 9 May 2007 00:26:29 -0000 1.1 +++ configure 11 May 2007 19:44:04 -0000 1.2 @@ -466,7 +466,9 @@ #endif" ac_default_prefix=/opt/$PACKAGE_BASE_NAME -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX! XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HTTPD APXS PKG_CONFIG ICU_CONFIG instconfigdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver setuputil_lib setuputil_libdir setuputil_inc setuputil_bin icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpduser httpdgroup logdir piddir pidfile admservport ldifdir WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE LTLIBOBJS' +ac_subdirs_all="$ac_subdirs_all mod_admserv" +ac_subdirs_all="$ac_subdirs_all mod_restartd" +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP! P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HTTPD APXS PKG_CONFIG ICU_CONFIG instconfigdir PACKAGE_BASE_NAME nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver setuputil_lib setuputil_libdir setuputil_inc setuputil_bin icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1064,6 +1066,9 @@ --with-icu-bin=PATH ICU binary directory --with-adminutil=PATH Adminutil directory --with-setuputil=PATH Setuputil directory + --with-modnss-lib=PATH MOD_NSS Apache module directory + --with-modnss-bin=PATH MOD_NSS binary directory + --with-fortitude=PATH Fortitude root directory (default: $default_fortitudedir) --with-instconfigdir=/path Base directory for instance specific writable configuration directories (default @@ -3819,6 +3824,7 @@ done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3853,6 +3859,7 @@ fi SED=$lt_cv_path_SED + echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -4293,7 +4300,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4296 "configure"' > conftest.$ac_ext + echo '#line 4303 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5428,7 +5435,7 @@ # Provide some information about the compiler. -echo "$as_me:5431:" \ +echo "$as_me:5438:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6491,11 +6498,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6494: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6501: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6498: \$? = $ac_status" >&5 + echo "$as_me:6505: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6759,11 +6766,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6762: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6769: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6766: \$? = $ac_status" >&5 + echo "$as_me:6773: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6863,11 +6870,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6866: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6873: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6870: \$? = $ac_status" >&5 + echo "$as_me:6877: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8328,10 +8335,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 8342 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -9208,7 +9236,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9211 "configure" +#line 9239 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9308,7 +9336,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9311 "configure" +#line 9339 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9639,6 +9667,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -9772,11 +9803,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects +predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects +postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -9788,7 +9819,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -9868,7 +9899,7 @@ link_all_deplibs=$link_all_deplibs # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -11648,11 +11679,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11651: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11682: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11655: \$? = $ac_status" >&5 + echo "$as_me:11686: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11752,11 +11783,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11755: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11786: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11759: \$? = $ac_status" >&5 + echo "$as_me:11790: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12284,10 +12315,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 12322 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12671,6 +12723,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_CXX +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -12804,11 +12859,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_CXX +predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_CXX +postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -12820,7 +12875,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -12900,7 +12955,7 @@ link_all_deplibs=$link_all_deplibs_CXX # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -13322,11 +13377,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13325: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13380: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13329: \$? = $ac_status" >&5 + echo "$as_me:13384: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13426,11 +13481,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13429: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13484: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13433: \$? = $ac_status" >&5 + echo "$as_me:13488: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14871,10 +14926,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 14933 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15258,6 +15334,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_F77 +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -15391,11 +15470,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_F77 +predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_F77 +postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -15407,7 +15486,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_F77 +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -15487,7 +15566,7 @@ link_all_deplibs=$link_all_deplibs_F77 # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -15629,11 +15708,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15632: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15711: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15636: \$? = $ac_status" >&5 + echo "$as_me:15715: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15897,11 +15976,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15900: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15979: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15904: \$? = $ac_status" >&5 + echo "$as_me:15983: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16001,11 +16080,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16004: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16083: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16008: \$? = $ac_status" >&5 + echo "$as_me:16087: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17466,10 +17545,31 @@ # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 17552 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17853,6 +17953,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_GCJ +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -17986,11 +18089,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_GCJ +predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_GCJ +postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -18002,7 +18105,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18082,7 +18185,7 @@ link_all_deplibs=$link_all_deplibs_GCJ # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -18334,6 +18437,9 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_RC +gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` +gcc_ver=\`gcc -dumpversion\` + # An ERE matcher. EGREP=$lt_EGREP @@ -18467,11 +18573,11 @@ # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=$lt_predep_objects_RC +predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=$lt_postdep_objects_RC +postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Dependencies to place before the objects being linked to create a # shared library. @@ -18483,7 +18589,7 @@ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_RC +compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18563,7 +18669,7 @@ link_all_deplibs=$link_all_deplibs_RC # Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -23301,7 +23407,7 @@ httpd_conf_rel=`eval echo $httpd_conf_rel` # Server version: Apache/2.2.2 verstr='Server version: Apache/' -httpd_ver=`$HTTPD -v | grep "Server version:" | sed -e s@$verstr@@` +httpd_ver=`$HTTPD -v | grep "Server version:" | sed -e "s,$verstr,,"` case $httpd_ver in 2.2*) APACHE22=1 ;; *) APACHE22= ;; @@ -23309,6 +23415,12 @@ httpdconf=${httpd_root}/${httpd_conf_rel} +mimemagic=`grep MIMEMagicFile $httpdconf|grep -v \^# | awk '{print $2}'` +if ! -f "$mimemagic" ; then +# assume relative to root + mimemagic=${httpd_root}/${mimemagic} +fi + # Extract the first word of "apxs", so it can be a program name with args. set dummy apxs; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -23350,11 +23462,11 @@ fi if test -n "$APXS" -a -x "$APXS" ; then - httpd_moddir=`$APXS -q LIBEXECDIR` + moddir=`$APXS -q LIBEXECDIR` fi -if test -z "$httpd_moddir" ; then - httpd_moddir="$libdir/httpd/modules" +if test -z "$moddir" ; then + moddir='$(libdir)/httpd/modules' fi @@ -23854,8 +23966,8 @@ { (exit 1); exit 1; }; } fi ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg` - ldapsdk_lib=`$PKG_CONFIG --libs-only-L $mozldappkg` - ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $mozldappkg | sed -e s/-L// | sed -e s/\ .*$//` + ldapsdk_libdir=`$PKG_CONFIG --variable=libdir $mozldappkg` + ldapsdk_lib="-L$ldapsdk_libdir" ldapsdk_bindir=`$PKG_CONFIG --variable=bindir $mozldappkg` echo "$as_me:$LINENO: result: using system $mozldappkg" >&5 echo "${ECHO_T}using system $mozldappkg" >&6 @@ -24369,6 +24481,128 @@ { (exit 1); exit 1; }; } fi +# BEGIN COPYRIGHT BLOCK +# Copyright (C) 2007 Red Hat, Inc. +# All rights reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# END COPYRIGHT BLOCK + +{ echo "$as_me:$LINENO: checking for MOD_NSS..." >&5 +echo "$as_me: checking for MOD_NSS..." >&6;} + +# check for --with-modnss-lib +echo "$as_me:$LINENO: checking for --with-modnss-lib" >&5 +echo $ECHO_N "checking for --with-modnss-lib... $ECHO_C" >&6 + +# Check whether --with-modnss-lib or --without-modnss-lib was given. +if test "${with_modnss_lib+set}" = set; then + withval="$with_modnss_lib" + + if test -d "$withval" + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + nssmoddir="$withval" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + +# check for --with-modnss-bin +echo "$as_me:$LINENO: checking for --with-modnss-bin" >&5 +echo $ECHO_N "checking for --with-modnss-bin... $ECHO_C" >&6 + +# Check whether --with-modnss-bin or --without-modnss-bin was given. +if test "${with_modnss_bin+set}" = set; then + withval="$with_modnss_bin" + + if test -d "$withval" + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + modnssbindir="$withval" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + +# check for --with-fortitude +default_fortitudedir=/opt/fortitude +echo "$as_me:$LINENO: checking for --with-fortitude" >&5 +echo $ECHO_N "checking for --with-fortitude... $ECHO_C" >&6 + +# Check whether --with-fortitude or --without-fortitude was given. +if test "${with_fortitude+set}" = set; then + withval="$with_fortitude" + + if test -d "$withval" + then + echo "$as_me:$LINENO: result: using $withval" >&5 +echo "${ECHO_T}using $withval" >&6 + fortitudedir="$withval" + elif test "$withval" = "yes" -a -d $default_fortitudedir ; then + echo "$as_me:$LINENO: result: using $default_fortitudedir" >&5 +echo "${ECHO_T}using $default_fortitudedir" >&6 + fortitudedir="$default_fortitudedir" + else + echo + { { echo "$as_me:$LINENO: error: $withval not found" >&5 +echo "$as_me: error: $withval not found" >&2;} + { (exit 1); exit 1; }; } + fi + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; + +if test -n "$fortitudedir" ; then + if test -z "$nssmoddir" ; then + nssmoddir="$fortitudedir/modules.local" + fi + if test -z "$modnssbindir" ; then + modnssbindir="$fortitudedir/bin" + fi +fi +# else, parse httpd.conf or httpconfdir/nss.conf + +# else, punt +if test -z "$modnssbindir" ; then + modnssbindir='$(sbindir)' +fi + +if test -z "$nssmoddir" ; then + nssmoddir="$moddir" +fi + # server userid, groupid httpduser=nobody @@ -24420,8 +24654,9 @@ # location of property/resource files, relative to datadir propertydir=/$PACKAGE_BASE_NAME/properties -# will usually be in sbindir -modnssbindir='$(sbindir)' +# where our private Apache modules will go +# relative to libdir +admmoddir=/$PACKAGE_BASE_NAME/modules # write out paths for binary components @@ -24447,6 +24682,7 @@ + # write out paths for data/config files @@ -24468,6 +24704,9 @@ + + + # WINNT should be true if building on Windows system not using # cygnus, mingw, or the like and using cmd.exe as the shell @@ -24493,7 +24732,47 @@ ac_config_files="$ac_config_files Makefile" -#AC_CONFIG_SUBDIRS([mod_admserv mod_restartd]) + +# if doing a recursive configure, add --with-adminserver +# to the list of args for the modules +ac_configure_args="$ac_configure_args --with-adminserver --with-moddir=$admmoddir" + +if test -d $srcdir/mod_admserv ; then + + +subdirs="$subdirs mod_admserv" + + MOD_ADMSERV=true +fi + + +if $MOD_ADMSERV; then + MOD_ADMSERV_TRUE= + MOD_ADMSERV_FALSE='#' +else + MOD_ADMSERV_TRUE='#' + MOD_ADMSERV_FALSE= +fi + + +if test -d $srcdir/mod_restartd ; then + + +subdirs="$subdirs mod_restartd" + + MOD_RESTARTD=true +fi + + +if $MOD_RESTARTD; then + MOD_RESTARTD_TRUE= + MOD_RESTARTD_FALSE='#' +else + MOD_RESTARTD_TRUE='#' + MOD_RESTARTD_FALSE= +fi + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -24627,6 +24906,20 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${MOD_ADMSERV_TRUE}" && test -z "${MOD_ADMSERV_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MOD_ADMSERV\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"MOD_ADMSERV\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${MOD_RESTARTD_TRUE}" && test -z "${MOD_RESTARTD_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MOD_RESTARTD\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"MOD_RESTARTD\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -25214,6 +25507,7 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t +s,@SED@,$SED,;t t s,@EGREP@,$EGREP,;t t s,@LN_S@,$LN_S,;t t s,@ECHO@,$ECHO,;t t @@ -25233,6 +25527,7 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ICU_CONFIG@,$ICU_CONFIG,;t t s,@instconfigdir@,$instconfigdir,;t t +s,@PACKAGE_BASE_NAME@,$PACKAGE_BASE_NAME,;t t s,@nspr_inc@,$nspr_inc,;t t s,@nspr_lib@,$nspr_lib,;t t s,@nspr_libdir@,$nspr_libdir,;t t @@ -25265,6 +25560,7 @@ s,@icondir@,$icondir,;t t s,@manualdir@,$manualdir,;t t s,@httpdconf@,$httpdconf,;t t +s,@mimemagic@,$mimemagic,;t t s,@httpduser@,$httpduser,;t t s,@httpdgroup@,$httpdgroup,;t t s,@logdir@,$logdir,;t t @@ -25272,10 +25568,17 @@ s,@pidfile@,$pidfile,;t t s,@admservport@,$admservport,;t t s,@ldifdir@,$ldifdir,;t t +s,@admmoddir@,$admmoddir,;t t +s,@nssmoddir@,$nssmoddir,;t t s,@WINNT_TRUE@,$WINNT_TRUE,;t t s,@WINNT_FALSE@,$WINNT_FALSE,;t t s,@APACHE22_TRUE@,$APACHE22_TRUE,;t t s,@APACHE22_FALSE@,$APACHE22_FALSE,;t t +s,@subdirs@,$subdirs,;t t +s,@MOD_ADMSERV_TRUE@,$MOD_ADMSERV_TRUE,;t t +s,@MOD_ADMSERV_FALSE@,$MOD_ADMSERV_FALSE,;t t +s,@MOD_RESTARTD_TRUE@,$MOD_RESTARTD_TRUE,;t t +s,@MOD_RESTARTD_FALSE@,$MOD_RESTARTD_FALSE,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -25992,3 +26295,180 @@ $ac_cs_success || { (exit 1); exit 1; } fi +# +# CONFIG_SUBDIRS section. +# +if test "$no_recursion" != yes; then + + # Remove --cache-file and --srcdir arguments so they do not pile up. + ac_sub_configure_args= + ac_prev= + for ac_arg in $ac_configure_args; do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case $ac_arg in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ + | --c=*) + ;; + --config-cache | -C) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + ;; + *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; + esac + done + + # Always prepend --prefix to ensure using the same prefix + # in subdir configurations. + ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args" + + ac_popdir=`pwd` + for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. + test -d $srcdir/$ac_dir || continue + + { echo "$as_me:$LINENO: configuring in $ac_dir" >&5 +echo "$as_me: configuring in $ac_dir" >&6;} + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X$//$[^/]' \| \ + X"$as_dir" : 'X$//$$' \| \ + X"$as_dir" : 'X$/$' \| \ + . : '$.$' 2>/dev/null || +echo X"$as_dir" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X$\/\/$[^/].*/{ s//\1/; q; } + /^X$\/\/$$/{ s//\1/; q; } + /^X$\/$.*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + ac_builddir=. + +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac + + + cd $ac_dir + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_srcdir/configure.gnu; then + ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'" + elif test -f $ac_srcdir/configure; then + ac_sub_configure="$SHELL '$ac_srcdir/configure'" + elif test -f $ac_srcdir/configure.in; then + ac_sub_configure=$ac_configure + else + { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 +echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} + ac_sub_configure= + fi + + # The recursion is here. + if test -n "$ac_sub_configure"; then + # Make the cache file name correct relative to the subdirectory. + case $cache_file in + [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; + *) # Relative path. + ac_sub_cache_file=$ac_top_builddir$cache_file ;; + esac + + { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} + # The eval makes quoting arguments work. + eval $ac_sub_configure $ac_sub_configure_args \ + --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || + { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 +echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} + { (exit 1); exit 1; }; } + fi + + cd $ac_popdir + done +fi + Index: configure.ac =================================================================== RCS file: /cvs/dirsec/adminserver/configure.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- configure.ac 9 May 2007 00:26:29 -0000 1.1 +++ configure.ac 11 May 2007 19:44:04 -0000 1.2 @@ -86,6 +86,7 @@ m4_include(m4/icu.m4) m4_include(m4/adminutil.m4) m4_include(m4/setuputil.m4) +m4_include(m4/mod_nss.m4) # server userid, groupid httpduser=nobody @@ -132,10 +133,12 @@ # location of property/resource files, relative to datadir propertydir=/$PACKAGE_BASE_NAME/properties -# will usually be in sbindir -modnssbindir='$(sbindir)' +# where our private Apache modules will go +# relative to libdir +admmoddir=/$PACKAGE_BASE_NAME/modules # write out paths for binary components +AC_SUBST(PACKAGE_BASE_NAME) AC_SUBST(nspr_inc) AC_SUBST(nspr_lib) AC_SUBST(nspr_libdir) @@ -171,6 +174,7 @@ AC_SUBST(icondir) AC_SUBST(manualdir) AC_SUBST(httpdconf) +AC_SUBST(mimemagic) AC_SUBST(httpduser) AC_SUBST(httpdgroup) AC_SUBST(logdir) @@ -179,6 +183,8 @@ AC_SUBST(admservport) AC_SUBST(HTTPD) AC_SUBST(ldifdir) +AC_SUBST(admmoddir) +AC_SUBST(nssmoddir) # WINNT should be true if building on Windows system not using # cygnus, mingw, or the like and using cmd.exe as the shell @@ -186,5 +192,21 @@ AM_CONDITIONAL([APACHE22], $APACHE22) AC_CONFIG_FILES([Makefile]) -#AC_CONFIG_SUBDIRS([mod_admserv mod_restartd]) + +# if doing a recursive configure, add --with-adminserver +# to the list of args for the modules +ac_configure_args="$ac_configure_args --with-adminserver --with-moddir=$admmoddir" + +if test -d $srcdir/mod_admserv ; then + AC_CONFIG_SUBDIRS([mod_admserv]) + MOD_ADMSERV=true +fi +AM_CONDITIONAL([MOD_ADMSERV], $MOD_ADMSERV) + +if test -d $srcdir/mod_restartd ; then + AC_CONFIG_SUBDIRS([mod_restartd]) + MOD_RESTARTD=true +fi +AM_CONDITIONAL([MOD_RESTARTD], $MOD_RESTARTD) + AC_OUTPUT Index: ltmain.sh =================================================================== RCS file: /cvs/dirsec/adminserver/ltmain.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ltmain.sh 9 May 2007 00:26:29 -0000 1.1 +++ ltmain.sh 11 May 2007 19:44:04 -0000 1.2 @@ -46,10 +46,16 @@ VERSION=1.5.22 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes. -if test -n "${ZSH_VERSION+set}" ; then +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi # Check that we have a working $echo. @@ -105,12 +111,14 @@ # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -if test "${LC_ALL+set}" = set; then - save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL -fi -if test "${LANG+set}" = set; then - save_LANG="$LANG"; LANG=C; export LANG -fi +for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var + $lt_var=C + export $lt_var + fi" +done # Make sure IFS has a sensible default lt_nl=' @@ -136,6 +144,8 @@ preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 ##################################### # Shell function definitions: @@ -327,7 +337,17 @@ *) my_xabs=`pwd`"/$my_xlib" ;; esac my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xdir="$my_gentop/$my_xlib" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + extracted_serial=`expr $extracted_serial + 1` + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u" $show "${rm}r $my_xdir" $run ${rm}r "$my_xdir" @@ -758,6 +778,7 @@ *.f90) xform=f90 ;; *.for) xform=for ;; *.java) xform=java ;; + *.obj) xform=obj ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` @@ -1138,8 +1159,9 @@ for arg do case $arg in - -all-static | -static) - if test "X$arg" = "X-all-static"; then + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 fi @@ -1147,12 +1169,20 @@ dlopen_self=$dlopen_self_static fi prefer_static_libs=yes - else + ;; + -static) if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi prefer_static_libs=built - fi + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac build_libtool_libs=no build_old_libs=yes break @@ -1712,7 +1742,7 @@ continue ;; - -static) + -static | -static-libtool-libs) # The effects of -static are defined in a previous loop. # We used to do the same as -all-static on platforms that # didn't have a PIC flag, but the assumption that the effects @@ -2490,7 +2520,9 @@ if test "$linkmode,$pass" = "prog,link"; then if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then # We need to hardcode the library path if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. @@ -3186,7 +3218,7 @@ # which has an extra 1 added just for fun # case $version_type in - darwin|linux|osf|windows) + darwin|linux|osf|windows|none) current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_revision" @@ -3410,11 +3442,11 @@ fi # Eliminate all temporary directories. - for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` - done +# for path in $notinst_path; do +# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` +# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` +# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` +# done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. @@ -3515,13 +3547,12 @@ int main() { return 0; } EOF $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $deplibs - if test "$?" -eq 0 ; then + if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then ldd_output=`ldd conftest` for i in $deplibs; do name=`expr $i : '-l$.*$'` # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" -ne "0"; then + if test "$name" != "" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) @@ -3560,9 +3591,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $i - # Did it work? - if test "$?" -eq 0 ; then + if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in @@ -3594,7 +3623,7 @@ droppeddeps=yes $echo $echo "*** Warning! Library $i is needed by this library but I was not able to" - $echo "*** make it link in! You will probably need to install it or some" + $echo "*** make it link in! You will probably need to install it or some" $echo "*** library that it depends on before this library will be fully" $echo "*** functional. Installing it before continuing would be even better." fi @@ -4239,12 +4268,14 @@ reload_conv_objs= gentop= # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. wl= if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then - eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -4692,16 +4723,16 @@ case $host in *cygwin* | *mingw* ) if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` else - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP` fi ;; * ) - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP` ;; esac ;; @@ -4716,13 +4747,13 @@ # really was required. # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` fi if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. @@ -4809,7 +4840,7 @@ if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` else # fast_install is set to needless relink_command= @@ -4846,7 +4877,7 @@ fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` fi # Quote $echo for shipping. @@ -5253,6 +5284,18 @@ Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi + # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH @@ -5395,7 +5438,7 @@ ;; esac $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" + \$echo \"\$0: cannot exec \$program \$*\" exit $EXIT_FAILURE fi else @@ -5581,7 +5624,7 @@ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -5926,9 +5969,9 @@ if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` else - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` fi $echo "$modename: warning: relinking \`$file'" 1>&2 @@ -6137,7 +6180,7 @@ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` $show "$relink_command" if $run eval "$relink_command"; then : @@ -6413,12 +6456,15 @@ fi # Restore saved environment variables - if test "${save_LC_ALL+set}" = set; then - LC_ALL="$save_LC_ALL"; export LC_ALL - fi - if test "${save_LANG+set}" = set; then - LANG="$save_LANG"; export LANG - fi + for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + else + $lt_unset $lt_var + fi" + done + # Now prepare to actually exec the command. exec_cmd="\$cmd$args" @@ -6775,9 +6821,9 @@ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE + try to export only the symbols listed in SYMFILE -export-symbols-regex REGEX - try to export only the symbols matching REGEX + try to export only the symbols matching REGEX -LLIBDIR search LIBDIR for required installed libraries -lNAME OUTPUT-FILE requires the installed library libNAME -module build a library that can dlopened @@ -6791,9 +6837,11 @@ -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of libtool libraries + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] + specify library version info [each variable defaults to 0] All other options (arguments beginning with \`-') are ignored.

16 years, 11 months

1
0
0 / 0

[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf.in, 1.1, 1.2 httpd-2.2.conf.in, 1.1, 1.2 httpd.conf.in, 1.1, 1.2

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24035/adminserver/admserv/cfgstuff Modified Files: admserv.conf.in httpd-2.2.conf.in httpd.conf.in Log Message: Resolves: bug 239502 Description: adminserver: autotools, FHS, and many bug fixes Fix Description: Many more changes to make admin server more FHS friendly Allow all hardcoded paths to writable directories to be overridden by environment variables Integrate mod_admserv and mod_restartd Allow Admin Server to use Fortitude or standalone mod_nss Better httpd detection and support Index: admserv.conf.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- admserv.conf.in 9 May 2007 00:26:30 -0000 1.1 +++ admserv.conf.in 11 May 2007 19:44:05 -0000 1.2 @@ -23,6 +23,7 @@ ADMCacheLifeTime 600 ADMServerVersionString "@brand@-Administrator/@PACKAGE_VERSION@" +ADMConfigDir "@configdir@" ScriptAlias /bin/admin/admin/bin/ "@cgibindir@" ScriptAlias /dist/ "@cgibindir@" Index: httpd-2.2.conf.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd-2.2.conf.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- httpd-2.2.conf.in 9 May 2007 00:26:30 -0000 1.1 +++ httpd-2.2.conf.in 11 May 2007 19:44:05 -0000 1.2 @@ -117,32 +117,32 @@ # # Example: # LoadModule foo_module modules/mod_foo.so -LoadModule authz_host_module @moddir(a)/modules/mod_authz_host.so -LoadModule auth_basic_module @moddir(a)/modules/mod_auth_basic.so -LoadModule authn_file_module @moddir(a)/modules/mod_authn_file.so -LoadModule log_config_module @moddir(a)/modules/mod_log_config.so -LoadModule env_module @moddir(a)/modules/mod_env.so -LoadModule mime_magic_module @moddir(a)/modules/mod_mime_magic.so -LoadModule expires_module @moddir(a)/modules/mod_expires.so -LoadModule deflate_module @moddir(a)/modules/mod_deflate.so -LoadModule headers_module @moddir(a)/modules/mod_headers.so -LoadModule unique_id_module @moddir(a)/modules/mod_unique_id.so -LoadModule setenvif_module @moddir(a)/modules/mod_setenvif.so -LoadModule mime_module @moddir(a)/modules/mod_mime.so -LoadModule vhost_alias_module @moddir(a)/modules/mod_vhost_alias.so -LoadModule negotiation_module @moddir(a)/modules/mod_negotiation.so -LoadModule dir_module @moddir(a)/modules/mod_dir.so -LoadModule actions_module @moddir(a)/modules/mod_actions.so -LoadModule alias_module @moddir(a)/modules/mod_alias.so -LoadModule rewrite_module @moddir(a)/modules/mod_rewrite.so -LoadModule cache_module @moddir(a)/modules/mod_cache.so -LoadModule disk_cache_module @moddir(a)/modules/mod_disk_cache.so -LoadModule file_cache_module @moddir(a)/modules/mod_file_cache.so -LoadModule mem_cache_module @moddir(a)/modules/mod_mem_cache.so -LoadModule cgi_module @moddir(a)/modules/mod_cgi.so -LoadModule restartd_module @moddir(a)/libmodrestartd.so -LoadModule nss_module @moddir(a)/libmodnss.so -LoadModule admserv_module @moddir(a)/libmodadmserv.so +LoadModule authz_host_module @moddir(a)/mod_authz_host.so +LoadModule auth_basic_module @moddir(a)/mod_auth_basic.so +LoadModule authn_file_module @moddir(a)/mod_authn_file.so +LoadModule log_config_module @moddir(a)/mod_log_config.so +LoadModule env_module @moddir(a)/mod_env.so +LoadModule mime_magic_module @moddir(a)/mod_mime_magic.so +LoadModule expires_module @moddir(a)/mod_expires.so +LoadModule deflate_module @moddir(a)/mod_deflate.so +LoadModule headers_module @moddir(a)/mod_headers.so +LoadModule unique_id_module @moddir(a)/mod_unique_id.so +LoadModule setenvif_module @moddir(a)/mod_setenvif.so +LoadModule mime_module @moddir(a)/mod_mime.so +LoadModule vhost_alias_module @moddir(a)/mod_vhost_alias.so +LoadModule negotiation_module @moddir(a)/mod_negotiation.so +LoadModule dir_module @moddir(a)/mod_dir.so +LoadModule actions_module @moddir(a)/mod_actions.so +LoadModule alias_module @moddir(a)/mod_alias.so +LoadModule rewrite_module @moddir(a)/mod_rewrite.so +LoadModule cache_module @moddir(a)/mod_cache.so +LoadModule disk_cache_module @moddir(a)/mod_disk_cache.so +LoadModule file_cache_module @moddir(a)/mod_file_cache.so +LoadModule mem_cache_module @moddir(a)/mod_mem_cache.so +LoadModule cgi_module @moddir(a)/mod_cgi.so +LoadModule restartd_module @admmoddir(a)/mod_restartd.so +LoadModule nss_module @nssmoddir(a)/libmodnss.so +LoadModule admserv_module @admmoddir(a)/mod_admserv.so ### Section 2: 'Main' server configuration # @@ -297,7 +297,7 @@ # directive tells the module where the hint definitions are located. # <IfModule mod_mime_magic.c> - MIMEMagicFile @moddir@/conf/magic + MIMEMagicFile @mimemagic@ </IfModule> # Index: httpd.conf.in =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- httpd.conf.in 9 May 2007 00:26:30 -0000 1.1 +++ httpd.conf.in 11 May 2007 19:44:05 -0000 1.2 @@ -117,31 +117,31 @@ # # Example: # LoadModule foo_module modules/mod_foo.so -LoadModule access_module @moddir(a)/modules/mod_access.so -LoadModule auth_module @moddir(a)/modules/mod_auth.so -LoadModule log_config_module @moddir(a)/modules/mod_log_config.so -LoadModule env_module @moddir(a)/modules/mod_env.so -LoadModule mime_magic_module @moddir(a)/modules/mod_mime_magic.so -LoadModule expires_module @moddir(a)/modules/mod_expires.so -LoadModule deflate_module @moddir(a)/modules/mod_deflate.so -LoadModule headers_module @moddir(a)/modules/mod_headers.so -LoadModule unique_id_module @moddir(a)/modules/mod_unique_id.so -LoadModule setenvif_module @moddir(a)/modules/mod_setenvif.so -LoadModule mime_module @moddir(a)/modules/mod_mime.so -LoadModule vhost_alias_module @moddir(a)/modules/mod_vhost_alias.so -LoadModule negotiation_module @moddir(a)/modules/mod_negotiation.so -LoadModule dir_module @moddir(a)/modules/mod_dir.so -LoadModule actions_module @moddir(a)/modules/mod_actions.so -LoadModule alias_module @moddir(a)/modules/mod_alias.so -LoadModule rewrite_module @moddir(a)/modules/mod_rewrite.so -LoadModule cache_module @moddir(a)/modules/mod_cache.so -LoadModule disk_cache_module @moddir(a)/modules/mod_disk_cache.so -LoadModule file_cache_module @moddir(a)/modules/mod_file_cache.so -LoadModule mem_cache_module @moddir(a)/modules/mod_mem_cache.so -LoadModule cgi_module @moddir(a)/modules/mod_cgi.so -LoadModule restartd_module @moddir(a)/libmodrestartd.so -LoadModule nss_module @moddir(a)/libmodnss.so -LoadModule admserv_module @moddir(a)/libmodadmserv.so +LoadModule access_module @moddir(a)/mod_access.so +LoadModule auth_module @moddir(a)/mod_auth.so +LoadModule log_config_module @moddir(a)/mod_log_config.so +LoadModule env_module @moddir(a)/mod_env.so +LoadModule mime_magic_module @moddir(a)/mod_mime_magic.so +LoadModule expires_module @moddir(a)/mod_expires.so +LoadModule deflate_module @moddir(a)/mod_deflate.so +LoadModule headers_module @moddir(a)/mod_headers.so +LoadModule unique_id_module @moddir(a)/mod_unique_id.so +LoadModule setenvif_module @moddir(a)/mod_setenvif.so +LoadModule mime_module @moddir(a)/mod_mime.so +LoadModule vhost_alias_module @moddir(a)/mod_vhost_alias.so +LoadModule negotiation_module @moddir(a)/mod_negotiation.so +LoadModule dir_module @moddir(a)/mod_dir.so +LoadModule actions_module @moddir(a)/mod_actions.so +LoadModule alias_module @moddir(a)/mod_alias.so +LoadModule rewrite_module @moddir(a)/mod_rewrite.so +LoadModule cache_module @moddir(a)/mod_cache.so +LoadModule disk_cache_module @moddir(a)/mod_disk_cache.so +LoadModule file_cache_module @moddir(a)/mod_file_cache.so +LoadModule mem_cache_module @moddir(a)/mod_mem_cache.so +LoadModule cgi_module @moddir(a)/mod_cgi.so +LoadModule restartd_module @admmoddir(a)/mod_restartd.so +LoadModule nss_module @nssmoddir(a)/libmodnss.so +LoadModule admserv_module @admmoddir(a)/mod_admserv.so ### Section 2: 'Main' server configuration # @@ -296,7 +296,7 @@ # directive tells the module where the hint definitions are located. # <IfModule mod_mime_magic.c> - MIMEMagicFile @moddir@/conf/magic + MIMEMagicFile @mimemagic@ </IfModule> #

16 years, 11 months

1
0
0 / 0

[Fedora-directory-commits] adminserver/admserv/cgi-src40 ReadLog.c, 1.6, 1.7 admpw.c, 1.8, 1.9 config.c, 1.8, 1.9 dsconfig.c, 1.7, 1.8 getport.c, 1.5, 1.6 htmladmin.c, 1.8, 1.9 mergeConfig.cpp, 1.6, 1.7 migrateConfig.c, 1.6, 1.7 restartsrv.c, 1.6, 1.7 sec-activate.c, 1.8, 1.9 security.c, 1.9, 1.10 setport.c, 1.5, 1.6 start_config_ds.c, 1.6, 1.7 ugdsconfig.c, 1.7, 1.8 viewdata.c, 1.7, 1.8 viewlog.c, 1.6, 1.7

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cgi-src40 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24035/adminserver/admserv/cgi-src40 Modified Files: ReadLog.c admpw.c config.c dsconfig.c getport.c htmladmin.c mergeConfig.cpp migrateConfig.c restartsrv.c sec-activate.c security.c setport.c start_config_ds.c ugdsconfig.c viewdata.c viewlog.c Log Message: Resolves: bug 239502 Description: adminserver: autotools, FHS, and many bug fixes Fix Description: Many more changes to make admin server more FHS friendly Allow all hardcoded paths to writable directories to be overridden by environment variables Integrate mod_admserv and mod_restartd Allow Admin Server to use Fortitude or standalone mod_nss Better httpd detection and support Index: ReadLog.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ReadLog.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ReadLog.c 9 May 2007 00:26:30 -0000 1.6 +++ ReadLog.c 11 May 2007 19:44:05 -0000 1.7 @@ -89,6 +89,7 @@ { char line[BIG_LINE]; const char *logdir = util_get_log_dir(); + const char *configdir = util_get_conf_dir(); char filename[BIG_LINE]; FILE *f; @@ -97,7 +98,7 @@ } if (!util_find_file_in_paths(filename, sizeof(filename), "local.conf", - CONFIGDIR, "", "admin-serv/config")) { + configdir, "", "admin-serv/config")) { return 0; } Index: admpw.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/admpw.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- admpw.c 9 May 2007 00:26:30 -0000 1.8 +++ admpw.c 11 May 2007 19:44:05 -0000 1.9 @@ -182,11 +182,12 @@ char error_info[128]; AdmldapInfo admInfo; int errorcode = 0; + char *configdir = util_get_conf_dir(); logMsg(" In %s\n", argv[0]); i18nInit(); - admInfo = admldapBuildInfoOnly(CONFIGDIR, &errorcode); + admInfo = admldapBuildInfoOnly(configdir, &errorcode); if (!admInfo || errorcode) { rpt_err(SYSTEM_ERROR, i18nMsg(DBT_OPEN_ADMPW, "Can not open admpw file"), NULL, NULL); } @@ -307,7 +308,9 @@ } if (newpw != NULL) { - int errorCode = ADMSSL_InitSimple(CONFIGDIR, SECURITYDIR, 1 /* force to use hashing */); + char *configdir = util_get_conf_dir(); + char *secdir = util_get_security_dir(); + int errorCode = ADMSSL_InitSimple(configdir, secdir, 1 /* force to use hashing */); if (errorCode) { rpt_err(APP_ERROR, i18nMsg(DBT_SECURITY_INIT, "Security Initialization Failed"), @@ -362,6 +365,7 @@ char *binddn = 0; char *bindpw = 0; char error_info[128]; + char *configdir = util_get_conf_dir(); /* Get UserDN and User Password */ @@ -394,7 +398,7 @@ /* Initialize the pset */ pset = psetCreateSSL("admin-serv", - /* configRoot */ CONFIGDIR, + /* configRoot */ configdir, /* userDN */ binddn, /* passwd */ bindpw, /* errorcode */ &rv); Index: config.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- config.c 11 May 2007 17:26:12 -0000 1.8 +++ config.c 11 May 2007 19:44:05 -0000 1.9 @@ -45,6 +45,7 @@ #include "libadmsslutil/admsslutil.h" #include "libadmin/install.h" +#include "libadmin/libadmin.h" #include "config.h" @@ -125,6 +126,9 @@ char *acceptLanguage = (char*)"en"; Resource *i18nResource = NULL; AdmldapInfo adminfo = NULL; + char *configdir = util_get_conf_dir(); + char *secdir = util_get_security_dir(); + char *logdir = util_get_log_dir(); #if 0 int waitforever = 1; @@ -221,13 +225,13 @@ if (binddn) rv = ADM_GetCurrentPassword(&err, &bindpw); - adminfo = admldapBuildInfo(CONFIGDIR, &rv); + adminfo = admldapBuildInfo(configdir, &rv); if (adminfo) { binddn = admldapGetSIEDN(adminfo); bindpw = admldapGetSIEPWD(adminfo); } - errorCode = ADMSSL_InitSimple(CONFIGDIR, SECURITYDIR, 0); + errorCode = ADMSSL_InitSimple(configdir, secdir, 0); if (errorCode) { if (i18nResource) rpt_err(APP_ERROR, @@ -240,7 +244,7 @@ /* Initialize the pset */ pset = psetCreateSSL("admin-serv", - /* configRoot */ CONFIGDIR, + /* configRoot */ configdir, /* userDN */ binddn, /* passwd */ bindpw, /* errorcode */ &rv); @@ -537,7 +541,7 @@ rpt_err(APP_ERROR, error_info, NULL, NULL); } else { - char *pathline = PR_smprintf("%s/%s %s", LOGDIR, valptr, "common"); + char *pathline = PR_smprintf("%s/%s %s", logdir, valptr, "common"); err = update_conf("console.conf", "CustomLog", pathline); PR_smprintf_free(pathline); } @@ -557,7 +561,7 @@ rpt_err(APP_ERROR, error_info, NULL, NULL); } else { - char *newpath = PR_smprintf("%s/%s", LOGDIR, valptr); + char *newpath = PR_smprintf("%s/%s", logdir, valptr); err = update_conf("console.conf", "ErrorLog", newpath); } } @@ -670,8 +674,9 @@ static char filename[BIG_LINE]; static char inbuf[BIG_LINE]; char * retval = NULL; + char *configdir = util_get_conf_dir(); - util_find_file_in_paths(filename, sizeof(filename), file, CONFIGDIR, "", "admin-serv/config"); + util_find_file_in_paths(filename, sizeof(filename), file, configdir, "", "admin-serv/config"); f = fopen(filename, "r"); if (f==NULL) { @@ -706,8 +711,9 @@ static char buf[BIG_LINE]; int linecnt=0; char *lines[CONF_LINES]; + char *configdir = util_get_conf_dir(); - util_find_file_in_paths(filename, sizeof(filename), file, CONFIGDIR, "", "admin-serv/config"); + util_find_file_in_paths(filename, sizeof(filename), file, configdir, "", "admin-serv/config"); f = fopen(filename, "r"); if (f==NULL) { @@ -775,8 +781,9 @@ "configuration.nsPidLog", &errorCode); if (oldname != NULL && strcmp(oldname, newname) != 0) { - PR_snprintf(oldpath, sizeof(oldpath), "%s/%s", PIDDIR, oldname); - PR_snprintf(newpath, sizeof(newpath), "%s/%s", PIDDIR, newname); + char *piddir = util_get_pid_dir(); + PR_snprintf(oldpath, sizeof(oldpath), "%s/%s", piddir, oldname); + PR_snprintf(newpath, sizeof(newpath), "%s/%s", piddir, newname); if(rename (oldpath, newpath) != 0) return 0; return !update_conf("console.conf", "PidFile", newname); @@ -793,6 +800,9 @@ static int change_server_uid(PsetHndl pset, char* newuname) { int errorCode; int newuid; + char *configdir = util_get_conf_dir(); + char *secdir = util_get_security_dir(); + char *logdir = util_get_log_dir(); char *olduname = psetGetAttrSingleValue(pset, "configuration.nsSuiteSpotUser", &errorCode); @@ -813,8 +823,8 @@ newuid = verify_server_uname(newuname); if (newuid >= 0) { - if (change_uid_all(CONFIGDIR, 0, newuid) || change_uid_all(SECURITYDIR, 0, newuid) || - change_uid_all(LOGDIR, 0, newuid) || (pidfile && change_uid(pidfile, 0, newuid))) { + if (change_uid_all(configdir, 0, newuid) || change_uid_all(secdir, 0, newuid) || + change_uid_all(logdir, 0, newuid) || (pidfile && change_uid(pidfile, 0, newuid))) { return -1; } else { return update_conf("console.conf", "User", newuname); @@ -847,8 +857,9 @@ int i = 0; int grmem_found = 0; char buf[BUFSIZ]; + char *configdir = util_get_conf_dir(); - admInfo = admldapBuildInfoOnly(CONFIGDIR, &errorcode); + admInfo = admldapBuildInfoOnly(configdir, &errorcode); if (!admInfo || errorcode) { rpt_err(SYSTEM_ERROR, "Can not open adm.conf for reading", NULL, NULL); return -1; Index: dsconfig.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/dsconfig.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dsconfig.c 9 May 2007 00:26:30 -0000 1.7 +++ dsconfig.c 11 May 2007 19:44:05 -0000 1.8 @@ -223,9 +223,10 @@ char *ldapurl = NULL; int errorcode = 0; AdmldapInfo admInfo = NULL; + char *configdir = util_get_conf_dir(); logMsg("In get_ldap_url\n"); - admInfo = admldapBuildInfoOnly(CONFIGDIR, &errorcode); + admInfo = admldapBuildInfoOnly(configdir, &errorcode); if (!admInfo || errorcode) { logMsg("Could not get ldap info from config - %d", errorcode); return NULL; @@ -370,9 +371,10 @@ static void update_adm_conf(char *ldapURL, char *sieDN, char *isieDN) { AdmldapInfo admInfo = NULL; int errorcode = 0; + char *configdir = util_get_conf_dir(); /* get a handle to the current one */ - admInfo = admldapBuildInfoOnly(CONFIGDIR, &errorcode); + admInfo = admldapBuildInfoOnly(configdir, &errorcode); if (!admInfo || errorcode) { rpt_err(SYSTEM_ERROR, i18nMsg(DBT_OPEN_ADM_RD, "Can not open adm.conf for reading"), NULL, NULL); } Index: getport.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/getport.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- getport.c 9 May 2007 00:26:30 -0000 1.5 +++ getport.c 11 May 2007 19:44:05 -0000 1.6 @@ -49,6 +49,8 @@ char *newValue = 0; char *portVal = 0; char error_info[128]; + const char *configdir = util_get_conf_dir(); + const char *secdir = util_get_security_dir(); memset((void *)errp, 0, sizeof(int)); method = getenv("REQUEST_METHOD"); @@ -83,13 +85,13 @@ if (binddn) rv = ADM_GetCurrentPassword(&err, &bindpw); /* Initialize the pset */ - rv = ADMSSL_InitSimple(CONFIGDIR, SECURITYDIR); + rv = ADMSSL_InitSimple(configdir, secdir); if (rv) { rpt_err(APP_ERROR, "SSL related initialization failed", NULL, NULL); } pset = psetCreateSSL("admin-serv", - /* configRoot */ NULL, + /* configRoot */ configdir, /* userDN */ binddn, /* passwd */ bindpw, /* errorcode */ &rv); Index: htmladmin.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/htmladmin.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- htmladmin.c 9 May 2007 00:26:30 -0000 1.8 +++ htmladmin.c 11 May 2007 19:44:05 -0000 1.9 @@ -1577,6 +1577,8 @@ char *bindpw; int rv; + const char *configdir = util_get_conf_dir(); + const char *secdir = util_get_security_dir(); i18nResource = res_find_and_init_resource(PROPERTYDIR, RESOURCE_FILE); acceptLanguage = "en"; @@ -1643,7 +1645,7 @@ int i; int found; - ldapInfo = get_adm_ldapinfo(CONFIGDIR, SECURITYDIR); + ldapInfo = get_adm_ldapinfo(configdir, secdir); if(!get_bindinfo(&binddn, &bindpw)) exit(0); @@ -1687,7 +1689,7 @@ */ - ldapInfo = get_adm_ldapinfo(CONFIGDIR, SECURITYDIR); + ldapInfo = get_adm_ldapinfo(configdir, secdir); fprintf(stdout, getResourceString(DBT_MAIN_TOPOLOGY_HEADER), get_topology_refresh_rate(ldapInfo), view ? viewparam : ""); Index: mergeConfig.cpp =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/mergeConfig.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mergeConfig.cpp 9 May 2007 00:26:30 -0000 1.6 +++ mergeConfig.cpp 11 May 2007 19:44:05 -0000 1.7 @@ -36,6 +36,7 @@ #include "libadmsslutil/admsslutil.h" #include "libadminutil/resource.h" #include "setuputil/ldapu.h" +#include "libadmin/libadmin.h" #include <ldap_ssl.h> #include "config.h" @@ -804,6 +805,8 @@ char response[4096], sie_response[4096], isie_response[4096]; char *temp, *temp2; const char *admin_brand = "Fedora"; + char *configdir = util_get_conf_dir(); + char *secdir = util_get_security_dir(); method = getenv("REQUEST_METHOD"); @@ -845,13 +848,13 @@ if (source_binddn) rv = ADM_GetCurrentPassword(&err, &source_bindpw); - ldapInfo = admldapBuildInfo(CONFIGDIR, &rv); + ldapInfo = admldapBuildInfo(configdir, &rv); if (!ldapInfo) { rpt_err(INCORRECT_USAGE, getResourceString(DBT_INVALID_SOURCE_SR), NULL, NULL); } - rv = ADMSSL_InitSimple(CONFIGDIR, SECURITYDIR, 0); + rv = ADMSSL_InitSimple(configdir, secdir, 0); if (rv) { PR_snprintf(error_info, sizeof(error_info), getResourceString(DBT_ADMSSL_INITFAIL), rv); rpt_err(APP_ERROR, error_info, NULL, NULL); Index: migrateConfig.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/migrateConfig.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- migrateConfig.c 9 May 2007 00:26:30 -0000 1.6 +++ migrateConfig.c 11 May 2007 19:44:05 -0000 1.7 @@ -133,6 +133,8 @@ char buf[1024], cpcmd[1024], *tmpptr; const char *errMsg = NULL; PRFileInfo fileInfo; + const char *configdir = util_get_conf_dir(); + const char *secdir = util_get_security_dir(); #if 0 int waitforever = 1; @@ -226,7 +228,7 @@ } if (binddn) rv = ADM_GetCurrentPassword(&err, &bindpw); - rv = ADMSSL_InitSimple(CONFIGDIR, SECURITYDIR); + rv = ADMSSL_InitSimple(configdir, secdir); if (rv) { if (i18nResource && (errMsg = res_getstring(i18nResource, @@ -239,7 +241,7 @@ /* Initialize the pset */ pset = psetCreateSSL("admin-serv", - /* configRoot */ CONFIGDIR, + /* configRoot */ configdir, /* userDN */ binddn, /* passwd */ bindpw, /* errorcode */ &rv); Index: restartsrv.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/restartsrv.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- restartsrv.c 9 May 2007 00:26:30 -0000 1.6 +++ restartsrv.c 11 May 2007 19:44:05 -0000 1.7 @@ -294,8 +294,11 @@ static char filename[BIG_LINE]; static char buf[BIG_LINE]; char * p = NULL; + const char *configdir = util_get_conf_dir(); + const char *logdir = util_get_log_dir(); + const char *piddir = util_get_pid_dir(); - util_find_file_in_paths(filename, sizeof(filename), "console.conf", CONFIGDIR, "", "admin-serv/config"); + util_find_file_in_paths(filename, sizeof(filename), "console.conf", configdir, "", "admin-serv/config"); f = fopen(filename, "r"); if (f==NULL) { @@ -318,7 +321,7 @@ PR_snprintf(buf, sizeof(buf),"%s",p); } else { - util_find_file_in_paths(buf, sizeof(buf), p, LOGDIR, "..", "admin-serv"); + util_find_file_in_paths(buf, sizeof(buf), p, piddir, "..", "admin-serv"); } free(p); p = strdup(buf); Index: sec-activate.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/sec-activate.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sec-activate.c 9 May 2007 00:26:30 -0000 1.8 +++ sec-activate.c 11 May 2007 19:44:05 -0000 1.9 @@ -521,7 +521,8 @@ rpt_err(ELEM_MISSING, getResourceString(DBT_PSET_INIT_NO_USERNAME), NULL, NULL); else { /* No DN, maybe it is local super */ - localAdmin = admGetLocalAdmin(CONFIGDIR, &rv); + configdir = util_get_conf_dir(); + localAdmin = admGetLocalAdmin(configdir, &rv); if (localAdmin) { if (PORT_Strcmp(username, localAdmin)) rpt_err(ELEM_MISSING, getResourceString(DBT_PSET_INIT_NO_USERDN), NULL, NULL); @@ -551,8 +552,8 @@ } } else { - configdir = CONFIGDIR; - securitydir = SECURITYDIR; + configdir = util_get_conf_dir(); + securitydir = util_get_security_dir(); rv = ADMSSL_InitSimple(configdir, securitydir, 1); if (rv) { rpt_err(APP_ERROR, getResourceString(DBT_ADMSSL_INIT_FAIL), NULL, NULL); Index: security.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/security.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- security.c 9 May 2007 00:26:30 -0000 1.9 +++ security.c 11 May 2007 19:44:05 -0000 1.10 @@ -61,6 +61,8 @@ #include "cgicommon.h" +#include "libadmin/libadmin.h" + #ifdef __cplusplus } #endif @@ -429,13 +431,14 @@ int rval = 0; char *securitydir = NULL; PsetHndl pset; + char *configdir = util_get_conf_dir(); if (!PL_strncasecmp(sie, "admin-serv", strlen("admin-serv"))) { - return PL_strdup(SECURITYDIR); /* same as admin server security dir */ + return PL_strdup(util_get_security_dir()); /* same as admin server security dir */ } /* create pset with this dn */ - pset = psetCreateSSL((char *)sie, CONFIGDIR, NULL, NULL, &rval); + pset = psetCreateSSL((char *)sie, configdir, NULL, NULL, &rval); if (pset && ((rval == PSET_OP_OK) || (rval == PSET_LOCAL_OPEN_FAIL))) { /* only admin-serv uses local file */ securitydir = psetGetAttrSingleValue(pset, "configuration.encryption.certdir", &rval); if (!securitydir && psetHasObjectClass(pset, DSOBJECTCLASS)) { @@ -1507,11 +1510,12 @@ CERTSignedCrl *signed_crl, *excrl, *crl_rv = NULL; SECItem derCrl; char msg[BIG_LINE]; + char *secdir = util_get_security_dir(); int list_type = (type && !PORT_Strcmp(type, "CKL"))? SEC_KRL_TYPE : SEC_CRL_TYPE; if (!filename || !*filename || !util_is_valid_path_string(filename) || - !util_verify_file_or_dir(SECURITYDIR, PR_FILE_DIRECTORY, filename, -1, PR_FILE_FILE)) { + !util_verify_file_or_dir(secdir, PR_FILE_DIRECTORY, filename, -1, PR_FILE_FILE)) { /* invalid file */ PR_snprintf(msg, sizeof(msg), getResourceString(DBT_NO_FILE_EXISTS), filename); errorRpt(FILE_ERROR, msg); @@ -1818,7 +1822,7 @@ static void moduleOperation(char* op) { const char *binary = "modutil"; /* PATH and LD_LIBRARY_PATH must already be set correctly */ const char *install_dir = LIBDIR; - const char *database_dir = SECURITYDIR; + const char *database_dir = util_get_security_dir(); char *filename, *filetype, *dllname; char cmd[BIG_LINE]; char msg[BIG_LINE]; @@ -1840,9 +1844,9 @@ filename = getParameter("filename",getResourceString(DBT_MISSING_FILE)); filetype = getParameter("format",getResourceString(DBT_MISSING_FORMAT)); - /* see if filename exists in SECURITYDIR */ + /* see if filename exists in database_dir (securitydir) */ if(!util_is_valid_path_string(filename) || - !util_verify_file_or_dir(SECURITYDIR, PR_FILE_DIRECTORY, filename, -1, PR_FILE_FILE)) { + !util_verify_file_or_dir(database_dir, PR_FILE_DIRECTORY, filename, -1, PR_FILE_FILE)) { PR_snprintf(msg, sizeof(msg), getResourceString(DBT_NO_FILE_EXISTS), filename); rpt_err(FILE_ERROR, msg, NULL, NULL); } @@ -1956,6 +1960,7 @@ AdmldapInfo ldapInfo; /* our config */ int rc = 0; char *sie; + char *configdir = util_get_conf_dir(); #if 0 CGI_Debug("security"); @@ -1985,9 +1990,9 @@ post_begin(stdin); sie = getParameter("sie", getResourceString(DBT_SIE)); - ldapInfo = admldapBuildInfoOnly(CONFIGDIR, &rc); + ldapInfo = admldapBuildInfoOnly(configdir, &rc); if (rc || !ldapInfo) { - PR_snprintf(line, sizeof(line), getResourceString(CMN_CONFIGPROBLEM), CONFIGDIR, rc); + PR_snprintf(line, sizeof(line), getResourceString(CMN_CONFIGPROBLEM), configdir ? configdir : "(null)", rc); errorRpt(FILE_ERROR, line); } Index: setport.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/setport.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- setport.c 9 May 2007 00:26:30 -0000 1.5 +++ setport.c 11 May 2007 19:44:05 -0000 1.6 @@ -49,6 +49,8 @@ char *newValue = 0; char *portVal = 0; char error_info[128]; + const char *configdir = util_get_conf_dir(); + const char *secdir = util_get_security_dir(); memset((void *)errp, 0, sizeof(int)); method = getenv("REQUEST_METHOD"); @@ -94,7 +96,7 @@ else { /* No DN, maybe it is local super */ /* No DN, maybe it is local super */ - localAdmin = admGetLocalAdmin(NULL, &rv); + localAdmin = admGetLocalAdmin(configdir, &rv); if (localAdmin) { if (strcmp(username, localAdmin)) { rpt_err(ELEM_MISSING, "ErrorString: NO USER DN!", NULL, NULL); @@ -112,7 +114,7 @@ if (binddn) rv = ADM_GetCurrentPassword(&err, &bindpw); - rv = ADMSSL_InitSimple(CONFIGDIR, SECURITYDIR); + rv = ADMSSL_InitSimple(configdir, secdir); if (rv) { rpt_err(APP_ERROR, "SSL related initialization failed", NULL, NULL); } @@ -120,7 +122,7 @@ /* Initialize the pset */ pset = psetCreateSSL("admin-serv", - /* configRoot */ NULL, + /* configRoot */ configdir, /* userDN */ binddn, /* passwd */ bindpw, /* errorcode */ &rv); Index: start_config_ds.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/start_config_ds.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- start_config_ds.c 9 May 2007 00:26:30 -0000 1.6 +++ start_config_ds.c 11 May 2007 19:44:05 -0000 1.7 @@ -64,9 +64,10 @@ int ret_val = 0; char *startcmd = 0; AdmldapInfo info; + char *configdir = util_get_conf_dir(); /* find and open the AS config file adm.conf */ - info = admldapBuildInfoOnly(CONFIGDIR, &ret_val); + info = admldapBuildInfoOnly(configdir, &ret_val); if (!info) { return error_exit("Failed to open adm.conf"); Index: ugdsconfig.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ugdsconfig.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ugdsconfig.c 9 May 2007 00:26:30 -0000 1.7 +++ ugdsconfig.c 11 May 2007 19:44:05 -0000 1.8 @@ -179,6 +179,8 @@ char *method = getenv("REQUEST_METHOD"); char *qs = 0, *op=0; + const char *configdir = util_get_conf_dir(); + const char *secdir = util_get_security_dir(); logMsg(" In %s\n", argv[0]); @@ -219,10 +221,10 @@ rpt_err(INCORRECT_USAGE, i18nMsg(DBT_NO_OPERATION,"No operation is defined"), NULL, NULL); } if (strcmp(op,"getconfig") == 0) { - handle_getconfig(CONFIGDIR, SECURITYDIR); + handle_getconfig(configdir, secdir); } else if (strcmp(op,"setconfig") == 0) { - handle_setconfig(CONFIGDIR, SECURITYDIR); + handle_setconfig(configdir, secdir); } else { PR_snprintf(error_info, sizeof(error_info), i18nMsg(DBT_UNKNOWN_OPERATION,"Unknown Operation (%s)"), op); Index: viewdata.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/viewdata.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- viewdata.c 9 May 2007 00:26:30 -0000 1.7 +++ viewdata.c 11 May 2007 19:44:05 -0000 1.8 @@ -413,8 +413,10 @@ LDAP *server; LDAPMessage *entry; int ldapError; + const char *configdir = util_get_conf_dir(); + const char *secdir = util_get_security_dir(); - AdmldapInfo ldapInfo = get_adm_ldapinfo(CONFIGDIR, SECURITYDIR); + AdmldapInfo ldapInfo = get_adm_ldapinfo(configdir, secdir); i18nInit(); Index: viewlog.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/viewlog.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- viewlog.c 9 May 2007 00:26:30 -0000 1.6 +++ viewlog.c 11 May 2007 19:44:05 -0000 1.7 @@ -209,8 +209,10 @@ char *errorlog_attr = NULL; char *accesslog_attr = NULL; + char *configdir = util_get_conf_dir(); + char *secdir = util_get_security_dir(); - rv = ADMSSL_InitSimple(CONFIGDIR, SECURITYDIR, 0); + rv = ADMSSL_InitSimple(configdir, secdir, 0); if (rv) { if (i18nResource) { char msgbuf[BUFSIZ]; @@ -222,7 +224,7 @@ } } - pset = psetCreateSSL(id, CONFIGDIR, NULL, NULL, &rv); + pset = psetCreateSSL(id, configdir, NULL, NULL, &rv); if (pset) { return_dir = psetGetAttrSingleValue(pset, LOGDIRATTR, &rv); @@ -240,11 +242,12 @@ } if(!return_dir) { + char *logdir = util_get_log_dir(); if (!strncasecmp(id, "admin-", 6)) { - return PR_smprintf("%s%c%s", LOGDIR, FILE_PATHSEP, id); /* this is us */ + return PL_strdup(logdir); } else if (!strncmp(id, "slapd-", 6)) { /* DIRECTORY SERVER and admin server share the same log dir parent */ - return_dir = PR_smprintf("%s%c%s", LOGDIR, FILE_PATHSEP, id); + return_dir = PR_smprintf("%s%c..%s%s", logdir, FILE_PATHSEP, FILE_PATHSEP, id); } }

16 years, 11 months

1
0
0 / 0

[Fedora-directory-commits] adminserver/include/libadmin libadmin.h, 1.7, 1.8

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/include/libadmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24035/adminserver/include/libadmin Modified Files: libadmin.h Log Message: Resolves: bug 239502 Description: adminserver: autotools, FHS, and many bug fixes Fix Description: Many more changes to make admin server more FHS friendly Allow all hardcoded paths to writable directories to be overridden by environment variables Integrate mod_admserv and mod_restartd Allow Admin Server to use Fortitude or standalone mod_nss Better httpd detection and support Index: libadmin.h =================================================================== RCS file: /cvs/dirsec/adminserver/include/libadmin/libadmin.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libadmin.h 9 May 2007 00:26:35 -0000 1.7 +++ libadmin.h 11 May 2007 19:44:05 -0000 1.8 @@ -544,13 +544,21 @@ ); /* Get the path to the directory containing config files */ -NSAPI_PUBLIC const char* +NSAPI_PUBLIC char* util_get_conf_dir(void); +/* Get the path to the directory containing security files */ +NSAPI_PUBLIC char* +util_get_security_dir(void); + /* Get the path to the directory containing log files */ -NSAPI_PUBLIC const char* +NSAPI_PUBLIC char* util_get_log_dir(void); +/* Get the path to the directory containing pid file */ +NSAPI_PUBLIC char* +util_get_pid_dir(void); + /* Get the path to the directory containing html files */ NSAPI_PUBLIC const char* util_get_html_dir(void);

16 years, 11 months

1
0
0 / 0

[Fedora-directory-commits] adminserver/admserv/cgi-src40 config.c, 1.7, 1.8 snmpconf.c, 1.7, NONE snmpconf.properties, 1.3, NONE snmpmctl.c, 1.7, NONE snmpmctl.properties, 1.3, NONE

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cgi-src40 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2777/cgi-src40 Modified Files: config.c Removed Files: snmpconf.c snmpconf.properties snmpmctl.c snmpmctl.properties Log Message: rename scripts to x-ds-admin; fix uid change in config.c; remove obsolete snmp CGIs Index: config.c =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/config.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- config.c 9 May 2007 00:26:30 -0000 1.7 +++ config.c 11 May 2007 17:26:12 -0000 1.8 @@ -791,13 +791,16 @@ */ #ifdef XP_UNIX static int change_server_uid(PsetHndl pset, char* newuname) { - char *sroot = getenv("NETSITE_ROOT"); int errorCode; int newuid; char *olduname = psetGetAttrSingleValue(pset, "configuration.nsSuiteSpotUser", &errorCode); + char *pidfile = psetGetAttrSingleValue(pset, + "configuration.nsPidLog", + &errorCode); + if (olduname != NULL && strcmp(olduname, newuname) != 0) { /* Can change uid only id running as a root */ @@ -810,10 +813,12 @@ newuid = verify_server_uname(newuname); if (newuid >= 0) { - if(change_uid_all(sroot, 0, newuid) == 0) - return update_conf("console.conf", "User", newuname); - else + if (change_uid_all(CONFIGDIR, 0, newuid) || change_uid_all(SECURITYDIR, 0, newuid) || + change_uid_all(LOGDIR, 0, newuid) || (pidfile && change_uid(pidfile, 0, newuid))) { return -1; + } else { + return update_conf("console.conf", "User", newuname); + } } else { return -1; --- snmpconf.c DELETED --- --- snmpconf.properties DELETED --- --- snmpmctl.c DELETED --- --- snmpmctl.properties DELETED ---

16 years, 11 months

1
0
0 / 0

[Fedora-directory-commits] adminserver/admserv/newinst/src ux-update.cc, 1.23, 1.24

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/newinst/src In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2777/newinst/src Modified Files: ux-update.cc Log Message: rename scripts to x-ds-admin; fix uid change in config.c; remove obsolete snmp CGIs Index: ux-update.cc =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ux-update.cc 9 May 2007 00:26:33 -0000 1.23 +++ ux-update.cc 11 May 2007 17:26:12 -0000 1.24 @@ -57,20 +57,12 @@ static int set_locate_admserv_aci(Ldap *ldap); static int repair_group_expansion_aci(Ldap *ldap); -static void replaceTokensInFile(const char *sourcefile, const char *destfile, const char * const *ary); - -#ifdef HPUX - #define SHLIB_EXT "sl" -#else - #define SHLIB_EXT "so" -#endif #define EPOCH_32BIT_END_TIME "20380118031417" /* <correct end time> minus 1 day */ const char *DEFAULT_SYSUSER = DEFAULT_HTTPDUSER; -const char *DEFAULT_DATADIR = DATADIR; -const char *DEFAULT_TASKCONF = "admintasks.ldif"; /* relative to DATADIR */ -const char *DEFAULT_GLOBALCONF = "adminglobal.ldif"; /* relative to DATADIR */ +const char *DEFAULT_TASKCONF = "admintasks.ldif"; /* relative to LDIFDIR */ +const char *DEFAULT_GLOBALCONF = "adminglobal.ldif"; /* relative to LDIFDIR */ const char *CHOWN_CMD = "chown -R %s %s >/dev/null 2>&1"; const char *CHGRP_CMD = "chgrp -R %s %s >/dev/null 2>&1"; @@ -357,11 +349,11 @@ if (stat(pid, &fi) == 0) { - sprintf(startProgram, "%s/restart-admin > %s 2>&1", CMDBINDIR, startLog); + sprintf(startProgram, "%s/restart-ds-admin > %s 2>&1", CMDBINDIR, startLog); } else { - sprintf(startProgram, "%s/start-admin > %s 2>&1", CMDBINDIR, startLog); + sprintf(startProgram, "%s/start-ds-admin > %s 2>&1", CMDBINDIR, startLog); } ret = system(startProgram); @@ -388,46 +380,6 @@ } } -/* -void -walk_dir_and_chown(const char *dirName, uid_t my_uid, uid_t admin_uid, uid_t tuid, gid_t tgid) -{ - if (chdir(dirName) == 0) - { - struct dirent *entry = NULL; - DIR *dir; - struct stat fi; - - dir = opendir("."); - while ((entry = readdir(dir)) != NULL) - { - if (strcmp(entry->d_name, ".") && strcmp(entry->d_name, "..") && - lstat(entry->d_name, &fi) == 0) - { - if (S_ISDIR(fi.st_mode)) - { - walk_dir_and_chown(entry->d_name, - my_uid, admin_uid, tuid, tgid); - } - - if ((my_uid == fi.st_uid || admin_uid == fi.st_uid) - && tuid != fi.st_uid) - { - lchown(entry->d_name, tuid, tgid); - } - } - } - - closedir(dir); - - if (dirName[0] != '/') - { - chdir(".."); - } - } -} -*/ - void admin_chown(const char *path, uid_t tuid, const char *tuser, gid_t tgid, const char *tgrp) { @@ -661,8 +613,6 @@ fatal_error("Can't create directory %s (error: %s)", dir, system_errmsg()); } - logUninstallInfo(CONFIGDIR, "admin", "admin", dir); - /* make sure the config directory is owned by the ssuser */ sprintf(tstr, "%s", CONFIGDIR); chown_file(SSuser, SSgroup, tstr); @@ -683,7 +633,6 @@ fclose(f); chmod(tstr, S_IRUSR | S_IWUSR); chown_file(SSuser, SSgroup, tstr); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); hexp = make_shexp(hosts); aexp = make_shexp(addrs); @@ -713,6 +662,10 @@ if (installMode == Interactive) printf("Changing ownership to admin user %s...\n", adminUser); admin_chown(CONFIGDIR, tuid, adminUser, tgid, tgp->gr_name); + admin_chown(SECURITYDIR, tuid, adminUser, tgid, tgp->gr_name); + admin_chown(LOGDIR, tuid, adminUser, tgid, tgp->gr_name); + sprintf(tstr, "%s/%s", PIDDIR, PIDFILE); + admin_chown(tstr, tuid, adminUser, tgid, tgp->gr_name); #ifdef HPUX /* @@ -953,12 +906,12 @@ * Write Tasks node */ - configTasks(&ldap, DATADIR, sieDN); + configTasks(&ldap, LDIFDIR, sieDN); // Write global configuration paramters char *adminDomainDN; adminDomainDN = formAdminDomainDN(adminDomain); - configGlobalParameters(&ldap, DATADIR, adminDomainDN); + configGlobalParameters(&ldap, LDIFDIR, adminDomainDN); nsSetupFree (adminDomainDN); /* @@ -1003,125 +956,6 @@ admConf.write(tstr); chmod(tstr, S_IRUSR | S_IWUSR); chown_file(SSuser, SSgroup, tstr); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - - // Mark to remove the following guys which are - // created later on also - sprintf(tstr, "%s/local.conf", CONFIGDIR); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - sprintf(tstr, "%s/access", LOGDIR); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - sprintf(tstr, "%s/error", LOGDIR); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - sprintf(tstr, "%s/admpw.log", LOGDIR); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - sprintf(tstr, "%s/dsconfig.log", LOGDIR); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - - /* PVO remember to set access permission here */ - - char **httparray = (char **)malloc(5*sizeof(char *)); /* 2 tokens, 2 replacements, NULL terminated */ - char **admservarray = (char **)malloc(3*sizeof(char *)); /* 1 token, 1 replacement, NULL terminated */ - char **consolearray = (char **)malloc(11*sizeof(char *)); /* 5 tokens, 5 replacements, NULL terminated */ - char **nssarray = (char **)malloc(3*sizeof(char *)); /* 1 token, 1 replacement, NULL terminated */ - char **startarray = (char **)malloc(5*sizeof(char *)); /* 2 tokens, 2 replacements, NULL terminated */ - char **stoparray = (char **)malloc(3*sizeof(char *)); /* 1 token, 1 replacement, NULL terminated */ - char **restartarray = (char **)malloc(3*sizeof(char *)); /* 1 token, 1 replacement, NULL terminated */ - - char src[BIG_BUF]; - - - httparray[0] = "%%%sroot%%%"; - httparray[1] = (char *)CONFIGDIR; - httparray[2] = "%%%module_dir%%%"; - httparray[3] = (char *)apacheRoot; - httparray[4] = NULL; - - admservarray[0] = "%%%sroot%%%"; - admservarray[1] = (char *)CONFIGDIR; - admservarray[2] = NULL; - - nssarray[0] = "%%%sroot%%%"; - nssarray[1] = (char *)CONFIGDIR; - nssarray[2] = NULL; - - consolearray[0] = "%%%sroot%%%"; - consolearray[1] = (char *)CONFIGDIR; - consolearray[2] = "%%%httpduser%%%"; - consolearray[3] = (char *)SSuser; - consolearray[4] = "%%%httpdgroup%%%"; - consolearray[5] = (char *)SSgroup; - consolearray[6] = "%%%httpport%%%"; - consolearray[7] = (char *)dir; /* sprint'd earlier */ - consolearray[8] = NULL; - - startarray[0] = "%%%sroot%%%"; - startarray[1] = (char *)CONFIGDIR; - startarray[2] = "%%%httpd%%%"; - startarray[3] = (char *)apache; - startarray[4] = NULL; - - stoparray[0] = "%%%sroot%%%"; - stoparray[1] = (char *)CONFIGDIR; - stoparray[2] = NULL; - - restartarray[0] = "%%%sroot%%%"; - restartarray[1] = (char *)CONFIGDIR; - restartarray[2] = NULL; - - if (0 == strncmp(apacheVersion, "2.2", 3)) { - snprintf(src, sizeof(tstr), "%s/template/httpd-2.2.conf.tmpl", CONFIGDIR); - } else { - snprintf(src, sizeof(tstr), "%s/template/httpd.conf.tmpl", CONFIGDIR); - } - snprintf(tstr, sizeof(tstr), "%s/httpd.conf", CONFIGDIR); - replaceTokensInFile(src, tstr, httparray); - chmod(tstr, S_IRUSR | S_IWUSR); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - - snprintf(tstr, sizeof(tstr), "%s/admserv.conf", CONFIGDIR); - snprintf(src, sizeof(tstr), "%s/template/admserv.conf.tmpl", CONFIGDIR); - replaceTokensInFile(src, tstr, admservarray); - chmod(tstr, S_IRUSR | S_IWUSR); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - - snprintf(tstr, sizeof(tstr), "%s/nss.conf", CONFIGDIR); - snprintf(src, sizeof(tstr), "%s/template/nss.conf.tmpl", CONFIGDIR); - replaceTokensInFile(src, tstr, nssarray); - chmod(tstr, S_IRUSR | S_IWUSR); - chown_file(SSuser, SSgroup, tstr); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - - snprintf(tstr, sizeof(tstr), "%s/console.conf", CONFIGDIR); - /* - all of the dynamic information goes into console.conf, so we should - not overwrite that information during an upgrade */ - if (stat(tstr, &st)) { - snprintf(src, sizeof(tstr), "%s/template/console.conf.tmpl", CONFIGDIR); - replaceTokensInFile(src, tstr, consolearray); - chmod(tstr, S_IRUSR | S_IWUSR); - chown_file(SSuser, SSgroup, tstr); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - } - - snprintf(tstr, sizeof(tstr), "%s/start-admin", CONFIGDIR); - snprintf(src, sizeof(tstr), "%s/template/start-admin.tmpl", CONFIGDIR); - replaceTokensInFile(src, tstr, startarray); - chmod(tstr, 0755); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - - snprintf(tstr, sizeof(tstr), "%s/stop-admin", CONFIGDIR); - snprintf(src, sizeof(tstr), "%s/template/stop-admin.tmpl", CONFIGDIR); - replaceTokensInFile(src, tstr, stoparray); - chmod(tstr, 0755); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - - snprintf(tstr, sizeof(tstr), "%s/restart-admin", CONFIGDIR); - snprintf(src, sizeof(tstr), "%s/template/restart-admin.tmpl", CONFIGDIR); - replaceTokensInFile(src, tstr, restartarray); - chmod(tstr, 0755); - logUninstallInfo(CONFIGDIR, "admin", "admin", tstr); - { // Generating local.conf @@ -1225,117 +1059,6 @@ return OKAY; } - -/* - Substitutes an occurance of token with replacement in the given string. - str should point at the beginning of token e.g. use like this: - if (str = strstr(line, token)) { - replaceToken(str, token, replacement); - } - - str is modified in place, so it should have enough room for the replacement -*/ -static void -replaceTokenInStr(char *str, const char *token, const char *replacement) -{ - int offset; - int tlen = strlen(token); /* length of the token string */ - int rlen = strlen(replacement); /* length of the replacement string */ - char *limit = str + (tlen < rlen ? tlen : rlen); /* where token or repl ends, shortest */ - const char *rp = replacement; /* for iteration */ - - /* up to limit, it is safe to just replace the token with the replacement */ - while (str < limit) { - *str++ = *rp++; - } - - /* at this point, we have 1 of 3 states: - tlen == rlen - the token is exactly as long as the replacement - we are finished - tlen > rlen - the token is longer than the replacement - we need - to copy back str to "fill in" the string - tlen < rlen - the replacement is longer than the token - we need - to copy forward str to make room for the replacement - */ - offset = rlen - tlen; - if (offset > 0) { - /* first move the pointer to the end of the string */ - while (*str) { - str++; - } - /* str now points to the null terminator - we need to copy that too */ - /* next, move the chars to make room for the replacement */ - while (str >= limit) { - *(str + offset) = *str; - str--; - } - /* finally, finish writing the replacement */ - while (*rp) { - *limit++ = *rp++; - } - } else if (offset < 0) { - /* move str back to fill in space */ - while (1) { - /* offset is negative, so - a - == a + */ - *str = *(str - offset); - if (!*str) { /* copied null - exit */ - break; - } - str++; - } - } /* else offset is 0 - done */ - - return; -} - -/* - copy sourcefile to destfile, replacing the tokens in source file with the - replacement values in destfile. The array ary is an array of strings of - alternately tokens and their replacements e.g. - %%%sroot%%% - /opt/fedora-ds - %%%port%%% - 3234 - %%%httpd%%% - /usr/sbin/httpd.worker - NULL - - ary must be NULL terminated -*/ -static void -replaceTokensInFile(const char *sourcefile, const char *destfile, const char * const *ary) -{ - FILE *src, *dest; - char line[2048]; - - src = fopen (sourcefile, "r"); - if (src == NULL) { - fatal_error("Cannot open %s", sourcefile, 0); - } - - /* The output file */ - dest = fopen (destfile, "w"); - if (dest == NULL) { - fatal_error("Cannot open %s for writing", destfile, 0); - } - - while (fgets(line, sizeof(line), src)) { - const char * const * argp = ary; - for (; argp && *argp; argp += 2) { - const char *token = *argp; - const char *replacement = *(argp + 1); - char *str; - while (str = strstr(line, token)) { - replaceTokenInStr(str, token, replacement); - } - } - fputs(line, dest); - } - - fclose(dest); - fclose(src); - -} /* ----------------------- main ------------------------ */

16 years, 11 months

1
0
0 / 0

[Fedora-directory-commits] adminserver/admserv/cfgstuff restart-ds-admin.in, NONE, 1.1 start-ds-admin.in, NONE, 1.1 stop-ds-admin.in, NONE, 1.1 restart-admin.in, 1.1, NONE start-admin.in, 1.1, NONE stop-admin.in, 1.1, NONE

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2777/cfgstuff Added Files: restart-ds-admin.in start-ds-admin.in stop-ds-admin.in Removed Files: restart-admin.in start-admin.in stop-admin.in Log Message: rename scripts to x-ds-admin; fix uid change in config.c; remove obsolete snmp CGIs --- NEW FILE restart-ds-admin.in --- #!/bin/sh # BEGIN COPYRIGHT BLOCK # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # END COPYRIGHT BLOCK @cmdbindir@/stop-admin sleep 3 @cmdbindir@/start-admin --- NEW FILE start-ds-admin.in --- #!/bin/sh # BEGIN COPYRIGHT BLOCK # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # END COPYRIGHT BLOCK # This script sets up the environment for the httpd server and starts it. # for httpd, on RHEL, this will typically be something like /usr/sbin/httpd.worker # On HP-UX, this may be /opt/hpws/apache/bin/httpd. unset PASSWORD_PIPE LD_LIBRARY_PATH=@LIBPATH@:${LD_LIBRARY_PATH};export LD_LIBRARY_PATH LIBPATH=@LIBPATH@:${LIBPATH}:/usr/threads/lib:/usr/ibmcxx/lib:/usr/lib:/lib; export LIBPATH SHLIB_PATH=@LIBPATH@:${SHLIB_PATH}; export SHLIB_PATH HTTPD=@HTTPD@ # see if httpd is linked with the openldap libraries - we need to override them OS=`uname -s` if [ $OS = "Linux" ]; then hasol=0 /usr/bin/ldd $HTTPD 2>&1 | grep libldap > /dev/null 2>&1 && hasol=1 if [ $hasol -eq 1 ] ; then LD_PRELOAD="@nss_libdir(a)/libssl3.so @ldapsdk_libdir(a)/libldap60.so" export LD_PRELOAD fi fi $HTTPD -k start -f @configdir(a)/httpd.conf "$@" --- NEW FILE stop-ds-admin.in --- #!/bin/sh # BEGIN COPYRIGHT BLOCK # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # END COPYRIGHT BLOCK PID_FILE=@piddir@/@pidfile@ if test -f $PID_FILE ; then kill -TERM -`cat $PID_FILE` if test $? -ne 0 ; then exit 1 fi else echo server not running exit 1 fi loop_counter=1 max_count=30 while test $loop_counter -le $max_count; do loop_counter=`expr $loop_counter + 1` if test -f $PID_FILE ; then sleep 2 else exit 0 fi done echo server not responding to exit command echo killing process group kill -9 -`cat $PID_FILE` rm $PID_FILE exit 1 --- restart-admin.in DELETED --- --- start-admin.in DELETED --- --- stop-admin.in DELETED ---

16 years, 11 months

1
0
0 / 0

[Fedora-directory-commits] setuputil/installer/unix/lib ux-util.cc, 1.2, 1.3 ux-util.h, 1.1.1.1, 1.2 ux-wrapper.cc, 1.3, 1.4

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/setuputil/installer/unix/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv592/setuputil/installer/unix/lib Modified Files: ux-util.cc ux-util.h ux-wrapper.cc Log Message: Resolves: bug 239494 Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc. Fix Description: We only really need one config file - adm.conf - so just add extra fields as necessary. Reviewed by: nhosoi (Thanks!) Index: ux-util.cc =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/lib/ux-util.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ux-util.cc 23 Mar 2006 15:59:22 -0000 1.2 +++ ux-util.cc 9 May 2007 00:27:48 -0000 1.3 @@ -27,6 +27,12 @@ ** UNIX Only ** HISTORY: ** $Log$ +** Revision 1.3 2007/05/09 00:27:48 rmeggins +** Resolves: bug 239494 +** Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc. +** Fix Description: We only really need one config file - adm.conf - so just add extra fields as necessary. +** Reviewed by: nhosoi (Thanks!) +** ** Revision 1.2 2006/03/23 15:59:22 rmeggins ** Bug(s) fixed: 186280 ** Bug Description: Close potential security vulnerabilities in CGI code @@ -279,45 +285,6 @@ /********************************************************************* ** -** FUNCTION: getDefaultHostname -** DESCRIPTION: -** Get the default hostname as previously configured. -** -** INPUTS: hn - input buffer -** OUTPUTS: hn - host name, if found -** RETURN: 0 (good), -1 (failure) -** SIDE EFFECTS: -** None -** RESTRICTIONS: -** None -** MEMORY: -** hn is expected to point to a valid memory location. -********************************************************************** -*/ - -NSString -InstUtil::getDefaultHostName(const char *sroot) -{ - char tstr[BIG_BUF]; - NSString hn; - NVPair *admconf; - - snprintf(tstr, sizeof(tstr), "%s/%s", sroot, DEFAULT_ADMINCONF); - tstr[sizeof(tstr)-1] = 0; - - admconf = new NVPair(tstr); - - if (admconf->isEmpty() == False) - { - hn = admconf->get("ServerName"); - } - - delete admconf; - return hn; -} - -/********************************************************************* -** ** FUNCTION: getHostIpAddress ** DESCRIPTION: ** Get the IP address associated with a given host name @@ -364,7 +331,7 @@ ** Tries to get the SuiteSpot User ID previously configured ** for the existing installation. ** -** INPUTS: sroot - server root +** INPUTS: CONFIGDIR - directory path containing the config file DEFAULT_ADMINCONF ** OUTPUTS: ** RETURN: ssUser ** SIDE EFFECTS: @@ -372,29 +339,28 @@ ** RESTRICTIONS: ** None ** MEMORY: -** ssUser and ssGroup are expected to point to valid memory buf. +** temp stack NSString is returned ********************************************************************** */ NSString -InstUtil::getDefaultUser(const char *sroot) +InstUtil::getDefaultUser(const char *configdir) { char tstr[BIG_BUF]; - NVPair *ssconf; + NVPair admconf; NSString ssUser; - snprintf(tstr, sizeof(tstr), "%s/%s", sroot, DEFAULT_SSUSERCONF); + snprintf(tstr, sizeof(tstr), "%s/%s", configdir, DEFAULT_ADMINCONF); tstr[sizeof(tstr)-1] = 0; - ssconf = new NVPair(tstr); + admconf.setFormat(2); + admconf.read(tstr); - if (ssconf->isEmpty() == False) + if (admconf.isEmpty() == False) { - ssUser = ssconf->get("SuiteSpotUser"); + ssUser = admconf.get("sysuser"); } - delete ssconf; - return ssUser; } @@ -405,7 +371,7 @@ ** Tries to get the SuiteSpot User ID previously configured ** for the existing installation. ** -** INPUTS: sroot - server root +** INPUTS: CONFIGDIR - directory path containing the config file DEFAULT_ADMINCONF ** OUTPUTS: ** RETURN: default Group ** SIDE EFFECTS: @@ -413,69 +379,31 @@ ** RESTRICTIONS: ** None ** MEMORY: -** +** temp stack NSString is returned ********************************************************************** */ NSString -InstUtil::getDefaultGroup(const char *sroot) +InstUtil::getDefaultGroup(const char *configdir) { char tstr[BIG_BUF]; - NVPair *ssconf; + NVPair admconf; NSString ssGroup; - snprintf(tstr, sizeof(tstr), "%s/%s", sroot, DEFAULT_SSUSERCONF); + snprintf(tstr, sizeof(tstr), "%s/%s", configdir, DEFAULT_ADMINCONF); tstr[sizeof(tstr)-1] = 0; - ssconf = new NVPair(tstr); + admconf.setFormat(2); + admconf.read(tstr); - if (ssconf->isEmpty() == False) + if (admconf.isEmpty() == False) { - ssGroup = ssconf->get("SuiteSpotGroup"); + ssGroup = admconf.get("sysgroup"); } - delete ssconf; - return ssGroup; } -/********************************************************************* -** -** FUNCTION: getAdmPwd -** DESCRIPTION: -** -** -** -** INPUTS: -** OUTPUTS: -** RETURN: -** SIDE EFFECTS: -** none -** RESTRICTIONS: -** None -** MEMORY: -** -********************************************************************** -*/ -NSString -InstUtil::getAdmPwd(const char *serverRoot) -{ - char temp[BIG_BUF]; - NVPair admpw; - const char *pwd = NULL; - - snprintf(temp, sizeof(temp), "%s/admin-serv/config/adm.conf", serverRoot); - temp[sizeof(temp)-1] = 0; - admpw.setFormat(2); - - admpw.read(temp); - pwd = admpw.get("siepid"); - - return pwd; -} - - - /********************************************************************* ** Index: ux-util.h =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/lib/ux-util.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ux-util.h 29 Jul 2005 22:16:33 -0000 1.1.1.1 +++ ux-util.h 9 May 2007 00:27:48 -0000 1.2 @@ -27,6 +27,12 @@ ** HISTORY ** ** $Log$ +** Revision 1.2 2007/05/09 00:27:48 rmeggins +** Resolves: bug 239494 +** Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc. +** Fix Description: We only really need one config file - adm.conf - so just add extra fields as necessary. +** Reviewed by: nhosoi (Thanks!) +** ** Revision 1.1.1.1 2005/07/29 22:16:33 foxworth ** Importing new setup sdk for open source project ** @@ -161,10 +167,10 @@ * Giving a server root, get the default Ldap information */ extern void getDefaultLdapInfo ( - const char *sroot, - char **ldapURL, - char **ldapUser, - char **installDN); + const char *configdir, /* dir containing DEFAULT_ADMINCONF */ + char **ldapURL, /* config DS url */ + char **ldapUser, /* uid of console/adminserver admin */ + char **admin_domain); /* admin domain */ void unescape_ldap_basedn(char *str); @@ -190,8 +196,8 @@ extern int availUser(const char *user); extern int availGroup(const char *user, const char *group); extern char *getDefaultHostName(const char *sroot); -extern char *getDefaultUser(const char *sroot); -extern char *getDefaultGroup(const char *sroot); +extern char *getDefaultUser(const char *configdir); +extern char *getDefaultGroup(const char *configdir); extern char *getSysVersion(); extern char *getCurrentDir(void); extern Bool dirWritable(const char *dirName); @@ -353,28 +359,6 @@ /* * MEMBER: - * InstUtil::getDefaultHostName - * DESCRIPTION: - * Giving a server root, get the configured FQDN of my machine - * - * INPUTS: - * - * OUTPUTS: - * - * RETURN: - * - * EXCEPTION THROWN - * - * RESTRICTIONS: - * - * MEMORY: - * - */ - - static NSString getDefaultHostName(const char *sroot); - - /* - * MEMBER: * InstUtil::getHostIpAddress * DESCRIPTION: * Giving a host name, get the associated IP address. @@ -398,8 +382,8 @@ * InstUtil::getDefaultUser * InstUtil::getDefaultGroup * DESCRIPTION: - * Giving a server root, get the configured UNIX user ID/group - * to run servers as. + * Giving the directory path containing the file DEFAULT_ADMINCONF + * get the configured UNIX user ID/group to run servers as. * INPUTS: * * OUTPUTS: @@ -414,30 +398,8 @@ * */ - static NSString getDefaultUser(const char *sroot); - static NSString getDefaultGroup (const char *sroot); - - /* - * MEMBER: - * InstUtil::getAdmPwd - * DESCRIPTION: - * Giving a server root, get the Admin's password that - * could be used to authenticate with DS - * INPUTS: - * server root - * OUTPUTS: - * Admin's password - * RETURN: - * the admin's password (allocated) - * EXCEPTION THROWN - * - * RESTRICTIONS: - * - * MEMORY: - * - */ - - static NSString getAdmPwd(const char *sroot); + static NSString getDefaultUser(const char *configdir); + static NSString getDefaultGroup (const char *configdir); /* * MEMBER: Index: ux-wrapper.cc =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/lib/ux-wrapper.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ux-wrapper.cc 30 Mar 2006 00:38:29 -0000 1.3 +++ ux-wrapper.cc 9 May 2007 00:27:48 -0000 1.4 @@ -29,6 +29,12 @@ ** HISTORY: ** ** $Log$ +** Revision 1.4 2007/05/09 00:27:48 rmeggins +** Resolves: bug 239494 +** Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc. +** Fix Description: We only really need one config file - adm.conf - so just add extra fields as necessary. +** Reviewed by: nhosoi (Thanks!) +** ** Revision 1.3 2006/03/30 00:38:29 rmeggins ** Add using namespace std; after the include <iostream> ** Remove #include <iostream.h> in files that also include nsdefs.h @@ -121,21 +127,15 @@ return strdup(sysVersion.data()); } -char *getDefaultHostName(const char *sroot) -{ - NSString hn = InstUtil::getDefaultHostName(sroot); - return strdup(hn.data()); -} - -char *getDefaultUser(const char *sroot) +char *getDefaultUser(const char *configdir) { - NSString us = InstUtil::getDefaultUser(sroot); + NSString us = InstUtil::getDefaultUser(configdir); return strdup(us.data()); } -char *getDefaultGroup(const char *sroot) +char *getDefaultGroup(const char *configdir) { - NSString ug = InstUtil::getDefaultGroup(sroot); + NSString ug = InstUtil::getDefaultGroup(configdir); return strdup(ug.data()); } char *getCurrentDir(void)

16 years, 11 months

1
0
0 / 0

[Fedora-directory-commits] setuputil/installer/unix installer.cc, 1.6, 1.7 product.cc, 1.6, 1.7

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/setuputil/installer/unix In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv592/setuputil/installer/unix Modified Files: installer.cc product.cc Log Message: Resolves: bug 239494 Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc. Fix Description: We only really need one config file - adm.conf - so just add extra fields as necessary. Reviewed by: nhosoi (Thanks!) Index: installer.cc =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/installer.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- installer.cc 4 Apr 2007 22:29:46 -0000 1.6 +++ installer.cc 9 May 2007 00:27:48 -0000 1.7 @@ -27,14 +27,11 @@ ** ** HISTORY: ** $Log$ -** Revision 1.6 2007/04/04 22:29:46 nhosoi -** Resolves: #234893 -** Summary: Build SetupUtil with autotools (Comment #13, #15) -** Changes: 1) resource file and inf file could be an absolute path, -** or they could be located in the same dir as dssetup binary or -** in $datadir/setuputil. -** 2) dssetup does not issue "Notice: Your LD_LIBRARY_PATH variable is set to .." -** since the library path is set in the wrapper script by the autotools. +** Revision 1.7 2007/05/09 00:27:48 rmeggins +** Resolves: bug 239494 +** Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc. +** Fix Description: We only really need one config file - adm.conf - so just add extra fields as necessary. +** Reviewed by: nhosoi (Thanks!) ** ** Revision 1.5 2006/03/27 21:18:35 nhosoi ** [186642] Directory Server Makefile updates for Internal build @@ -801,42 +798,9 @@ if (filename) { - /* - * resource file can be specified in the [General] section of setup.inf - * # All dialog strings can be defined in a resource file (optional). - * Resource = setup.res - * The value can be an absolute path. - * If the value is a relative path or just a file name, - * first the code checks if the value starting from the - * setup binary location exists. - * If it does not exist, then it checks in PROPERTYDIR, - * which is defined at the build time. - * If the resource value is set and the file does not exist, - * it issues an warning and steps forward. - */ - NSString resourceFile = NULL; - if ('/' == *filename) /* absolute path */ - { - resourceFile = filename; - } - else - { - resourceFile = _baseDir + "/" + filename; - if (InstUtil::fileExists(resourceFile) == False) - { - /* the file is not in _baseDir (where dssetup is located) */ - resourceFile = NSString(PROPERTYDIR) + "/" + filename; - } - } - if (InstUtil::fileExists(resourceFile) == False) - { - setupLogMessage(WARN, "Setup", - "Resource file %s does not exist.\n", resourceFile); - } - else - { - customResource.read(resourceFile); - } + NSString resourceFile; + resourceFile = _baseDir + "/" + filename; + customResource.read(resourceFile); } // Even without resource file defined, we still want to @@ -971,6 +935,8 @@ /* * Start the first stage - common installer's questions */ + + printNotice(); prepreInstall(); if (_installMode == Silent) @@ -1470,44 +1436,20 @@ { NSString infFile; - /* - * sourceDir: start point to look for inf file (infName) - * infName: - * The value can be an absolute path. - * If the value is a relative path or just a file name, - * first the code checks if the value starting from sourceDir. - * If it does not exist, then it checks in PROPERTYDIR, - * which is defined at the build time. - */ - if ('/' == *infName) /* absolute path */ - { - infFile = infName; - } - else - { - infFile = sourceDir + "/"; - infFile = infFile + infName; + infFile = sourceDir + "/"; + infFile = infFile + infName; - if (InstUtil::fileExists(infFile) == False) - { - /* the file is not in sourceDir, try PROPERTYDIR */ - infFile = NSString(PROPERTYDIR) + "/" + infName; - } - } - /* - * If the resource value is set and the file does not exist, it returns -1. - */ if (InstUtil::fileExists(infFile) == False) { - return -1; /* infFile does not exist */ + return -1; } - + if (sourceDir == _sourceDir && _newSuiteSpot.numComponents()) { return 0; } - if (_newSuiteSpot.retrieveSuiteSpot(sourceDir, infFile) == 0 && _newSuiteSpot.numComponents()) + if (_newSuiteSpot.retrieveSuiteSpot(sourceDir, infName) == 0 && _newSuiteSpot.numComponents()) { _newSuiteSpot.getComponents()->sortComponents(); _newSuiteSpot.select(); @@ -3353,3 +3295,50 @@ { return _checkDomainName; } + + + +void +Installer::printNotice() +{ + /* Bug 408242: Check if the LD_LIBRARY_PATH/SHLIB_PATH is set. + * If so, display a warning. Also, unset ENV variable. + */ + + char *lib_name = NULL, *lib_path = NULL, tmp[XSM_BUF], *env_path = NULL; + +#if defined (HPUX) + lib_name = strdup("SHLIB_PATH"); +#else + lib_name = strdup("LD_LIBRARY_PATH"); +#endif + + memset(tmp, '\0', XSM_BUF); + if (lib_path = getenv(lib_name)) + { + DialogManager::disableWinMode(); + printf("\n%s %s %s\n\n", "Notice: Your", lib_name, "variable is set to:"); + printf("\t%s\n\n", lib_path); + printf("%s %s %s\n", "Please unset", lib_name, "or verify that the"); + printf("%s\n", "above setting is correct before continuing with"); + printf("%s\n", "the installation. An incorrect setting may cause"); + printf("%s\n", "problems during the installation such as the wrong"); + printf("%s\n\n", "copy of a shared library being used."); + if (_installMode != Silent) + { + printf("%s", "Continue [n]? "); + fflush(stdout); + fgets(tmp, sizeof(tmp), stdin); + if (tmp[0] == 'n' || tmp[0] == 'N' || tmp[0] == '\0' || (tmp[0] < 0x20)) + { + free(lib_name); + exit(0); + } + } + } + + free(lib_name); + + env_path = strdup("ENV="); + putenv(env_path); +} Index: product.cc =================================================================== RCS file: /cvs/dirsec/setuputil/installer/unix/product.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- product.cc 4 Apr 2007 22:29:46 -0000 1.6 +++ product.cc 9 May 2007 00:27:48 -0000 1.7 @@ -27,14 +27,11 @@ ** ** HISTORY: ** $Log$ -** Revision 1.6 2007/04/04 22:29:46 nhosoi -** Resolves: #234893 -** Summary: Build SetupUtil with autotools (Comment #13, #15) -** Changes: 1) resource file and inf file could be an absolute path, -** or they could be located in the same dir as dssetup binary or -** in $datadir/setuputil. -** 2) dssetup does not issue "Notice: Your LD_LIBRARY_PATH variable is set to .." -** since the library path is set in the wrapper script by the autotools. +** Revision 1.7 2007/05/09 00:27:48 rmeggins +** Resolves: bug 239494 +** Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc. +** Fix Description: We only really need one config file - adm.conf - so just add extra fields as necessary. +** Reviewed by: nhosoi (Thanks!) ** ** Revision 1.5 2006/03/23 15:59:17 rmeggins ** Bug(s) fixed: 186280 @@ -637,29 +634,7 @@ // This is top level master configuration file init(); - /* - * sourceDir: start point to look for inf file (infName) - * infName: - * The value can be an absolute path. - * If the value is a relative path or just a file name, - * first the code checks if the value starting from sourceDir. - * If it does not exist, then it checks in PROPERTYDIR, - * which is defined at the build time. - */ - if ('/' == *fileName) /* absolute path */ - { - snprintf(tstr, sizeof(tstr), "%s", fileName); - } - else - { - NSString setupFile = sourceDir + "/" + fileName; - if (InstUtil::fileExists(setupFile) == False) - { - /* the file is not in sourceDir, try PROPERTYDIR */ - setupFile = NSString(PROPERTYDIR) + "/" + fileName; - } - snprintf(tstr, sizeof(tstr), "%s", setupFile.data(), fileName); - } + snprintf(tstr, sizeof(tstr), "%s/%s", sourceDir.data(), fileName); tstr[sizeof(tstr)-1] = 0; _packageInfo = new PackageInfo(tstr); @@ -724,29 +699,7 @@ init(); - /* - * sourceDir: start point to look for inf file (fileName) - * fileame: - * The value can be an absolute path. - * If the value is a relative path or just a file name, - * first the code checks if the value starting from sourceDir. - * If it does not exist, then it checks in PROPERTYDIR, - * which is defined at the build time. - */ - if ('/' == *fileName) /* absolute path */ - { - snprintf(tstr, sizeof(tstr), "%s", fileName); - } - else - { - NSString subFile = sourceDir + "/" + fileName; - if (InstUtil::fileExists(subFile) == False) - { - /* the file is not in sourceDir, try PROPERTYDIR */ - subFile = NSString(PROPERTYDIR) + "/" + fileName; - } - snprintf(tstr, sizeof(tstr), "%s", subFile.data(), fileName); - } + snprintf(tstr, sizeof(tstr), "%s/%s", sourceDir.data(), fileName); tstr[sizeof(tstr)-1] = 0; _packageInfo = new PackageInfo(tstr);

16 years, 11 months

1
0
0 / 0

[Fedora-directory-commits] setuputil/installer/lib global.cpp, 1.1.1.1, 1.2 ldapu.cpp, 1.2, 1.3 setupapi.cpp, 1.2, 1.3

by Doctor Conrad

Author: rmeggins Update of /cvs/dirsec/setuputil/installer/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv592/setuputil/installer/lib Modified Files: global.cpp ldapu.cpp setupapi.cpp Log Message: Resolves: bug 239494 Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc. Fix Description: We only really need one config file - adm.conf - so just add extra fields as necessary. Reviewed by: nhosoi (Thanks!) Index: global.cpp =================================================================== RCS file: /cvs/dirsec/setuputil/installer/lib/global.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- global.cpp 29 Jul 2005 22:16:28 -0000 1.1.1.1 +++ global.cpp 9 May 2007 00:27:48 -0000 1.2 @@ -28,6 +28,12 @@ ** ** HISTORY: ** $Log$ +** Revision 1.2 2007/05/09 00:27:48 rmeggins +** Resolves: bug 239494 +** Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc. +** Fix Description: We only really need one config file - adm.conf - so just add extra fields as necessary. +** Reviewed by: nhosoi (Thanks!) +** ** Revision 1.1.1.1 2005/07/29 22:16:28 foxworth ** Importing new setup sdk for open source project ** @@ -202,11 +208,9 @@ #endif #ifndef XP_WIN32 -const char *DEFAULT_LDAPSWITCH = SETUP_DEFAULT_LDAPSWITCH; const char *DEFAULT_ADMINUSER = "admin"; const char *DEFAULT_ADMINPWD = "admin"; -const char *DEFAULT_SSUSERCONF = "shared/config/ssusers.conf"; -const char *DEFAULT_ADMINCONF = "admin-serv/config/ns-admin.conf"; +const char *DEFAULT_ADMINCONF = SETUP_ADM_CONF; const char *DEFAULT_SSUSER = "nobody"; const char *DEFAULT_SSGROUP = "nobody"; const char *DEFAULT_SROOT = "/opt/fedora"; Index: ldapu.cpp =================================================================== RCS file: /cvs/dirsec/setuputil/installer/lib/ldapu.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ldapu.cpp 27 Mar 2006 21:18:35 -0000 1.2 +++ ldapu.cpp 9 May 2007 00:27:48 -0000 1.3 @@ -29,6 +29,12 @@ ** ** HISTORY: ** $Log$ +** Revision 1.3 2007/05/09 00:27:48 rmeggins +** Resolves: bug 239494 +** Description: setuputil: use adm.conf instead of dbswitch.conf, ldap.conf, etc. +** Fix Description: We only really need one config file - adm.conf - so just add extra fields as necessary. +** Reviewed by: nhosoi (Thanks!) +** ** Revision 1.2 2006/03/27 21:18:35 nhosoi ** [186642] Directory Server Makefile updates for Internal build ** Changed the createSIE so that caller (Admin Server and Directory Server) passes @@ -1683,7 +1689,7 @@ } else { - *p++ = NULL; + *p++ = '\0'; gotEntry = True; stripBlank(buf, True); stripBlank(p, False); Index: setupapi.cpp =================================================================== RCS file: /cvs/dirsec/setuputil/installer/lib/setupapi.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- setupapi.cpp 23 Mar 2006 15:59:10 -0000 1.2 +++ setupapi.cpp 9 May 2007 00:27:48 -0000 1.3 @@ -572,11 +572,12 @@ ** there. ** ** INPUTS: -** sroot - server root +** configdir - directory containing the config file DEFAULT_ADMINCONF ** ldapURL - ldap url to be returned ** ldapUser - optional bind user id to be returned +** adminDomain - admin domain ** -** OUTPUTS: ldapURL, ldapUser, bindDN, bindPwd +** OUTPUTS: ldapURL, ldapUser, adminDomain ** RETURN: none ** SIDE EFFECTS: ** none @@ -593,19 +594,17 @@ char **adminDomain) { char tstr[BIG_BUF]; - snprintf(tstr, sizeof(tstr), "%s/%s", sroot, SETUP_LDAP_CONF); + snprintf(tstr, sizeof(tstr), "%s/%s", sroot, DEFAULT_ADMINCONF); if (!memchr(tstr, 0, sizeof(tstr))) return; /*overflow*/ + + NVPair admConf; + + admConf.setFormat(2); + admConf.read(tstr); + if (ldapURL) { - *ldapURL = setupGetFileString("ConfigURL", " ", tstr); - if (*ldapURL == NULL) - { - char dbswith[BIG_BUF]; - snprintf(dbswith, sizeof(dbswith), "%s/%s", sroot, SETUP_DEFAULT_LDAPSWITCH); - if (!memchr(dbswith, 0, sizeof(dbswith))) return; /*overflow*/ - *ldapURL = setupGetFileString("directory default", " ", dbswith); - } - + *ldapURL = setupStrdup(admConf.get("ldapurl")); if (*ldapURL && ldap_is_ldap_url(*ldapURL)) { unescape_ldap_basedn(*ldapURL); @@ -614,24 +613,12 @@ if (ldapUser) { - *ldapUser = setupGetFileString("admnm", " ", tstr); + *ldapUser = setupStrdup(admConf.get("userdn")); } if (adminDomain) { - *adminDomain = setupGetFileString(DS_ADMIN_DOMAIN, ":", tstr); - if (*adminDomain == NULL) - { - char *s = NULL; - snprintf(tstr, sizeof(tstr), "%s/%s", sroot, SETUP_DS_CONF); - if (!memchr(tstr, 0, sizeof(tstr))) return; /*overflow*/ - s = setupGetFileString(DS_ADMIN_DOMAIN, ":", tstr); - if (s) - { - *adminDomain = setupStripAdminDomainDN(s); - setupFree(s); - } - } + *adminDomain = setupStrdup(admConf.get(DS_ADMIN_DOMAIN)); } return; @@ -642,7 +629,7 @@ ** FUNCTION: setupSetDefaultLdapInfo ** replaced: getDefaultLdapInfo ** DESCRIPTION: -** Set Config Ldap information to ldap.conf. Caller needs to fill the +** Set Config Ldap information to adm.conf. Caller needs to fill the ** value to each argument. NULL means not to change the existing value. ** ** INPUTS: @@ -658,7 +645,7 @@ ** RESTRICTIONS: ** None ** MEMORY: -** Returned memory is allocated for char ** parameters +** none ********************************************************************** */ @@ -668,55 +655,18 @@ char *adminDomain) { char tstr[BIG_BUF]; - char *oldLines[2]; - char *newLines[2]; - char buffer[100]; - - if (ldapURL) - { - - snprintf(tstr, sizeof(tstr), "%s/%s", sroot, SETUP_DEFAULT_LDAPSWITCH); - if (!memchr(tstr, 0, sizeof(tstr))) return; /*overflow*/ - oldLines[1] = NULL; - newLines[1] = NULL; - snprintf(buffer, sizeof(buffer), "directory default %s", ldapURL); - if (!memchr(buffer, 0, sizeof(buffer))) return; /*overflow*/ - - oldLines[0] = (char *)"directory default "; - newLines[0] = buffer; - setupFileUpdateLines(oldLines, newLines, tstr); - } - - if (ldapUser) - { - snprintf(tstr, sizeof(tstr), "%s/%s", sroot, SETUP_LDAP_CONF); - if (!memchr(tstr, 0, sizeof(tstr))) return; /*overflow*/ - - oldLines[1] = NULL; - newLines[1] = NULL; - snprintf(buffer, sizeof(buffer), "admnm %s", ldapUser); - if (!memchr(buffer, 0, sizeof(buffer))) return; /*overflow*/ - - oldLines[0] = (char *)"admnm"; - newLines[0] = buffer; - setupFileUpdateLines(oldLines, newLines, tstr); - } + snprintf(tstr, sizeof(tstr), "%s/%s", sroot, DEFAULT_ADMINCONF); + if (!memchr(tstr, 0, sizeof(tstr))) return; /*overflow*/ - if (adminDomain) - { - snprintf(tstr, sizeof(tstr), "%s/%s", sroot, SETUP_DS_CONF); - if (!memchr(tstr, 0, sizeof(tstr))) return; /*overflow*/ + NVPair admConf; - oldLines[1] = NULL; - newLines[1] = NULL; - snprintf(buffer, sizeof(buffer), "%s:%s", DS_ADMIN_DOMAIN, adminDomain); - if (!memchr(buffer, 0, sizeof(buffer))) return; /*overflow*/ - - oldLines[0] = (char *) DS_ADMIN_DOMAIN; - newLines[0] = buffer; - setupFileUpdateLines(oldLines, newLines, tstr); - } + admConf.setFormat(2); + admConf.read(tstr); + admConf.set("ldapurl", ldapURL); + admConf.set("userdn", ldapUser); + admConf.set(DS_ADMIN_DOMAIN, adminDomain); + admConf.write(); return; } @@ -1138,7 +1088,7 @@ return malloc(size); } NSAPI_EXTERN char * - setupStrdup(char *src) + setupStrdup(const char *src) { if (!(src)) { @@ -2912,147 +2862,3 @@ return (unsigned long)(((unsigned long long)buf.f_bavail / 1024.0) * buf.f_frsize); #endif } - -/********************************************************************* -** -** FUNCTION: setupFileUpdateLines -** DESCRIPTION: replace multiple lines to new lines in existing text file. -** -** INPUTS: -** oldLines -- existing lines to match. -** newLines -- replacement lines for each oldLines -** OUTPUTS: -** if successful, the file will be replaced with new one. -** RETURN: -** 0 -- success -** 1 -- file can't open for read -** 2 -- can't write the file. -** 3 -- out of memory -** Note: -** setupReplaceLines does case insensitive match between each line from file -** and oldLines. When matching, string length is based on oldLines. -** Thus caller can pass "partial" line as oldLines and replaced it with -** newLines. oldLines and newLines should be in sync. Last item in oldLines -** should be set to NULL. -********************************************************************** -*/ - - -int setupFileUpdateLines(char *oldLines[], char *newLines[], char *fileName) -{ - char line[1024]; - struct stat statbuf; - long size; - FILE *fp; - char *buffer; - int origbuflen; - int buflen; - int *updateList; - int n; - int extraSize; - int i; - - n = 0; - extraSize = 0; - while (newLines[n] != NULL) - { - extraSize += strlen(newLines[n]); - n ++; - } - - updateList = (int *) malloc(n); - if (updateList == NULL) - return 3; - for (i = 0; i < n; i++) - { - updateList[i] = 0; - } - - if (stat(fileName, &statbuf) != 0) - { - buflen = extraSize + 1; - buffer = (char *) malloc(buflen); - if (buffer == NULL) - return 3; - buffer[0] = '\0'; - } - else - { - size = statbuf.st_size; - - if ((fp = fopen(fileName, "r")) == NULL) - return 1; - - /* - * get replacement count - */ - - origbuflen = buflen = size + extraSize + 1; - buffer = (char *) malloc(buflen); - if (buffer == NULL) - return 3; - - buffer[0] = '\0'; - - /* - * replace necessary lines and save them to memory - */ - while(fgets(line, sizeof(line), fp)) - { - for (i = 0; i < n; i ++) - { - if (strncasecmp(line, oldLines[i], strlen(oldLines[i])) == 0) - { - strncat(buffer, newLines[i], buflen); - buflen -= strlen(newLines[i]); - strncat(buffer, "\n", buflen); - buflen -= 1; - if (buflen <= 0) { - buffer[origbuflen - 1] = '\0'; - goto error_out; /* overflow: write at least what we have */ - } - updateList[i] = 1; - } - else - { - strncat(buffer, line, buflen); - buflen -= strlen(line); - strncat(buffer, "\n", buflen); - buflen -= 1; - if (buflen <= 0) { - buffer[origbuflen - 1] = '\0'; - goto error_out; /* overflow: write at least what we have */ - } - } - } - } - fclose(fp); - } - - for (i = 0; (i < n) && (updateList[i] == 0); i++) - { - strncat(buffer, newLines[i], buflen); - buflen -= strlen(newLines[i]); - strncat(buffer, "\n", buflen); - buflen -= 1; - if (buflen <= 0) { - buffer[origbuflen - 1] = '\0'; - goto error_out; /* overflow: write at least what we have */ - } - updateList[i] = 1; - } -error_out: - /* - * write from memory to file - */ - if ((fp = fopen(fileName, "w")) == NULL) - return 2; - - fwrite(buffer, sizeof(char), strlen(buffer), fp); - - free(buffer); - - fclose(fp); - - return 0; -}

16 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits May 2007