389-commits February 2010

389-commits@lists.fedoraproject.org

4 participants
61 discussions

2 commits - ldap/admin Makefile.am Makefile.in wrappers/migratecred.in wrappers/mmldif.in wrappers/pwdhash.in
by Richard Allen Megginson 26 Feb '10

26 Feb '10

Makefile.am | 2 ++ Makefile.in | 2 ++ ldap/admin/src/scripts/start-dirsrv.in | 4 ++-- ldap/admin/src/scripts/template-bak2db.in | 2 +- ldap/admin/src/scripts/template-db2bak.in | 2 +- ldap/admin/src/scripts/template-db2index.in | 2 +- ldap/admin/src/scripts/template-db2ldif.in | 2 +- ldap/admin/src/scripts/template-dbverify.in | 2 +- ldap/admin/src/scripts/template-ldif2db.in | 2 +- ldap/admin/src/scripts/template-restoreconfig.in | 4 ++-- ldap/admin/src/scripts/template-saveconfig.in | 4 ++-- ldap/admin/src/scripts/template-suffix2instance.in | 4 ++-- ldap/admin/src/scripts/template-upgradedb.in | 4 ++-- ldap/admin/src/scripts/template-vlvindex.in | 4 ++-- wrappers/migratecred.in | 2 +- wrappers/mmldif.in | 2 +- wrappers/pwdhash.in | 2 +- 17 files changed, 25 insertions(+), 21 deletions(-) New commits: commit 91bc19ddbd2b5f8bed2bf74fcfad7ddbd150a133 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Thu Feb 25 20:18:56 2010 -0700 Bug 568196 - Install DS8.2 on Solaris fails - part 2 https://bugzilla.redhat.com/show_bug.cgi?id=568196 Resolves: bug 568196 Bug Description: Install DS8.2 on Solaris fails - part 2 Reviewed by: self Branch: HEAD Fix Description: Add pcre_libdir to all script wrappers that call ns-slapd, such as ldif2db, etc. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no (cherry picked from commit 24245075d03955f26b6c827b123ac002ff16c012) diff --git a/ldap/admin/src/scripts/template-bak2db.in b/ldap/admin/src/scripts/template-bak2db.in index 90ef464..12d46ca 100755 --- a/ldap/admin/src/scripts/template-bak2db.in +++ b/ldap/admin/src/scripts/template-bak2db.in @@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}" if [ "$prefix" = "/" ] ; then prefix="" fi -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@ if [ -n "$prefix" ] ; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" fi diff --git a/ldap/admin/src/scripts/template-db2bak.in b/ldap/admin/src/scripts/template-db2bak.in index 261919f..a0fe1f5 100755 --- a/ldap/admin/src/scripts/template-db2bak.in +++ b/ldap/admin/src/scripts/template-db2bak.in @@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}" if [ "$prefix" = "/" ] ; then prefix="" fi -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@ if [ -n "$prefix" ] ; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" fi diff --git a/ldap/admin/src/scripts/template-db2index.in b/ldap/admin/src/scripts/template-db2index.in index 8f9b0c6..e0e9a55 100755 --- a/ldap/admin/src/scripts/template-db2index.in +++ b/ldap/admin/src/scripts/template-db2index.in @@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}" if [ "$prefix" = "/" ] ; then prefix="" fi -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@ if [ -n "$prefix" ] ; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" fi diff --git a/ldap/admin/src/scripts/template-db2ldif.in b/ldap/admin/src/scripts/template-db2ldif.in index 2f74670..e519f3e 100755 --- a/ldap/admin/src/scripts/template-db2ldif.in +++ b/ldap/admin/src/scripts/template-db2ldif.in @@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}" if [ "$prefix" = "/" ] ; then prefix="" fi -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@ if [ -n "$prefix" ] ; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" fi diff --git a/ldap/admin/src/scripts/template-dbverify.in b/ldap/admin/src/scripts/template-dbverify.in index b5e56d9..0f71450 100755 --- a/ldap/admin/src/scripts/template-dbverify.in +++ b/ldap/admin/src/scripts/template-dbverify.in @@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}" if [ "$prefix" = "/" ] ; then prefix="" fi -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@ if [ -n "$prefix" ] ; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" fi diff --git a/ldap/admin/src/scripts/template-ldif2db.in b/ldap/admin/src/scripts/template-ldif2db.in index 83c579e..ce64193 100755 --- a/ldap/admin/src/scripts/template-ldif2db.in +++ b/ldap/admin/src/scripts/template-ldif2db.in @@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}" if [ "$prefix" = "/" ] ; then prefix="" fi -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@ if [ -n "$prefix" ] ; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" fi diff --git a/ldap/admin/src/scripts/template-restoreconfig.in b/ldap/admin/src/scripts/template-restoreconfig.in index dc210cb..0e5de9b 100755 --- a/ldap/admin/src/scripts/template-restoreconfig.in +++ b/ldap/admin/src/scripts/template-restoreconfig.in @@ -1,9 +1,9 @@ #!/bin/sh prefix="{{DS-ROOT}}" -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export LD_LIBRARY_PATH -SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export SHLIB_PATH cd {{SERVERBIN-DIR}} diff --git a/ldap/admin/src/scripts/template-saveconfig.in b/ldap/admin/src/scripts/template-saveconfig.in index 1ce5d07..737c97b 100755 --- a/ldap/admin/src/scripts/template-saveconfig.in +++ b/ldap/admin/src/scripts/template-saveconfig.in @@ -1,9 +1,9 @@ #!/bin/sh prefix="{{DS-ROOT}}" -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export LD_LIBRARY_PATH -SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export SHLIB_PATH cd {{SERVERBIN-DIR}} diff --git a/ldap/admin/src/scripts/template-suffix2instance.in b/ldap/admin/src/scripts/template-suffix2instance.in index dadb5f9..994f8af 100755 --- a/ldap/admin/src/scripts/template-suffix2instance.in +++ b/ldap/admin/src/scripts/template-suffix2instance.in @@ -1,9 +1,9 @@ #!/bin/sh prefix="{{DS-ROOT}}" -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export LD_LIBRARY_PATH -SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export SHLIB_PATH cd {{SERVERBIN-DIR}} diff --git a/ldap/admin/src/scripts/template-upgradedb.in b/ldap/admin/src/scripts/template-upgradedb.in index ef3fdf2..9b6f03d 100755 --- a/ldap/admin/src/scripts/template-upgradedb.in +++ b/ldap/admin/src/scripts/template-upgradedb.in @@ -1,9 +1,9 @@ #!/bin/sh prefix="{{DS-ROOT}}" -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export LD_LIBRARY_PATH -SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export SHLIB_PATH cd {{SERVERBIN-DIR}} diff --git a/ldap/admin/src/scripts/template-vlvindex.in b/ldap/admin/src/scripts/template-vlvindex.in index 4c61e0d..e6cd743 100755 --- a/ldap/admin/src/scripts/template-vlvindex.in +++ b/ldap/admin/src/scripts/template-vlvindex.in @@ -1,9 +1,9 @@ #!/bin/sh prefix="{{DS-ROOT}}" -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export LD_LIBRARY_PATH -SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export SHLIB_PATH cd {{SERVERBIN-DIR}} commit 9d02126770da84e2a48e9b3c0c36536131c4d71a Author: Rich Megginson <rmeggins(a)redhat.com> Date: Thu Feb 25 11:10:53 2010 -0700 Bug 568196 - Install DS8.2 on Solaris fails https://bugzilla.redhat.com/show_bug.cgi?id=568196 Resolves: bug 568196 Bug Description: Install DS8.2 on Solaris fails Reviewed by: nhosoi (Thanks!) Branch: HEAD Fix Description: Add pcre_libdir to script wrappers for programs that use pcre Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no (cherry picked from commit 3d27198f45b4b25df667d3f86dce66a44f4bc65d) diff --git a/Makefile.am b/Makefile.am index 7b903ae..c3ec2f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1291,6 +1291,7 @@ fixupcmd = sed \ -e 's,@sasl_libdir\@,$(libdir),g' \ -e 's,@sasl_path\@,$(libdir)/sasl2,g' \ -e 's,@netsnmp_libdir\@,$(libdir),g' \ + -e 's,@pcre_libdir\@,$(libdir),g' \ -e 's,@propertydir\@,$(propertydir),g' \ -e 's,@datadir\@,$(datadir),g' \ -e 's,@schemadir\@,$(schemadir),g' \ @@ -1344,6 +1345,7 @@ fixupcmd = sed \ -e 's,@sasl_libdir\@,$(sasl_libdir),g' \ -e 's,@sasl_path\@,@sasl_path@,g' \ -e 's,@netsnmp_libdir\@,$(netsnmp_libdir),g' \ + -e 's,@pcre_libdir\@,$(pcre_libdir),g' \ -e 's,@propertydir\@,$(propertydir),g' \ -e 's,@datadir\@,$(datadir),g' \ -e 's,@schemadir\@,$(schemadir),g' \ diff --git a/Makefile.in b/Makefile.in index 0a8b5ab..bc4b1a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2270,6 +2270,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS @BUNDLE_FALSE@ -e 's,@sasl_libdir\@,$(sasl_libdir),g' \ @BUNDLE_FALSE@ -e 's,@sasl_path\@,@sasl_path@,g' \ @BUNDLE_FALSE@ -e 's,@netsnmp_libdir\@,$(netsnmp_libdir),g' \ +@BUNDLE_FALSE@ -e 's,@pcre_libdir\@,$(pcre_libdir),g' \ @BUNDLE_FALSE@ -e 's,@propertydir\@,$(propertydir),g' \ @BUNDLE_FALSE@ -e 's,@datadir\@,$(datadir),g' \ @BUNDLE_FALSE@ -e 's,@schemadir\@,$(schemadir),g' \ @@ -2333,6 +2334,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS @BUNDLE_TRUE@ -e 's,@sasl_libdir\@,$(libdir),g' \ @BUNDLE_TRUE@ -e 's,@sasl_path\@,$(libdir)/sasl2,g' \ @BUNDLE_TRUE@ -e 's,@netsnmp_libdir\@,$(libdir),g' \ +@BUNDLE_TRUE@ -e 's,@pcre_libdir\@,$(libdir),g' \ @BUNDLE_TRUE@ -e 's,@propertydir\@,$(propertydir),g' \ @BUNDLE_TRUE@ -e 's,@datadir\@,$(datadir),g' \ @BUNDLE_TRUE@ -e 's,@schemadir\@,$(schemadir),g' \ diff --git a/ldap/admin/src/scripts/start-dirsrv.in b/ldap/admin/src/scripts/start-dirsrv.in index fb9bfdb..46c48d7 100755 --- a/ldap/admin/src/scripts/start-dirsrv.in +++ b/ldap/admin/src/scripts/start-dirsrv.in @@ -22,9 +22,9 @@ start_instance() { fi prefix="$DS_ROOT" - LD_LIBRARY_PATH=$prefix$SERVER_DIR:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ + LD_LIBRARY_PATH=$prefix$SERVER_DIR:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:@pcre_libdir@ export LD_LIBRARY_PATH - SHLIB_PATH=$prefix$SERVER_DIR:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ + SHLIB_PATH=$prefix$SERVER_DIR:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:@pcre_libdir@ export SHLIB_PATH DS_CONFIG_DIR=$CONFIG_DIR diff --git a/wrappers/migratecred.in b/wrappers/migratecred.in index c1aeabf..dd44800 100755 --- a/wrappers/migratecred.in +++ b/wrappers/migratecred.in @@ -4,7 +4,7 @@ ## (1) Specify variables used by this script. ## ############################################################################### -LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ +LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@pcre_libdir@ BIN_DIR=@bindir@ COMMAND=migratecred-bin diff --git a/wrappers/mmldif.in b/wrappers/mmldif.in index 3a89ce4..a11932e 100755 --- a/wrappers/mmldif.in +++ b/wrappers/mmldif.in @@ -4,7 +4,7 @@ ## (1) Specify variables used by this script. ## ############################################################################### -LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ +LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@pcre_libdir@ BIN_DIR=@bindir@ COMMAND=mmldif-bin diff --git a/wrappers/pwdhash.in b/wrappers/pwdhash.in index ab84914..b3ef3fa 100755 --- a/wrappers/pwdhash.in +++ b/wrappers/pwdhash.in @@ -4,7 +4,7 @@ ## (1) Specify variables used by this script. ## ############################################################################### -LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ +LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@pcre_libdir@ BIN_DIR=@bindir@ COMMAND=pwdhash-bin

1 0

Changes to 'refs/tags/389-admin-1.1.11.a2'
by Richard Allen Megginson 26 Feb '10

26 Feb '10

Changes since 389-admin-1.1.11.a1: Nathan Kinder (2): Make check for threaded httpd work with Apache 2.0 Bug 460209 - Correct configure help message Noriko Hosoi (2): 560827 - Admin Server templates: DistinguishName validation fails 560827 - Admin Server: DistinguishName validation fails Rich Megginson (2): bump version to 1.1.11.a2 Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong loca --- Makefile.am | 2 Makefile.in | 2 VERSION.sh | 2 admserv/cgi-src40/htmladmin.c | 15 ++ admserv/newinst/src/dirserver.map.in | 1 admserv/newinst/src/register_param.map.in | 1 admserv/schema/ldif/00nsroot_backend.ldif.tmpl | 5 admserv/schema/ldif/01nsroot.ldif.tmpl | 26 ++-- admserv/schema/ldif/02globalpreferences.ldif.tmpl | 46 ++++---- admserv/schema/ldif/10dsdata.ldif.tmpl | 64 +++++------ admserv/schema/ldif/10rm_dsdata.ldif.tmpl | 10 - admserv/schema/ldif/11dstasks.ldif.tmpl | 68 ++++++------ admserv/schema/ldif/12dsconfig.mod.tmpl | 6 - admserv/schema/ldif/13dsschema.mod.tmpl | 6 - admserv/schema/ldif/16dssuffixadmin.mod.tmpl | 6 - admserv/schema/ldif/20asdata.ldif.tmpl | 54 ++++----- admserv/schema/ldif/21astasks.ldif.tmpl | 78 +++++++------- admserv/schema/ldif/22ascommands.ldif.tmpl | 8 - admserv/schema/ldif/asmigrate.ldif.tmpl | 10 - configure | 115 ++++++++++++++------ configure.ac | 31 ++++- include/libadmin/libadmin.h | 13 ++ lib/libadmin/util.c | 121 ++++++++++++++++++++++ m4/httpd.m4 | 15 +- 24 files changed, 458 insertions(+), 247 deletions(-) ---

1 0

Changes to 'refs/tags/389-adminutil-1.1.10'
by Richard Allen Megginson 26 Feb '10

26 Feb '10

Changes since the dawn of time: Nathan Kinder (5): Fixed parsing of supported emulations in nsarch Resolves: 213070 Related: 213070 Resolves: 246124 Resolves: 247192 Noriko Hosoi (20): [161407] Fixed the library path for the 64-bit build on Solaris. libadminutil##.<ext> should not link SSL related ldapsdk libraries. *** empty log message *** [172166] Admin Util RPM [172166] Admin Util build (64-bit) [172166] Admin Util build (IPF) [Bug 172166] Admin Util build (IPF) [Bug 172166] Admin Util build (IPF) [179394] HP-UX PA-RISC support [179394] HP-UX IPF/PA-RISC support upgraded LDAP C SDK: v5.16 -> v5.17 Replaced PL_Free with PR_Free. [161099] admin passwd in clear text in adm.conf [172166] Admin Util build (RPM) [195258] Changes for the internal build Removed the link arg to link with libCrun.so.1 since there is no C++ code Resolves: #186280 Resolves: Bug 237356 Fixed a minor bug introduced in the revision 1.6. Resolves: #191834 Rich Megginson (45): change binary directory naming convention to the same one we use with pre-built binary components; remove old crufty Fortezza stuff; general makefile cleanup Bug(s) fixed: 171799 make PERL5 use perl from PATH on Linux The correct naming convention for RHEL is 1) Fix moz objdir name for generic linux x86_64 Bug(s) fixed: 186280 Bug: 186280 use new ldapcsdk 6.0.0; upgrade other components Reviewed by: nhosoi (Thanks!) Bug(s) fixed: 213788 Bug: 213788 Resolves: bug 234420 Resolves: bug 239475 bump version to 1.1.1 bump version to 1.1.1 add support for -version-number when building shared libs; fix a couple of minor issues brought up in fedora package review pkgconfig is a requires, not a build requires final spec fix for fedora Resolves: bug 235293 Resolves: bug 245208 Resolves: bug 245208 Resolves: bug 245396 bump version to 1.1.2 bump version to 1.1.3 Resolves: bug 250526 Resolves: bug 323381 bump version to 1.1.5 Resolves: bug 245248 bump version to 1.1.6 Resolves: bug 413531 Resolves: bug 454060 the correct function name is admldapSetDirectoryURL bump version to 1.1.7 Resolves: bug 462411 compiler warning clean up Resolves: bug 466137 fix compiler warning bump version to 1.1.8 the 1.1.8 release Rename adminutil to 389-adminutil added .gitignore use icu genrb from path if no icu_bin given or found Bug 460168 - FedoraDS' adminutil requires non-existent "icu.pc" on non-RH/Fedora OS remove adminutil.pc.in bump version to 1.1.10 foxworth (1): Internal Red Hat CVS project for adminutil: core

1 0

configure configure.ac Makefile.am Makefile.in
by Richard Allen Megginson 26 Feb '10

26 Feb '10

Makefile.am | 2 - Makefile.in | 2 - configure | 100 ++++++++++++++++++++++++++++++++++++++--------------------- configure.ac | 33 +++++++++++++++---- 4 files changed, 95 insertions(+), 42 deletions(-) New commits: commit 2accc35200d504503a9bfeffcb9a0de1b2ccc327 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Fri Feb 26 11:18:09 2010 -0700 Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location on non-RHEL/Fedora OS https://bugzilla.redhat.com/show_bug.cgi?id=460162 Resolves: bug 460162 Bug Description: FedoraDS "with-FHS" installs init.d StartupScript in wrong location on non-RHEL/Fedora OS Reviewed by: nkinder (Thanks!) Branch: HEAD Fix Description: There is no LSB or FHS standard for the init script location, and it varies widely across systems and even linux distros. I've added a --with-initddir (default $(sysconfig)/rc.d) so that the location can be specified. Note that this changes the initdir parameter to be an absolute path, instead of relative to sysconfdir. Some systems do not use /etc at all for this (e.g. HPUX uses /init.d). Platforms tested: RHEL5 x86_64 Flag Day: yes - autotool file change Doc impact: no diff --git a/Makefile.am b/Makefile.am index 671bb1c..7b903ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -125,7 +125,7 @@ schemadir = $(sysconfdir)@schemadir@ serverdir = $(libdir)@serverdir@ serverplugindir = $(libdir)@serverplugindir@ taskdir = $(datadir)@scripttemplatedir@ -initdir = $(sysconfdir)@initdir@ +initdir = @initdir@ initconfigdir = $(sysconfdir)@initconfigdir@ instconfigdir = @instconfigdir@ perldir = $(libdir)@perldir@ diff --git a/Makefile.in b/Makefile.in index e8523d2..0a8b5ab 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1080,7 +1080,7 @@ includedir = @includedir@ infdir = $(datadir)@infdir@ infodir = @infodir@ initconfigdir = $(sysconfdir)@initconfigdir@ -initdir = $(sysconfdir)@initdir@ +initdir = @initdir@ install_sh = @install_sh@ instconfigdir = @instconfigdir@ kerberos_inc = @kerberos_inc@ diff --git a/configure b/configure index 644f176..08774f0 100755 --- a/configure +++ b/configure @@ -1076,6 +1076,9 @@ Optional Packages: Base directory for instance specific writable configuration directories (default $sysconfdir/$PACKAGE_NAME) + --with-initddir=/path Absolute path (not relative like some of the other + options) that should contain the SysV init scripts + (default '$(sysconfdir)/rc.d') --with-nspr=PATH Netscape Portable Runtime (NSPR) directory --with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory --with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory @@ -4389,7 +4392,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4392 "configure"' > conftest.$ac_ext + echo '#line 4395 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5524,7 +5527,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5527:" \ +echo "$as_me:5530:" \ "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 @@ -6587,11 +6590,11 @@ else -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:6590: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6593: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6594: \$? = $ac_status" >&5 + echo "$as_me:6597: \$? = $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. @@ -6855,11 +6858,11 @@ else -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:6858: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6861: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6862: \$? = $ac_status" >&5 + echo "$as_me:6865: \$? = $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. @@ -6959,11 +6962,11 @@ else -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:6962: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6965: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6966: \$? = $ac_status" >&5 + echo "$as_me:6969: \$? = $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 @@ -8428,7 +8431,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8431 "configure"' > conftest.$ac_ext + echo '#line 8434 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9325,7 +9328,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9328 "configure" +#line 9331 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9425,7 +9428,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9428 "configure" +#line 9431 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11768,11 +11771,11 @@ else -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:11771: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11774: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11775: \$? = $ac_status" >&5 + echo "$as_me:11778: \$? = $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. @@ -11872,11 +11875,11 @@ else -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:11875: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11878: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11879: \$? = $ac_status" >&5 + echo "$as_me:11882: \$? = $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 @@ -12408,7 +12411,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12411 "configure"' > conftest.$ac_ext + echo '#line 12414 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13466,11 +13469,11 @@ else -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:13469: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13472: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13473: \$? = $ac_status" >&5 + echo "$as_me:13476: \$? = $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. @@ -13570,11 +13573,11 @@ else -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:13573: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13576: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13577: \$? = $ac_status" >&5 + echo "$as_me:13580: \$? = $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 @@ -15019,7 +15022,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 15022 "configure"' > conftest.$ac_ext + echo '#line 15025 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15797,11 +15800,11 @@ else -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:15800: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15803: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15804: \$? = $ac_status" >&5 + echo "$as_me:15807: \$? = $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. @@ -16065,11 +16068,11 @@ else -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:16068: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16071: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16072: \$? = $ac_status" >&5 + echo "$as_me:16075: \$? = $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. @@ -16169,11 +16172,11 @@ else -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:16172: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16175: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16176: \$? = $ac_status" >&5 + echo "$as_me:16179: \$? = $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 @@ -17638,7 +17641,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17641 "configure"' > conftest.$ac_ext + echo '#line 17644 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -23441,8 +23444,30 @@ fi # Deal with platform dependent defines -# relative to sysconfdir -initdir=/rc.d +# initdir is the location for the SysV init scripts - very heavily platform +# dependent and not specified in fhs or lsb +initdir='$(sysconfdir)/rc.d' +echo "$as_me:$LINENO: checking for --with-initddir" >&5 +echo $ECHO_N "checking for --with-initddir... $ECHO_C" >&6 + +# Check whether --with-initddir or --without-initddir was given. +if test "${with_initddir+set}" = set; then + withval="$with_initddir" + + if test "$withval" = yes -o "$withval" = no ; then + { { echo "$as_me:$LINENO: error: Please specify a full path with --with-initddir" >&5 +echo "$as_me: error: Please specify a full path with --with-initddir" >&2;} + { (exit 1); exit 1; }; } + fi + echo "$as_me:$LINENO: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 + +else + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi; # on most platforms, we will just use perl from PATH # On some platforms, we cannot. Why not just use any old # perl? Because of perldap. We use a perldap that is @@ -23489,8 +23514,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF platform="linux" - # relative to sysconfdir - initdir=/rc.d/init.d + initdir='$(sysconfdir)/rc.d/init.d' # do arch specific linux stuff here case $host in i*86-*-linux*) @@ -23730,6 +23754,8 @@ _ACEOF perlexec='/opt/perl_64/bin/perl' platform="hpux" initconfigdir="/$PACKAGE_NAME/config" + # HPUX doesn't use /etc for this + initdir=/init.d ;; hppa*-hp-hpux*) @@ -23791,6 +23817,8 @@ _ACEOF initconfigdir="/$PACKAGE_NAME/config" perlexec='/opt/perl_64/bin/perl' platform="hpux" + # HPUX doesn't use /etc for this + initdir=/init.d ;; sparc-sun-solaris*) @@ -23876,14 +23904,18 @@ _ACEOF platform="solaris" # assume 64 bit perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl' - # relative to sysconfdir - initdir=/init.d + initdir='$(sysconfdir)/init.d' ;; *) platform="" ;; esac +# cmd line overrides default setting above +if test -n "$with_initddir" ; then + initdir="$with_initddir" +fi + # set default initconfigdir if not already set diff --git a/configure.ac b/configure.ac index 6bf9f8a..68a6d80 100644 --- a/configure.ac +++ b/configure.ac @@ -312,8 +312,22 @@ AC_SUBST(instconfigdir) AM_CONDITIONAL([WINNT], false) # Deal with platform dependent defines -# relative to sysconfdir -initdir=/rc.d +# initdir is the location for the SysV init scripts - very heavily platform +# dependent and not specified in fhs or lsb +initdir='$(sysconfdir)/rc.d' +AC_MSG_CHECKING(for --with-initddir) +AC_ARG_WITH(initddir, + AS_HELP_STRING([--with-initddir=/path], + [Absolute path (not relative like some of the other options) that should contain the SysV init scripts (default '$(sysconfdir)/rc.d')]), +[ + if test "$withval" = yes -o "$withval" = no ; then + AC_ERROR([Please specify a full path with --with-initddir]) + fi + AC_MSG_RESULT($withval) +], +[ + AC_MSG_RESULT(no) +]) # on most platforms, we will just use perl from PATH # On some platforms, we cannot. Why not just use any old # perl? Because of perldap. We use a perldap that is @@ -332,8 +346,7 @@ case $host in AC_DEFINE([LINUX2_4], [1], [Linux 2.4]) AC_DEFINE([_GNU_SOURCE], [1], [GNU Source]) platform="linux" - # relative to sysconfdir - initdir=/rc.d/init.d + initdir='$(sysconfdir)/rc.d/init.d' # do arch specific linux stuff here case $host in i*86-*-linux*) @@ -369,6 +382,8 @@ case $host in perlexec='/opt/perl_64/bin/perl' platform="hpux" initconfigdir="/$PACKAGE_NAME/config" + # HPUX doesn't use /etc for this + initdir=/init.d ;; hppa*-hp-hpux*) AC_DEFINE([XP_UNIX], [1], [UNIX]) @@ -386,6 +401,8 @@ case $host in initconfigdir="/$PACKAGE_NAME/config" perlexec='/opt/perl_64/bin/perl' platform="hpux" + # HPUX doesn't use /etc for this + initdir=/init.d ;; sparc-sun-solaris*) AC_DEFINE([XP_UNIX], [1], [UNIX]) @@ -416,13 +433,17 @@ dnl Cstd and Crun are required to link any C++ related code platform="solaris" # assume 64 bit perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl' - # relative to sysconfdir - initdir=/init.d + initdir='$(sysconfdir)/init.d' ;; *) platform="" ;; esac + +# cmd line overrides default setting above +if test -n "$with_initddir" ; then + initdir="$with_initddir" +fi AC_SUBST(initdir) AC_SUBST(perlexec)

1 0

2 commits - configure configure.ac ltmain.sh Makefile.am Makefile.in VERSION.sh
by Richard Allen Megginson 26 Feb '10

26 Feb '10

Makefile.am | 2 - Makefile.in | 2 - VERSION.sh | 2 - configure | 98 +++++++++++++++++++++++++++++++++++++++-------------------- configure.ac | 31 +++++++++++++++--- 5 files changed, 94 insertions(+), 41 deletions(-) New commits: commit 5ddb5afff730c46f82fc1b6c040e87d7ce303100 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Fri Feb 26 12:05:31 2010 -0700 Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong loca https://bugzilla.redhat.com/show_bug.cgi?id=460162 Resolves: bug 460162 Bug Description: FedoraDS "with-FHS" installs init.d StartupScript in wrong Reviewed by: nkinder (Thanks!) Branch: HEAD Fix Description: There is no LSB or FHS standard for the init script locatio and it varies widely across systems and even linux distros. I've added a --with-initddir (default $(sysconfig)/rc.d) so that the location can be specified. Note that this changes the initdir parameter to be an absolute path, instead of relative to sysconfdir. Some systems do not use /etc at al for this (e.g. HPUX uses /init.d). Platforms tested: RHEL5 x86_64 Flag Day: yes - autotool file change Doc impact: no diff --git a/Makefile.am b/Makefile.am index f84257b..4c2bf24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,7 +61,7 @@ icondir = $(datadir)@icondir@ httpdconf = @httpdconf@ manualdir = $(datadir)@manualdir@ helpdir = $(manualdir)/help -initdir = $(sysconfdir)@initdir@ +initdir = @initdir@ initconfigdir = $(sysconfdir)@initconfigdir@ instconfigdir = @instconfigdir@ instancename = @instancename@ diff --git a/Makefile.in b/Makefile.in old mode 100755 new mode 100644 index 3c9521b..c2b03a9 --- a/Makefile.in +++ b/Makefile.in @@ -435,7 +435,7 @@ includedir = @includedir@ infdir = $(datadir)@infdir@ infodir = @infodir@ initconfigdir = $(sysconfdir)@initconfigdir@ -initdir = $(sysconfdir)@initdir@ +initdir = @initdir@ install_sh = @install_sh@ instancename = @instancename@ instconfigdir = @instconfigdir@ diff --git a/configure b/configure index bf06e3a..2582ca3 100755 --- a/configure +++ b/configure @@ -1057,6 +1057,9 @@ Optional Packages: include additional configurations [automatic] --with-fhs Use FHS layout --with-fhs-opt Use FHS optional layout + --with-initddir=/path Absolute path (not relative like some of the other + options) that should contain the SysV init scripts + (default '$(sysconfdir)/rc.d') --with-fortitude=PATH Fortitude root directory (default: $default_fortitudedir) --with-httpd=PATH Full path of Apache binary. Configure will usually @@ -4355,7 +4358,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4358 "configure"' > conftest.$ac_ext + echo '#line 4361 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5490,7 +5493,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5493:" \ +echo "$as_me:5496:" \ "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 @@ -6553,11 +6556,11 @@ else -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:6556: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6559: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6560: \$? = $ac_status" >&5 + echo "$as_me:6563: \$? = $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. @@ -6821,11 +6824,11 @@ else -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:6824: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6827: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6828: \$? = $ac_status" >&5 + echo "$as_me:6831: \$? = $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. @@ -6925,11 +6928,11 @@ else -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:6928: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6931: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6932: \$? = $ac_status" >&5 + echo "$as_me:6935: \$? = $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 @@ -8394,7 +8397,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8397 "configure"' > conftest.$ac_ext + echo '#line 8400 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9291,7 +9294,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9294 "configure" +#line 9297 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9391,7 +9394,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9394 "configure" +#line 9397 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11734,11 +11737,11 @@ else -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:11737: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11740: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11741: \$? = $ac_status" >&5 + echo "$as_me:11744: \$? = $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. @@ -11838,11 +11841,11 @@ else -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:11841: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11844: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11845: \$? = $ac_status" >&5 + echo "$as_me:11848: \$? = $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 @@ -12374,7 +12377,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12377 "configure"' > conftest.$ac_ext + echo '#line 12380 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -13432,11 +13435,11 @@ else -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:13435: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13438: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13439: \$? = $ac_status" >&5 + echo "$as_me:13442: \$? = $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. @@ -13536,11 +13539,11 @@ else -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:13539: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13542: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13543: \$? = $ac_status" >&5 + echo "$as_me:13546: \$? = $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 @@ -14985,7 +14988,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 14988 "configure"' > conftest.$ac_ext + echo '#line 14991 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15763,11 +15766,11 @@ else -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:15766: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15769: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15770: \$? = $ac_status" >&5 + echo "$as_me:15773: \$? = $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. @@ -16031,11 +16034,11 @@ else -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:16034: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16037: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16038: \$? = $ac_status" >&5 + echo "$as_me:16041: \$? = $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. @@ -16135,11 +16138,11 @@ else -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:16138: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16141: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16142: \$? = $ac_status" >&5 + echo "$as_me:16145: \$? = $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 @@ -17604,7 +17607,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17607 "configure"' > conftest.$ac_ext + echo '#line 17610 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -23078,7 +23081,30 @@ httpdgroup=nobody admservport=9830 admservip=0.0.0.0 # initdir -initdir=/rc.d +# initdir is the location for the SysV init scripts - very heavily platform +# dependent and not specified in fhs or lsb +initdir='$(sysconfdir)/rc.d' +echo "$as_me:$LINENO: checking for --with-initddir" >&5 +echo $ECHO_N "checking for --with-initddir... $ECHO_C" >&6 + +# Check whether --with-initddir or --without-initddir was given. +if test "${with_initddir+set}" = set; then + withval="$with_initddir" + + if test "$withval" = yes -o "$withval" = no ; then + { { echo "$as_me:$LINENO: error: Please specify a full path with --with-initddir" >&5 +echo "$as_me: error: Please specify a full path with --with-initddir" >&2;} + { (exit 1); exit 1; }; } + fi + echo "$as_me:$LINENO: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 + +else + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi; CXXLINK_REQUIRED=0 # on most platforms, we will just use perl from PATH # On some platforms, we cannot. Why not just use any old @@ -23106,8 +23132,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF platform="linux" - # relative to sysconfdir - initdir=/rc.d/init.d + initdir='$(sysconfdir)/rc.d/init.d' ;; ia64-hp-hpux*) @@ -23161,6 +23186,8 @@ _ACEOF httpdgroup=nogroup platform="hpux" initconfigdir="/$PACKAGE_NAME/config" + # HPUX doesn't use /etc for this + initdir=/init.d ;; hppa*-hp-hpux*) @@ -23214,6 +23241,8 @@ _ACEOF perlexec='/opt/perl_64/bin/perl' platform="hpux" initconfigdir="/$PACKAGE_NAME/config" + # HPUX doesn't use /etc for this + initdir=/init.d ;; sparc-sun-solaris*) @@ -23282,11 +23311,14 @@ _ACEOF platform="solaris" # assume 64 bit perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl' - # relative to sysconfdir - initdir=/init.d + initdir='$(sysconfdir)/init.d' ;; *) esac +# cmd line overrides default setting above +if test -n "$with_initddir" ; then + initdir="$with_initddir" +fi diff --git a/configure.ac b/configure.ac index eca3cb9..c64774d 100644 --- a/configure.ac +++ b/configure.ac @@ -118,7 +118,22 @@ httpdgroup=nobody admservport=9830 admservip=0.0.0.0 # initdir -initdir=/rc.d +# initdir is the location for the SysV init scripts - very heavily platform +# dependent and not specified in fhs or lsb +initdir='$(sysconfdir)/rc.d' +AC_MSG_CHECKING(for --with-initddir) +AC_ARG_WITH(initddir, + AS_HELP_STRING([--with-initddir=/path], + [Absolute path (not relative like some of the other options) that should contain the SysV init scripts (default '$(sysconfdir)/rc.d')]), +[ + if test "$withval" = yes -o "$withval" = no ; then + AC_ERROR([Please specify a full path with --with-initddir]) + fi + AC_MSG_RESULT($withval) +], +[ + AC_MSG_RESULT(no) +]) CXXLINK_REQUIRED=0 # on most platforms, we will just use perl from PATH # On some platforms, we cannot. Why not just use any old @@ -134,8 +149,7 @@ case $host in AC_DEFINE([Linux], [1], [Linux]) AC_DEFINE([LINUX], [1], [Linux]) platform="linux" - # relative to sysconfdir - initdir=/rc.d/init.d + initdir='$(sysconfdir)/rc.d/init.d' ;; ia64-hp-hpux*) AC_DEFINE([XP_UNIX], [1], [UNIX]) @@ -153,6 +167,8 @@ case $host in httpdgroup=nogroup platform="hpux" initconfigdir="/$PACKAGE_NAME/config" + # HPUX doesn't use /etc for this + initdir=/init.d ;; hppa*-hp-hpux*) AC_DEFINE([XP_UNIX], [1], [UNIX]) @@ -170,6 +186,8 @@ case $host in perlexec='/opt/perl_64/bin/perl' platform="hpux" initconfigdir="/$PACKAGE_NAME/config" + # HPUX doesn't use /etc for this + initdir=/init.d ;; sparc-sun-solaris*) AC_DEFINE([XP_UNIX], [1], [UNIX]) @@ -196,11 +214,14 @@ dnl Cstd and Crun are required to link any C++ related code (ICU) platform="solaris" # assume 64 bit perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl' - # relative to sysconfdir - initdir=/init.d + initdir='$(sysconfdir)/init.d' ;; *) esac +# cmd line overrides default setting above +if test -n "$with_initddir" ; then + initdir="$with_initddir" +fi AC_SUBST(initdir) AC_SUBST(perlexec) AM_CONDITIONAL([CXXLINK_REQUIRED], test "$CXXLINK_REQUIRED" = 1) diff --git a/ltmain.sh b/ltmain.sh old mode 100755 new mode 100644 commit 5c13bf4d56873ba0425a2fb91dc69d90e8fb45e4 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Fri Feb 26 11:53:37 2010 -0700 bump version to 1.1.11.a2 diff --git a/VERSION.sh b/VERSION.sh index 352a1ef..3541ac3 100644 --- a/VERSION.sh +++ b/VERSION.sh @@ -15,7 +15,7 @@ VERSION_MAINT=11 # if this is a PRERELEASE, set VERSION_PREREL # otherwise, comment it out # be sure to include the dot prefix in the prerel -VERSION_PREREL=.a1 +VERSION_PREREL=.a2 # NOTES on VERSION_PREREL # use aN for an alpha release e.g. a1, a2, etc. # use rcN for a release candidate e.g. rc1, rc2, etc.

1 0

3 commits - 389-adminutil.pc.in adminutil.pc.in configure configure.ac
by Richard Allen Megginson 26 Feb '10

26 Feb '10

389-adminutil.pc.in | 2 +- adminutil.pc.in | 11 ----------- configure | 20 ++++++++++---------- configure.ac | 2 +- 4 files changed, 12 insertions(+), 23 deletions(-) New commits: commit e07acba96f82a3757c14e1df405bfbf8de6a43a2 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Fri Feb 26 12:21:16 2010 -0700 bump version to 1.1.10 diff --git a/configure b/configure index 5059a6d..2f9dad6 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for 389-adminutil 1.1.9. +# Generated by GNU Autoconf 2.59 for 389-adminutil 1.1.10. # # Report bugs to <http://bugzilla.redhat.com/>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='389-adminutil' PACKAGE_TARNAME='389-adminutil' -PACKAGE_VERSION='1.1.9' -PACKAGE_STRING='389-adminutil 1.1.9' +PACKAGE_VERSION='1.1.10' +PACKAGE_STRING='389-adminutil 1.1.10' PACKAGE_BUGREPORT='http://bugzilla.redhat.com/' # Factoring default headers for most tests. @@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures 389-adminutil 1.1.9 to adapt to many kinds of systems. +\`configure' configures 389-adminutil 1.1.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1020,7 +1020,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of 389-adminutil 1.1.9:";; + short | recursive ) echo "Configuration of 389-adminutil 1.1.10:";; esac cat <<\_ACEOF @@ -1182,7 +1182,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -389-adminutil configure 1.1.9 +389-adminutil configure 1.1.10 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1196,7 +1196,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by 389-adminutil $as_me 1.1.9, which was +It was created by 389-adminutil $as_me 1.1.10, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1839,7 +1839,7 @@ fi # Define the identity of the package. PACKAGE='389-adminutil' - VERSION='1.1.9' + VERSION='1.1.10' cat >>confdefs.h <<_ACEOF @@ -24435,7 +24435,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by 389-adminutil $as_me 1.1.9, which was +This file was extended by 389-adminutil $as_me 1.1.10, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24493,7 +24493,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -389-adminutil config.status 1.1.9 +389-adminutil config.status 1.1.10 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index f8d7831..5440425 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([389-adminutil], [1.1.9], [http://bugzilla.redhat.com/] +AC_INIT([389-adminutil], [1.1.10], [http://bugzilla.redhat.com/] AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) AM_MAINTAINER_MODE AC_CANONICAL_HOST commit 0448eb8ae21b6e3356a9b5bbe628dc24282db5ee Author: Rich Megginson <rmeggins(a)redhat.com> Date: Fri Feb 26 12:20:09 2010 -0700 remove adminutil.pc.in diff --git a/adminutil.pc.in b/adminutil.pc.in deleted file mode 100644 index fe00f39..0000000 --- a/adminutil.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: @PACKAGE_NAME@ -Description: Utility library for directory server administration -Version: @PACKAGE_VERSION@ -Requires: nspr, nss, svrcore, mozldap, icu -Libs: -ladmsslutil -ladminutil -Cflags: -I${includedir}/admsslutil -I${includedir}/adminutil commit 2720ccb5a5637ec9224ef180437f68505d07135a Author: Rich Megginson <rmeggins(a)redhat.com> Date: Fri Feb 26 12:19:15 2010 -0700 Bug 460168 - FedoraDS' adminutil requires non-existent "icu.pc" on non-RH/Fedora OS https://bugzilla.redhat.com/show_bug.cgi?id=460168 Resolves: bug 460168 Bug Description: FedoraDS' adminutil requires non-existent "icu.pc" on non-RH/Fedora OS Reviewed by: nkinder (Thanks!) Branch: HEAD Fix Description: the icu Requires in the .pc file is not needed Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no diff --git a/389-adminutil.pc.in b/389-adminutil.pc.in index fe00f39..6019ac2 100644 --- a/389-adminutil.pc.in +++ b/389-adminutil.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: @PACKAGE_NAME@ Description: Utility library for directory server administration Version: @PACKAGE_VERSION@ -Requires: nspr, nss, svrcore, mozldap, icu +Requires: nspr, nss, svrcore, mozldap Libs: -ladmsslutil -ladminutil Cflags: -I${includedir}/admsslutil -I${includedir}/adminutil

1 0

Branch 'Directory_Server_8_2_Branch' - 2 commits - ldap/servers
by Richard Allen Megginson 26 Feb '10

26 Feb '10

ldap/servers/plugins/syntaxes/string.c | 6 +++--- ldap/servers/slapd/entrywsi.c | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) New commits: commit 6191492dbbbead39747ef39da3f6843bfb3509d0 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Thu Feb 25 19:07:25 2010 -0700 389 DS segfaults on libsyntax-plugin.so - part 2 https://bugzilla.redhat.com/show_bug.cgi?id=516611 Resolves: bug 516611 Bug Description: 389 DS segfaults on libsyntax-plugin.so - part 2 Reviewed by: nkinder (Thanks!) Branch: Directory_Server_8_2_Branch Fix Description: If there is an empty mod/replace of a non-existent attribute following a real modify operation, the server will allow it, and the code in entry_delete_present_values_wsi() would create an empty Slapi_Attr. LDAP says that an empty mod/replace of a non-existent attribute should be ignored, as it is in the non-repl case. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no (cherry picked from commit 38d13f961c0d8033aa3dd3e5a3a8f32bc1650691) diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c index 5fcb30d..14ff163 100644 --- a/ldap/servers/slapd/entrywsi.c +++ b/ldap/servers/slapd/entrywsi.c @@ -646,7 +646,9 @@ entry_delete_present_values_wsi(Slapi_Entry *e, const char *type, struct berval LDAPDebug( LDAP_DEBUG_ARGS, "could not find attribute %s\n", type, 0, 0 ); } retVal= LDAP_NO_SUCH_ATTRIBUTE; - if (LDAP_MOD_REPLACE == mod_op) + /* NOTE: LDAP says that a MOD REPLACE with no vals of a non-existent + attribute is a no-op - MOD REPLACE with some vals will add the attribute */ + if ((LDAP_MOD_REPLACE == mod_op) && vals && vals[0]) { /* Create a new attribute and set the adcsn */ Slapi_Attr *a = slapi_attr_new(); commit 9f7731b8b6569d754e63fdbdd08647f9f908e15d Author: Rich Megginson <rmeggins(a)redhat.com> Date: Thu Feb 25 10:03:52 2010 -0700 389 DS segfaults on libsyntax-plugin.so - part 1 https://bugzilla.redhat.com/show_bug.cgi?id=516611 Resolves: bug 516611 Bug Description: 389 DS segfaults on libsyntax-plugin.so - part 1 Reviewed by: nkinder (Thanks!) Branch: Directory_Server_8_2_Branch Fix Description: Check for NULL bvals in the string syntax filter functions ava, sub, and key generation Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no (cherry picked from commit ea0cdc6ce1cf1c9a690acab443e6df11b3e0fe15) diff --git a/ldap/servers/plugins/syntaxes/string.c b/ldap/servers/plugins/syntaxes/string.c index c2f0fa6..ad607dc 100644 --- a/ldap/servers/plugins/syntaxes/string.c +++ b/ldap/servers/plugins/syntaxes/string.c @@ -77,7 +77,7 @@ string_filter_ava( struct berval *bvfilter, Slapi_Value **bvals, int syntax, value_normalize( bvfilter_norm.bv_val, syntax, 1 /* trim leading blanks */ ); bvfilter_norm.bv_len = strlen(bvfilter_norm.bv_val); - for ( i = 0; bvals[i] != NULL; i++ ) { + for ( i = 0; (bvals != NULL) && (bvals[i] != NULL); i++ ) { rc = value_cmp( (struct berval*)slapi_value_get_berval(bvals[i]), &bvfilter_norm, syntax, 1/* Normalise the first value only */ ); switch ( ftype ) { case LDAP_FILTER_GE: @@ -135,7 +135,7 @@ string_filter_approx( struct berval *bvfilter, Slapi_Value **bvals, if(retVal) { *retVal = NULL; } - for ( i = 0; bvals[i] != NULL; i++ ) { + for ( i = 0; (bvals != NULL) && (bvals[i] != NULL); i++ ) { w2 = (char*)slapi_value_get_string(bvals[i]); /* JCM cast */ ava_wordcount = 0; /* for each word in the filter value */ @@ -310,7 +310,7 @@ string_filter_sub( Slapi_PBlock *pb, char *initial, char **any, char *final, rc = -1; tmpbuf = NULL; tmpbufsize = 0; - for ( j = 0; bvals[j] != NULL; j++ ) { + for ( j = 0; (bvals != NULL) && (bvals[j] != NULL); j++ ) { int tmprc; size_t len; const struct berval *bvp = slapi_value_get_berval(bvals[j]);

1 0

3 commits - ldap/servers
by Richard Allen Megginson 26 Feb '10

26 Feb '10

ldap/servers/plugins/syntaxes/bin.c | 2 +- ldap/servers/plugins/syntaxes/string.c | 6 +++--- ldap/servers/slapd/entrywsi.c | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) New commits: commit 9c0edff0cffc5d5aa62b4edb74133008b72b8e94 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Thu Feb 25 20:29:35 2010 -0700 389 DS segfaults on libsyntax-plugin.so - part 3 https://bugzilla.redhat.com/show_bug.cgi?id=516611 Resolves: bug 516611 Bug Description: 389 DS segfaults on libsyntax-plugin.so - part 3 Reviewed by: nkinder (Thanks!) Branch: HEAD Fix Description: bin_filter_ava should check for null bvals Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no diff --git a/ldap/servers/plugins/syntaxes/bin.c b/ldap/servers/plugins/syntaxes/bin.c index 3d2d88a..25f2129 100644 --- a/ldap/servers/plugins/syntaxes/bin.c +++ b/ldap/servers/plugins/syntaxes/bin.c @@ -251,7 +251,7 @@ bin_filter_ava( Slapi_PBlock *pb, struct berval *bvfilter, { int i; - for ( i = 0; bvals[i] != NULL; i++ ) { + for ( i = 0; (bvals != NULL) && (bvals[i] != NULL); i++ ) { const struct berval *bv = slapi_value_get_berval(bvals[i]); int rc = slapi_berval_cmp(bv, bvfilter); commit 38d13f961c0d8033aa3dd3e5a3a8f32bc1650691 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Thu Feb 25 19:07:25 2010 -0700 389 DS segfaults on libsyntax-plugin.so - part 2 https://bugzilla.redhat.com/show_bug.cgi?id=516611 Resolves: bug 516611 Bug Description: 389 DS segfaults on libsyntax-plugin.so - part 2 Reviewed by: nkinder (Thanks!) Branch: HEAD Fix Description: If there is an empty mod/replace of a non-existent attribute following a real modify operation, the server will allow it, and the code in entry_delete_present_values_wsi() would create an empty Slapi_Attr. LDAP says that an empty mod/replace of a non-existent attribute should be ignored, as it is in the non-repl case. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c index 5fcb30d..14ff163 100644 --- a/ldap/servers/slapd/entrywsi.c +++ b/ldap/servers/slapd/entrywsi.c @@ -646,7 +646,9 @@ entry_delete_present_values_wsi(Slapi_Entry *e, const char *type, struct berval LDAPDebug( LDAP_DEBUG_ARGS, "could not find attribute %s\n", type, 0, 0 ); } retVal= LDAP_NO_SUCH_ATTRIBUTE; - if (LDAP_MOD_REPLACE == mod_op) + /* NOTE: LDAP says that a MOD REPLACE with no vals of a non-existent + attribute is a no-op - MOD REPLACE with some vals will add the attribute */ + if ((LDAP_MOD_REPLACE == mod_op) && vals && vals[0]) { /* Create a new attribute and set the adcsn */ Slapi_Attr *a = slapi_attr_new(); commit ea0cdc6ce1cf1c9a690acab443e6df11b3e0fe15 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Thu Feb 25 10:03:52 2010 -0700 389 DS segfaults on libsyntax-plugin.so - part 1 https://bugzilla.redhat.com/show_bug.cgi?id=516611 Resolves: bug 516611 Bug Description: 389 DS segfaults on libsyntax-plugin.so - part 1 Reviewed by: nkinder (Thanks!) Branch: HEAD Fix Description: Check for NULL bvals in the string syntax filter functions ava, sub, and key generation Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no diff --git a/ldap/servers/plugins/syntaxes/string.c b/ldap/servers/plugins/syntaxes/string.c index c2f0fa6..ad607dc 100644 --- a/ldap/servers/plugins/syntaxes/string.c +++ b/ldap/servers/plugins/syntaxes/string.c @@ -77,7 +77,7 @@ string_filter_ava( struct berval *bvfilter, Slapi_Value **bvals, int syntax, value_normalize( bvfilter_norm.bv_val, syntax, 1 /* trim leading blanks */ ); bvfilter_norm.bv_len = strlen(bvfilter_norm.bv_val); - for ( i = 0; bvals[i] != NULL; i++ ) { + for ( i = 0; (bvals != NULL) && (bvals[i] != NULL); i++ ) { rc = value_cmp( (struct berval*)slapi_value_get_berval(bvals[i]), &bvfilter_norm, syntax, 1/* Normalise the first value only */ ); switch ( ftype ) { case LDAP_FILTER_GE: @@ -135,7 +135,7 @@ string_filter_approx( struct berval *bvfilter, Slapi_Value **bvals, if(retVal) { *retVal = NULL; } - for ( i = 0; bvals[i] != NULL; i++ ) { + for ( i = 0; (bvals != NULL) && (bvals[i] != NULL); i++ ) { w2 = (char*)slapi_value_get_string(bvals[i]); /* JCM cast */ ava_wordcount = 0; /* for each word in the filter value */ @@ -310,7 +310,7 @@ string_filter_sub( Slapi_PBlock *pb, char *initial, char **any, char *final, rc = -1; tmpbuf = NULL; tmpbufsize = 0; - for ( j = 0; bvals[j] != NULL; j++ ) { + for ( j = 0; (bvals != NULL) && (bvals[j] != NULL); j++ ) { int tmprc; size_t len; const struct berval *bvp = slapi_value_get_berval(bvals[j]);

1 0

Branch 'Directory_Server_8_2_Branch' - ldap/admin
by Richard Allen Megginson 25 Feb '10

25 Feb '10

ldap/admin/src/scripts/template-bak2db.in | 2 +- ldap/admin/src/scripts/template-db2bak.in | 2 +- ldap/admin/src/scripts/template-db2index.in | 2 +- ldap/admin/src/scripts/template-db2ldif.in | 2 +- ldap/admin/src/scripts/template-dbverify.in | 2 +- ldap/admin/src/scripts/template-ldif2db.in | 2 +- ldap/admin/src/scripts/template-restoreconfig.in | 4 ++-- ldap/admin/src/scripts/template-saveconfig.in | 4 ++-- ldap/admin/src/scripts/template-suffix2instance.in | 4 ++-- ldap/admin/src/scripts/template-upgradedb.in | 4 ++-- ldap/admin/src/scripts/template-vlvindex.in | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) New commits: commit 24245075d03955f26b6c827b123ac002ff16c012 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Thu Feb 25 20:18:56 2010 -0700 Bug 568196 - Install DS8.2 on Solaris fails - part 2 https://bugzilla.redhat.com/show_bug.cgi?id=568196 Resolves: bug 568196 Bug Description: Install DS8.2 on Solaris fails - part 2 Reviewed by: self Branch: Directory_Server_8_2_Branch Fix Description: Add pcre_libdir to all script wrappers that call ns-slapd, such as ldif2db, etc. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no diff --git a/ldap/admin/src/scripts/template-bak2db.in b/ldap/admin/src/scripts/template-bak2db.in index 90ef464..12d46ca 100755 --- a/ldap/admin/src/scripts/template-bak2db.in +++ b/ldap/admin/src/scripts/template-bak2db.in @@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}" if [ "$prefix" = "/" ] ; then prefix="" fi -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@ if [ -n "$prefix" ] ; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" fi diff --git a/ldap/admin/src/scripts/template-db2bak.in b/ldap/admin/src/scripts/template-db2bak.in index 261919f..a0fe1f5 100755 --- a/ldap/admin/src/scripts/template-db2bak.in +++ b/ldap/admin/src/scripts/template-db2bak.in @@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}" if [ "$prefix" = "/" ] ; then prefix="" fi -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@ if [ -n "$prefix" ] ; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" fi diff --git a/ldap/admin/src/scripts/template-db2index.in b/ldap/admin/src/scripts/template-db2index.in index 8f9b0c6..e0e9a55 100755 --- a/ldap/admin/src/scripts/template-db2index.in +++ b/ldap/admin/src/scripts/template-db2index.in @@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}" if [ "$prefix" = "/" ] ; then prefix="" fi -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@ if [ -n "$prefix" ] ; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" fi diff --git a/ldap/admin/src/scripts/template-db2ldif.in b/ldap/admin/src/scripts/template-db2ldif.in index 2f74670..e519f3e 100755 --- a/ldap/admin/src/scripts/template-db2ldif.in +++ b/ldap/admin/src/scripts/template-db2ldif.in @@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}" if [ "$prefix" = "/" ] ; then prefix="" fi -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@ if [ -n "$prefix" ] ; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" fi diff --git a/ldap/admin/src/scripts/template-dbverify.in b/ldap/admin/src/scripts/template-dbverify.in index b5e56d9..0f71450 100755 --- a/ldap/admin/src/scripts/template-dbverify.in +++ b/ldap/admin/src/scripts/template-dbverify.in @@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}" if [ "$prefix" = "/" ] ; then prefix="" fi -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@ if [ -n "$prefix" ] ; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" fi diff --git a/ldap/admin/src/scripts/template-ldif2db.in b/ldap/admin/src/scripts/template-ldif2db.in index 83c579e..ce64193 100755 --- a/ldap/admin/src/scripts/template-ldif2db.in +++ b/ldap/admin/src/scripts/template-ldif2db.in @@ -4,7 +4,7 @@ prefix="{{DS-ROOT}}" if [ "$prefix" = "/" ] ; then prefix="" fi -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:$prefix@pcre_libdir@ if [ -n "$prefix" ] ; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@nss_libdir@" fi diff --git a/ldap/admin/src/scripts/template-restoreconfig.in b/ldap/admin/src/scripts/template-restoreconfig.in index dc210cb..0e5de9b 100755 --- a/ldap/admin/src/scripts/template-restoreconfig.in +++ b/ldap/admin/src/scripts/template-restoreconfig.in @@ -1,9 +1,9 @@ #!/bin/sh prefix="{{DS-ROOT}}" -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export LD_LIBRARY_PATH -SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export SHLIB_PATH cd {{SERVERBIN-DIR}} diff --git a/ldap/admin/src/scripts/template-saveconfig.in b/ldap/admin/src/scripts/template-saveconfig.in index 1ce5d07..737c97b 100755 --- a/ldap/admin/src/scripts/template-saveconfig.in +++ b/ldap/admin/src/scripts/template-saveconfig.in @@ -1,9 +1,9 @@ #!/bin/sh prefix="{{DS-ROOT}}" -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export LD_LIBRARY_PATH -SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export SHLIB_PATH cd {{SERVERBIN-DIR}} diff --git a/ldap/admin/src/scripts/template-suffix2instance.in b/ldap/admin/src/scripts/template-suffix2instance.in index dadb5f9..994f8af 100755 --- a/ldap/admin/src/scripts/template-suffix2instance.in +++ b/ldap/admin/src/scripts/template-suffix2instance.in @@ -1,9 +1,9 @@ #!/bin/sh prefix="{{DS-ROOT}}" -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export LD_LIBRARY_PATH -SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export SHLIB_PATH cd {{SERVERBIN-DIR}} diff --git a/ldap/admin/src/scripts/template-upgradedb.in b/ldap/admin/src/scripts/template-upgradedb.in index ef3fdf2..9b6f03d 100755 --- a/ldap/admin/src/scripts/template-upgradedb.in +++ b/ldap/admin/src/scripts/template-upgradedb.in @@ -1,9 +1,9 @@ #!/bin/sh prefix="{{DS-ROOT}}" -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export LD_LIBRARY_PATH -SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export SHLIB_PATH cd {{SERVERBIN-DIR}} diff --git a/ldap/admin/src/scripts/template-vlvindex.in b/ldap/admin/src/scripts/template-vlvindex.in index 4c61e0d..e6cd743 100755 --- a/ldap/admin/src/scripts/template-vlvindex.in +++ b/ldap/admin/src/scripts/template-vlvindex.in @@ -1,9 +1,9 @@ #!/bin/sh prefix="{{DS-ROOT}}" -LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export LD_LIBRARY_PATH -SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@ +SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@:$prefix@pcre_libdir@ export SHLIB_PATH cd {{SERVERBIN-DIR}}

1 0

Changes to 'refs/tags/389-console-1.1.4.a2'
by Richard Allen Megginson 25 Feb '10

25 Feb '10

Changes since the dawn of time: Nathan Kinder (3): Initial import of fedora-idm-console Resolves: 183962 Resolves: 393461 Rich Megginson (27): initial commit of Fedora Console for Windows - has no UI added UI and graphics package is not noarch support for JAVA with spaces in the pathname added license updated spec for Fedora DS 1.1 release Resolves: bug 428352 Resolves: bug 480631 Reviewed by: nkinder (Thanks!) Resolves: bug 476095 bump version to 1.1.3 to sync with CVS tag added unzip.vbs ; cleaned up/simplified Makefile update idm console version to 20090310 update for 1.1.3 fix typo in Makefile Initial commit of renaming to 389 Forgot to add provides and obsoletes for fedora-idm-console added .gitignore added need_libdir flag to control where libdir is needed to find jss fix spelling error Add 64-bit support - Use replaceable parameters for names, guids Remove old package during upgrade Remove old shortcuts must ignore All Users folders Force shortcuts to be removed - removeoldpkg must run asyncNoWait Bump version to 1.1.4 Changed version to 1.1.4.a1 make sure bitsadmin.exe path is quoted

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits February 2010