389-commits August 2014

389-commits@lists.fedoraproject.org

5 participants
69 discussions

Branch '389-ds-base-1.2.11' - 2 commits - Makefile.in configure configure.ac
by Noriko Hosoi 18 Aug '14

18 Aug '14

Makefile.in | 2 +- configure | 1 + configure.ac | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) New commits: commit e476c664d6ad2875e454722c6451a5411b1f38d1 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Mon Aug 18 14:45:40 2014 -0400 Ticket #47875 - dirsrv not running with old openldap Description: ran autogen.sh diff --git a/Makefile.in b/Makefile.in index f731cfb..930d22b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -10428,7 +10428,7 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff --git a/configure b/configure index fba5e4f..c22046c 100755 --- a/configure +++ b/configure @@ -25155,6 +25155,7 @@ fi + cat >>confdefs.h <<\_ACEOF #define LDAP_DEBUG 1 _ACEOF commit dce84e1d4a12dbe9a461981d076ca3d0e17ef56c Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Aug 15 16:13:46 2014 -0700 Ticket #47875 - dirsrv not running with old openldap Description: AC_SUBST(ldap_lib_ldif) was missing from configure.ac for @ldap_lib_dir@. https://fedorahosted.org/389/ticket/47875 Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!) (cherry picked from commit 0ae55bcd61497c2fa7aaade40fe4ff6c91216325) (cherry picked from commit 1bb438916825d72df023ca5f67fa7d8b7e6e36e3) diff --git a/configure.ac b/configure.ac index 8281d67..fd2e0d2 100644 --- a/configure.ac +++ b/configure.ac @@ -655,6 +655,7 @@ AC_SUBST(openldap_inc) AC_SUBST(openldap_lib) AC_SUBST(openldap_libdir) AC_SUBST(openldap_bindir) +AC_SUBST(ldap_lib_ldif) AC_SUBST(ldaptool_bindir) AC_SUBST(ldaptool_opts) AC_SUBST(plainldif_opts)

1 0

Branch '389-ds-base-1.3.2' - 2 commits - configure configure.ac
by Noriko Hosoi 18 Aug '14

18 Aug '14

configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) New commits: commit 5995ff014d92da027f4ee925aefc6d7249a169bc Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Mon Aug 18 11:39:08 2014 -0700 Ticket #47875 - dirsrv not running with old openldap Description: ran autogen.sh diff --git a/configure b/configure index fd1bfb6..408275c 100755 --- a/configure +++ b/configure @@ -21212,6 +21212,7 @@ fi + # AC_DEFINE([USE_OLD_UNHASHED], [], [Use old unhashed code]) $as_echo "#define LDAP_DEBUG 1" >>confdefs.h commit 1bb438916825d72df023ca5f67fa7d8b7e6e36e3 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Aug 15 16:13:46 2014 -0700 Ticket #47875 - dirsrv not running with old openldap Description: AC_SUBST(ldap_lib_ldif) was missing from configure.ac for @ldap_lib_dir@. https://fedorahosted.org/389/ticket/47875 Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!) (cherry picked from commit 0ae55bcd61497c2fa7aaade40fe4ff6c91216325) diff --git a/configure.ac b/configure.ac index 908683e..e7f412d 100644 --- a/configure.ac +++ b/configure.ac @@ -664,6 +664,7 @@ AC_SUBST(openldap_inc) AC_SUBST(openldap_lib) AC_SUBST(openldap_libdir) AC_SUBST(openldap_bindir) +AC_SUBST(ldap_lib_ldif) AC_SUBST(ldaptool_bindir) AC_SUBST(ldaptool_opts) AC_SUBST(plainldif_opts)

1 0

2 commits - aclocal.m4 config.guess config.sub configure configure.ac
by Noriko Hosoi 18 Aug '14

18 Aug '14

aclocal.m4 | 15 ----- config.guess | 151 +++++++++++++++++++++++++++++++++-------------------------- config.sub | 30 +++++------ configure | 1 configure.ac | 1 5 files changed, 103 insertions(+), 95 deletions(-) New commits: commit 9fb3c4357aa7748f4b345f532cf4182cbc57b859 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Aug 15 16:15:18 2014 -0700 Ticket #47875 - dirsrv not running with old openldap Automatically generated files: aclocal.m4, config.guess, config.sub, configure https://fedorahosted.org/389/ticket/47875 diff --git a/aclocal.m4 b/aclocal.m4 index 7afd01a..8136dd1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -220,21 +220,6 @@ m4_popdef([pkg_default]) m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff --git a/config.guess b/config.guess index 1804e9f..b79252d 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-12-29' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -26,7 +24,7 @@ timestamp='2012-12-29' # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gues… @@ -52,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include <features.h> + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -857,21 +874,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in @@ -884,59 +901,54 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -955,54 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1235,19 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) diff --git a/config.sub b/config.sub index 52f04bc..c765b34 100755 --- a/config.sub +++ b/config.sub @@ -1,10 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-12-29' +timestamp='2013-04-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -70,9 +68,7 @@ Report bugs and patches to <config-patches(a)gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -256,7 +252,7 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc \ + | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ @@ -290,16 +286,17 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -369,7 +366,7 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -407,12 +404,13 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -1354,7 +1352,7 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1500,9 +1498,6 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1594,6 +1589,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff --git a/configure b/configure index da1517c..158db9a 100755 --- a/configure +++ b/configure @@ -21332,6 +21332,7 @@ fi + # AC_DEFINE([USE_OLD_UNHASHED], [], [Use old unhashed code]) $as_echo "#define LDAP_DEBUG 1" >>confdefs.h commit 0ae55bcd61497c2fa7aaade40fe4ff6c91216325 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Aug 15 16:13:46 2014 -0700 Ticket #47875 - dirsrv not running with old openldap Description: AC_SUBST(ldap_lib_ldif) was missing from configure.ac for @ldap_lib_dir@. https://fedorahosted.org/389/ticket/47875 Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!) diff --git a/configure.ac b/configure.ac index 16ab6a9..0f1ddf6 100644 --- a/configure.ac +++ b/configure.ac @@ -709,6 +709,7 @@ AC_SUBST(openldap_inc) AC_SUBST(openldap_lib) AC_SUBST(openldap_libdir) AC_SUBST(openldap_bindir) +AC_SUBST(ldap_lib_ldif) AC_SUBST(ldaptool_bindir) AC_SUBST(ldaptool_opts) AC_SUBST(plainldif_opts)

1 0

Branch '389-ds-base-1.3.1' - ldap/admin
by Richard Allen Megginson 18 Aug '14

18 Aug '14

ldap/admin/src/logconv.pl | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) New commits: commit 3be093105fe5525fd66ac055ff58d48fbd0f823a Author: Rich Megginson <rmeggins(a)redhat.com> Date: Mon Aug 18 09:59:47 2014 -0600 Ticket 47446 - logconv.pl memory continually grows Bug Description: Running logconv.pl without any special options continually consumes more memory. Fix Description: The last fix introduced the use of regex matches which caused the value of $1 to become undefined. When using all of the logconv cmd line switches, many undefined variable warnings were printed. This fix saves the value of $1 in a local variable so that it it not undefined by the use of subsequent regex matches. https://fedorahosted.org/389/ticket/47446 Reviewed by: mreynolds (Thanks!) (cherry picked from commit c4f396db2484362ecb7a1c54458ad794b8d5c506) (cherry picked from commit db9c4e73ab98a43bcbbd6a2ffe84d3ff2f103de5) diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl index edc5fd1..cd45a8b 100755 --- a/ldap/admin/src/logconv.pl +++ b/ldap/admin/src/logconv.pl @@ -1693,10 +1693,11 @@ sub parseLineNormal $srchCount++; if($reportStats){ inc_stats('srch',$s_stats,$m_stats); } if ($_ =~ / attrs=\"(.*)\"/i){ + my $attrlist = $1; $anyAttrs++; if ($usage =~ /r/i || $verb eq "yes"){ my $attr = $hashes->{attr}; - map { $attr->{$_}++ } split /\s/, $1; + map { $attr->{$_}++ } split /\s/, $attrlist; } } if (/ attrs=ALL/){ @@ -2131,8 +2132,9 @@ sub parseLineNormal } } if ($_ =~ /err= *([0-9]+)/i){ - if ($usage =~ /e/i || $verb eq "yes"){ $errorCode[$1]++; } - if ($1 ne "0"){ $errorCount++;} + my $errcode = $1; + if ($usage =~ /e/i || $verb eq "yes"){ $errorCode[$errcode]++; } + if ($errcode ne "0"){ $errorCount++;} else { $successCount++;} } if ($_ =~ /etime= *([0-9.]+)/ ) { @@ -2142,8 +2144,9 @@ sub parseLineNormal } if ($_ =~ / tag=101 / || $_ =~ / tag=111 / || $_ =~ / tag=100 / || $_ =~ / tag=115 /){ if ($_ =~ / nentries= *([0-9]+)/i ){ + my $nents = $1; if ($usage =~ /n/i || $verb eq "yes"){ - $hashes->{nentries}->{$1}++; + $hashes->{nentries}->{$nents}++; } } } @@ -2152,10 +2155,12 @@ sub parseLineNormal } if (m/ EXT oid=/){ $extopCount++; + my $oid; if ($_ =~ /oid=\" *([0-9\.]+)/i ){ - if ($usage =~ /x/i || $verb eq "yes"){$hashes->{oid}->{$1}++; } + $oid = $1; + if ($usage =~ /x/i || $verb eq "yes"){$hashes->{oid}->{$oid}++; } } - if ($1 && $1 eq $startTLSoid){$startTLSCount++;} + if ($oid && $oid eq $startTLSoid){$startTLSCount++;} if ($verb eq "yes"){ if ($_ =~ /conn= *([0-9A-Z]+) +op= *([0-9\-]+)/i){ $hashes->{ext_conn_op}->{"$serverRestartCount,$1,$2"}++;} }

1 0

Branch '389-ds-base-1.3.2' - ldap/admin
by Richard Allen Megginson 18 Aug '14

18 Aug '14

ldap/admin/src/logconv.pl | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) New commits: commit db9c4e73ab98a43bcbbd6a2ffe84d3ff2f103de5 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Mon Aug 18 09:59:47 2014 -0600 Ticket 47446 - logconv.pl memory continually grows Bug Description: Running logconv.pl without any special options continually consumes more memory. Fix Description: The last fix introduced the use of regex matches which caused the value of $1 to become undefined. When using all of the logconv cmd line switches, many undefined variable warnings were printed. This fix saves the value of $1 in a local variable so that it it not undefined by the use of subsequent regex matches. https://fedorahosted.org/389/ticket/47446 Reviewed by: mreynolds (Thanks!) (cherry picked from commit c4f396db2484362ecb7a1c54458ad794b8d5c506) diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl index edc5fd1..cd45a8b 100755 --- a/ldap/admin/src/logconv.pl +++ b/ldap/admin/src/logconv.pl @@ -1693,10 +1693,11 @@ sub parseLineNormal $srchCount++; if($reportStats){ inc_stats('srch',$s_stats,$m_stats); } if ($_ =~ / attrs=\"(.*)\"/i){ + my $attrlist = $1; $anyAttrs++; if ($usage =~ /r/i || $verb eq "yes"){ my $attr = $hashes->{attr}; - map { $attr->{$_}++ } split /\s/, $1; + map { $attr->{$_}++ } split /\s/, $attrlist; } } if (/ attrs=ALL/){ @@ -2131,8 +2132,9 @@ sub parseLineNormal } } if ($_ =~ /err= *([0-9]+)/i){ - if ($usage =~ /e/i || $verb eq "yes"){ $errorCode[$1]++; } - if ($1 ne "0"){ $errorCount++;} + my $errcode = $1; + if ($usage =~ /e/i || $verb eq "yes"){ $errorCode[$errcode]++; } + if ($errcode ne "0"){ $errorCount++;} else { $successCount++;} } if ($_ =~ /etime= *([0-9.]+)/ ) { @@ -2142,8 +2144,9 @@ sub parseLineNormal } if ($_ =~ / tag=101 / || $_ =~ / tag=111 / || $_ =~ / tag=100 / || $_ =~ / tag=115 /){ if ($_ =~ / nentries= *([0-9]+)/i ){ + my $nents = $1; if ($usage =~ /n/i || $verb eq "yes"){ - $hashes->{nentries}->{$1}++; + $hashes->{nentries}->{$nents}++; } } } @@ -2152,10 +2155,12 @@ sub parseLineNormal } if (m/ EXT oid=/){ $extopCount++; + my $oid; if ($_ =~ /oid=\" *([0-9\.]+)/i ){ - if ($usage =~ /x/i || $verb eq "yes"){$hashes->{oid}->{$1}++; } + $oid = $1; + if ($usage =~ /x/i || $verb eq "yes"){$hashes->{oid}->{$oid}++; } } - if ($1 && $1 eq $startTLSoid){$startTLSCount++;} + if ($oid && $oid eq $startTLSoid){$startTLSCount++;} if ($verb eq "yes"){ if ($_ =~ /conn= *([0-9A-Z]+) +op= *([0-9\-]+)/i){ $hashes->{ext_conn_op}->{"$serverRestartCount,$1,$2"}++;} }

1 0

ldap/admin
by Richard Allen Megginson 18 Aug '14

18 Aug '14

ldap/admin/src/logconv.pl | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) New commits: commit c4f396db2484362ecb7a1c54458ad794b8d5c506 Author: Rich Megginson <rmeggins(a)redhat.com> Date: Mon Aug 18 09:59:47 2014 -0600 Ticket 47446 - logconv.pl memory continually grows Bug Description: Running logconv.pl without any special options continually consumes more memory. Fix Description: The last fix introduced the use of regex matches which caused the value of $1 to become undefined. When using all of the logconv cmd line switches, many undefined variable warnings were printed. This fix saves the value of $1 in a local variable so that it it not undefined by the use of subsequent regex matches. https://fedorahosted.org/389/ticket/47446 Reviewed by: mreynolds (Thanks!) diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl index 3ca3498..0611755 100755 --- a/ldap/admin/src/logconv.pl +++ b/ldap/admin/src/logconv.pl @@ -1825,10 +1825,11 @@ sub parseLineNormal $srchCount++; if($reportStats){ inc_stats('srch',$s_stats,$m_stats); } if ($_ =~ / attrs=\"(.*)\"/i){ + my $attrlist = $1; $anyAttrs++; if ($usage =~ /r/i || $verb eq "yes"){ my $attr = $hashes->{attr}; - map { $attr->{$_}++ } split /\s/, $1; + map { $attr->{$_}++ } split /\s/, $attrlist; } } if (/ attrs=ALL/){ @@ -2271,8 +2272,9 @@ sub parseLineNormal } } if ($_ =~ /err= *([0-9]+)/i){ - if ($usage =~ /e/i || $verb eq "yes"){ $errorCode[$1]++; } - if ($1 ne "0"){ $errorCount++;} + my $errcode = $1; + if ($usage =~ /e/i || $verb eq "yes"){ $errorCode[$errcode]++; } + if ($errcode ne "0"){ $errorCount++;} else { $successCount++;} } if ($_ =~ /etime= *([0-9.]+)/ ) { @@ -2282,8 +2284,9 @@ sub parseLineNormal } if ($_ =~ / tag=101 / || $_ =~ / tag=111 / || $_ =~ / tag=100 / || $_ =~ / tag=115 /){ if ($_ =~ / nentries= *([0-9]+)/i ){ + my $nents = $1; if ($usage =~ /n/i || $verb eq "yes"){ - $hashes->{nentries}->{$1}++; + $hashes->{nentries}->{$nents}++; } } } @@ -2292,10 +2295,12 @@ sub parseLineNormal } if (m/ EXT oid=/){ $extopCount++; + my $oid; if ($_ =~ /oid=\" *([0-9\.]+)/i ){ - if ($usage =~ /x/i || $verb eq "yes"){$hashes->{oid}->{$1}++; } + $oid = $1; + if ($usage =~ /x/i || $verb eq "yes"){$hashes->{oid}->{$oid}++; } } - if ($1 && $1 eq $startTLSoid){$startTLSCount++;} + if ($oid && $oid eq $startTLSoid){$startTLSCount++;} if ($verb eq "yes"){ if ($_ =~ /conn= *([0-9A-Z]+) +op= *([0-9\-]+)/i){ $hashes->{ext_conn_op}->{"$serverRestartCount,$1,$2"}++;} }

1 0

Branch '389-ds-base-1.2.11' - ldap/admin
by Richard Allen Megginson 18 Aug '14

18 Aug '14

ldap/admin/src/logconv.pl | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) New commits: commit 81e5f14fba9825d873b729fe74acfee6ac08e7bc Author: Rich Megginson <rmeggins(a)redhat.com> Date: Mon Aug 18 09:59:47 2014 -0600 Ticket 47446 - logconv.pl memory continually grows Bug Description: Running logconv.pl without any special options continually consumes more memory. Fix Description: The last fix introduced the use of regex matches which caused the value of $1 to become undefined. When using all of the logconv cmd line switches, many undefined variable warnings were printed. This fix saves the value of $1 in a local variable so that it it not undefined by the use of subsequent regex matches. https://fedorahosted.org/389/ticket/47446 Reviewed by: mreynolds (Thanks!) (cherry picked from commit c4f396db2484362ecb7a1c54458ad794b8d5c506) (cherry picked from commit db9c4e73ab98a43bcbbd6a2ffe84d3ff2f103de5) (cherry picked from commit 3be093105fe5525fd66ac055ff58d48fbd0f823a) diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl index edc5fd1..cd45a8b 100755 --- a/ldap/admin/src/logconv.pl +++ b/ldap/admin/src/logconv.pl @@ -1693,10 +1693,11 @@ sub parseLineNormal $srchCount++; if($reportStats){ inc_stats('srch',$s_stats,$m_stats); } if ($_ =~ / attrs=\"(.*)\"/i){ + my $attrlist = $1; $anyAttrs++; if ($usage =~ /r/i || $verb eq "yes"){ my $attr = $hashes->{attr}; - map { $attr->{$_}++ } split /\s/, $1; + map { $attr->{$_}++ } split /\s/, $attrlist; } } if (/ attrs=ALL/){ @@ -2131,8 +2132,9 @@ sub parseLineNormal } } if ($_ =~ /err= *([0-9]+)/i){ - if ($usage =~ /e/i || $verb eq "yes"){ $errorCode[$1]++; } - if ($1 ne "0"){ $errorCount++;} + my $errcode = $1; + if ($usage =~ /e/i || $verb eq "yes"){ $errorCode[$errcode]++; } + if ($errcode ne "0"){ $errorCount++;} else { $successCount++;} } if ($_ =~ /etime= *([0-9.]+)/ ) { @@ -2142,8 +2144,9 @@ sub parseLineNormal } if ($_ =~ / tag=101 / || $_ =~ / tag=111 / || $_ =~ / tag=100 / || $_ =~ / tag=115 /){ if ($_ =~ / nentries= *([0-9]+)/i ){ + my $nents = $1; if ($usage =~ /n/i || $verb eq "yes"){ - $hashes->{nentries}->{$1}++; + $hashes->{nentries}->{$nents}++; } } } @@ -2152,10 +2155,12 @@ sub parseLineNormal } if (m/ EXT oid=/){ $extopCount++; + my $oid; if ($_ =~ /oid=\" *([0-9\.]+)/i ){ - if ($usage =~ /x/i || $verb eq "yes"){$hashes->{oid}->{$1}++; } + $oid = $1; + if ($usage =~ /x/i || $verb eq "yes"){$hashes->{oid}->{$oid}++; } } - if ($1 && $1 eq $startTLSoid){$startTLSCount++;} + if ($oid && $oid eq $startTLSoid){$startTLSCount++;} if ($verb eq "yes"){ if ($_ =~ /conn= *([0-9A-Z]+) +op= *([0-9\-]+)/i){ $hashes->{ext_conn_op}->{"$serverRestartCount,$1,$2"}++;} }

1 0

Branch '389-ds-base-1.2.11' - ldap/servers
by Noriko Hosoi 17 Aug '14

17 Aug '14

ldap/servers/slapd/libglobs.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) New commits: commit 06dfa1df69ebba9c71471d6e0de42ee09824302f Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Sun Aug 17 15:10:16 2014 -0700 Trac Ticket #443 - Deleting attribute present in nsslapd-allowed-to-delete-attrs returns Operations error Description: Backporting the patch to 1.2.11 branch by commit 9cc7fade0b5440479b39ddbcb989e5ed220b267f accidentally removed 5 config parameters from the table: CONFIG_LISTEN_BACKLOG_SIZE, CONFIG_MALLOC_MXFAST, CONFIG_MALLOC_TRIM_THRESHOLD, CONFIG_MALLOC_MMAP_THRESHOLD, CONFIG_IGNORE_TIME_SKEW Resurrecting them. diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c index 5eda0f8..ad02a00 100644 --- a/ldap/servers/slapd/libglobs.c +++ b/ldap/servers/slapd/libglobs.c @@ -1008,6 +1008,31 @@ static struct config_get_and_set { (void**)&global_slapdFrontendConfig.sasl_max_bufsize, CONFIG_INT, (ConfigGetFunc)config_get_sasl_maxbufsize, DEFAULT_SASL_MAXBUFSIZE}, + {CONFIG_LISTEN_BACKLOG_SIZE, config_set_listen_backlog_size, + NULL, 0, + (void**)&global_slapdFrontendConfig.listen_backlog_size, CONFIG_INT, + (ConfigGetFunc)config_get_listen_backlog_size, &init_listen_backlog_size}, +#if defined(LINUX) + {CONFIG_MALLOC_MXFAST, config_set_malloc_mxfast, + NULL, 0, + (void**)&global_slapdFrontendConfig.malloc_mxfast, + CONFIG_INT, (ConfigGetFunc)config_get_malloc_mxfast, + &init_malloc_mxfast}, + {CONFIG_MALLOC_TRIM_THRESHOLD, config_set_malloc_trim_threshold, + NULL, 0, + (void**)&global_slapdFrontendConfig.malloc_trim_threshold, + CONFIG_INT, (ConfigGetFunc)config_get_malloc_trim_threshold, + &init_malloc_trim_threshold}, + {CONFIG_MALLOC_MMAP_THRESHOLD, config_set_malloc_mmap_threshold, + NULL, 0, + (void**)&global_slapdFrontendConfig.malloc_mmap_threshold, + CONFIG_INT, (ConfigGetFunc)config_get_malloc_mmap_threshold, + &init_malloc_mmap_threshold}, +#endif + {CONFIG_IGNORE_TIME_SKEW, config_set_ignore_time_skew, + NULL, 0, + (void**)&global_slapdFrontendConfig.ignore_time_skew, + CONFIG_ON_OFF, (ConfigGetFunc)config_get_ignore_time_skew, &init_ignore_time_skew} #ifdef MEMPOOL_EXPERIMENTAL ,{CONFIG_MEMPOOL_SWITCH_ATTRIBUTE, config_set_mempool_switch, NULL, 0,

1 0

Branch '389-ds-base-1.2.11' - ldap/servers
by Noriko Hosoi 15 Aug '14

15 Aug '14

ldap/servers/slapd/valueset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 19e4ea683835ec9a40317e1c9b30fe87229aea39 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Aug 15 12:38:24 2014 -0700 Ticket #415 - winsync doesn't sync DN valued attributes if DS DN value doesn't exist Description: Once we had a NULL vs checking (Ticket #415): commit 737169e0afd0547b6de0a61081508314d076cc6a, but it was accidentally removed by the next commit (Ticket 346): commit 890fc22687821279f3862fc0862a4e8d93c00291. This patch adds the NULL checking for vs. diff --git a/ldap/servers/slapd/valueset.c b/ldap/servers/slapd/valueset.c index 5c1ae36..52c04b8 100644 --- a/ldap/servers/slapd/valueset.c +++ b/ldap/servers/slapd/valueset.c @@ -713,7 +713,7 @@ Slapi_Value * slapi_valueset_find(const Slapi_Attr *a, const Slapi_ValueSet *vs, const Slapi_Value *v) { Slapi_Value *r= NULL; - if(vs->num > 0) { + if(vs && (vs->num > 0)) { if (vs->sorted) { r = valueset_find_sorted(a,vs,v,NULL); } else {

1 0

Branch '389-ds-base-1.2.11' - ldap/servers
by Noriko Hosoi 15 Aug '14

15 Aug '14

ldap/servers/slapd/back-ldbm/ldbm_search.c | 5 +++++ ldap/servers/slapd/backend.c | 11 ++++++++--- ldap/servers/slapd/slapi-plugin.h | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) New commits: commit caddfa2d0d16357b41bf6ccccd0d8b655ae60b2a Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Aug 14 17:54:30 2014 -0700 Ticket #47874 - Performance degradation with scope ONE after some load Bug Description: Backend has a bit to indicate "should not bypass the filter test". It's set if one of the search results is ALLID in idl_intersection. Once the flag is set, it's never been unset. It makes the following one level searches slow down. Fix Description: Introduced slapi_be_unset_flag and unset the bit at the end of every search. https://fedorahosted.org/389/ticket/47874 Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!) (cherry picked from commit 8e1345ab9276d1cf9c9ac2cbd858c398235ef5ce) (cherry picked from commit 3ff6d520ae0a15f74dc57122837627b5b73de629) diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c index 8793a0b..dcb1490 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_search.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c @@ -181,6 +181,11 @@ ldbm_back_search_cleanup(Slapi_PBlock *pb, slapi_pblock_get( pb, SLAPI_BACKEND, &be ); inst = (ldbm_instance *) be->be_instance_info; + /* + * In case SLAPI_BE_FLAG_DONT_BYPASS_FILTERTEST is set, + * clean it up for the following sessions. + */ + slapi_be_unset_flag(be, SLAPI_BE_FLAG_DONT_BYPASS_FILTERTEST); CACHE_RETURN(&inst->inst_cache, &e); /* NULL e is handled correctly */ if(sort_control!=NULL) diff --git a/ldap/servers/slapd/backend.c b/ldap/servers/slapd/backend.c index de852c8..d4fc580 100644 --- a/ldap/servers/slapd/backend.c +++ b/ldap/servers/slapd/backend.c @@ -559,13 +559,18 @@ slapi_be_setentrypoint(Slapi_Backend *be, int entrypoint, void *ret_fnptr, Slapi } int slapi_be_is_flag_set(Slapi_Backend * be, int flag) -{ +{ return be->be_flags & flag; } void slapi_be_set_flag(Slapi_Backend * be, int flag) -{ - be->be_flags|= flag; +{ + be->be_flags |= flag; +} + +void slapi_be_unset_flag(Slapi_Backend * be, int flag) +{ + be->be_flags &= ~flag; } char * slapi_be_get_name(Slapi_Backend * be) diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h index 702389a..6da4f52 100644 --- a/ldap/servers/slapd/slapi-plugin.h +++ b/ldap/servers/slapd/slapi-plugin.h @@ -6055,6 +6055,7 @@ const char * slapi_be_gettype(Slapi_Backend *be); int slapi_be_is_flag_set(Slapi_Backend * be, int flag); void slapi_be_set_flag(Slapi_Backend * be, int flag); +void slapi_be_unset_flag(Slapi_Backend * be, int flag); #define SLAPI_BE_FLAG_REMOTE_DATA 0x1 /* entries held by backend are remote */ #define SLAPI_BE_FLAG_DONT_BYPASS_FILTERTEST 0x10 /* force to call filter_test (search only) */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits August 2014