Hello community,
here is the log from the commit of package nss_ldap for openSUSE:Factory
checked in at Wed Dec 16 15:31:54 CET 2009.
--------
--- nss_ldap/nss_ldap.changes 2009-06-25 12:53:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/nss_ldap/nss_ldap.changes 2009-12-15 17:06:26.000000000 +0100
@@ -1,0 +2,17 @@
+Tue Dec 15 16:02:26 UTC 2009 - rhafer@novell.com
+
+- Update to nss_ldap-265. From the changelog:
+ * fix for PADL-Bug#132: add versioning information to binary
+ * fix for PADL-Bug#403: add AM_MAINTAINER_MODE
+ * fix for PADL-Bug#388: bad LDAP query for ether lookups
+ * fix for PADL-Bug#391: clarify bind timelimit defaults
+ in ldap.conf
+ * fix for PADL-Bug#392: call do_close() if ldap_result()
+ or ldap_parse_result() fails (before returning
+ NSS_UNAVAIL)
+ * fix for PADL-Bug#409: deallocate context in
+ _nss_ldap_ent_context_release() to avoid bad usage
+ * fix for PADL-Bug#410: don't leak file descriptors in
+ _nss_ldap_readconfig
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
nss_ldap-264.tar.bz2
New:
----
nss_ldap-265.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nss_ldap.spec ++++++
--- /var/tmp/diff_new_pack.B9IDzj/_old 2009-12-16 15:31:00.000000000 +0100
+++ /var/tmp/diff_new_pack.B9IDzj/_new 2009-12-16 15:31:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package nss_ldap (Version 264)
+# spec file for package nss_ldap (Version 265)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
Name: nss_ldap
BuildRequires: db-devel krb5-devel openldap2-devel
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Group: Productivity/Networking/LDAP/Clients
PreReq: sed coreutils /usr/bin/grep /bin/mktemp
AutoReqProv: on
@@ -29,8 +29,8 @@
Obsoletes: nss_ldap-64bit
%endif
#
-Version: 264
-Release: 2
+Version: 265
+Release: 1
Summary: NSS LDAP Module
Url: http://www.padl.com/OSS/nss_ldap.html
Source: nss_ldap-%{version}.tar.bz2
++++++ nss_ldap-264.tar.bz2 -> nss_ldap-265.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/aclocal.m4 new/nss_ldap-265/aclocal.m4
--- old/nss_ldap-264/aclocal.m4 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/aclocal.m4 2009-11-06 11:28:08.000000000 +0100
@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
+ AC_ARG_ENABLE(maintainer-mode,
+[ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer],
+ USE_MAINTAINER_MODE=$enableval,
+ USE_MAINTAINER_MODE=no)
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+ MAINT=$MAINTAINER_MODE_TRUE
+ AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/aix_authmeth.c new/nss_ldap-265/aix_authmeth.c
--- old/nss_ldap-264/aix_authmeth.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/aix_authmeth.c 2009-11-06 11:28:08.000000000 +0100
@@ -25,7 +25,7 @@
#include "config.h"
static char rcsId[] =
- "$Id: aix_authmeth.c,v 2.32 2008/10/30 20:49:46 lukeh Exp $";
+ "$Id: aix_authmeth.c,v 2.33 2009/11/06 10:15:26 lukeh Exp $";
#ifdef HAVE_USERSEC_H
@@ -795,8 +795,7 @@
(ap == NULL) ? namingAttributes : NULL,
do_parse_uess_getentry);
- _nss_ldap_ent_context_release (ctx);
- free (ctx);
+ _nss_ldap_ent_context_release (&ctx);
_nss_ldap_leave ();
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ChangeLog new/nss_ldap-265/ChangeLog
--- old/nss_ldap-264/ChangeLog 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ChangeLog 2009-11-06 11:28:08.000000000 +0100
@@ -1,6 +1,22 @@
-$Id: ChangeLog,v 2.407 2008/10/30 20:49:46 lukeh Exp $
+$Id: ChangeLog,v 2.415 2009/11/06 10:26:22 lukeh Exp $
===============================================================
+265 Luke Howard
+
+ * fix for BUG#132: add versioning information to binary
+ * fix for BUG#403: add AM_MAINTAINER_MODE
+ * fix for BUG#388: bad LDAP query for ether lookups
+ * fix for BUG#391: clarify bind timelimit defaults
+ in ldap.conf
+ * fix for BUG#392: call do_close() if ldap_result()
+ or ldap_parse_result() fails (before returning
+ NSS_UNAVAIL)
+ * fix for BUG#401: FreeBSD thread library check
+ * fix for BUG#409: deallocate context in
+ _nss_ldap_ent_context_release() to avoid bad usage
+ * fix for BUG#410: don't leak file descriptors in
+ _nss_ldap_readconfig
+
264 Luke Howard
* fix for BUG#378: MAP_H_ERRNO() should map NSS_TRYAGAIN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/configure new/nss_ldap-265/configure
--- old/nss_ldap-264/configure 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/configure 2009-11-06 11:28:08.000000000 +0100
@@ -310,7 +310,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP NSS_LDAP_PATH_CONF NSS_LDAP_PATH_ROOTPASSWD GCC_TRUE GCC_FALSE GLIBC_TRUE GLIBC_FALSE AIX_TRUE AIX_FALSE HPUX_TRUE HPUX_FALSE USE_NATIVE_LINKER_TRUE USE_NATIVE_LINKER_FALSE nss_ldap_so_LD nss_ldap_so_LDFLAGS NSS_LDAP_LDFLAGS EGREP LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP NSS_LDAP_PATH_CONF NSS_LDAP_PATH_ROOTPASSWD GCC_TRUE GCC_FALSE GLIBC_TRUE GLIBC_FALSE AIX_TRUE AIX_FALSE HPUX_TRUE HPUX_FALSE USE_NATIVE_LINKER_TRUE USE_NATIVE_LINKER_FALSE nss_ldap_so_LD nss_ldap_so_LDFLAGS NSS_LDAP_LDFLAGS EGREP LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -851,6 +851,8 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-rfc2307bis use RFC2307bis schema by default
@@ -1708,7 +1710,7 @@
# Define the identity of the package.
PACKAGE=nss_ldap
- VERSION=264
+ VERSION=265
cat >>confdefs.h <<_ACEOF
@@ -1840,6 +1842,30 @@
ac_config_headers="$ac_config_headers config.h"
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+ enableval="$enable_maintainer_mode"
+ USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
+fi;
+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -6757,6 +6783,306 @@
done
+for ac_header in arpa/nameser.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in arpa/nameser_compat.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
for ac_header in ctype.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -14700,6 +15026,13 @@
LTLIBOBJS=$ac_ltlibobjs
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -15315,6 +15648,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
+s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s,@MAINT@,$MAINT,;t t
s,@CC@,$CC,;t t
s,@CFLAGS@,$CFLAGS,;t t
s,@LDFLAGS@,$LDFLAGS,;t t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/configure.in new/nss_ldap-265/configure.in
--- old/nss_ldap-264/configure.in 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/configure.in 2009-11-06 11:28:08.000000000 +0100
@@ -2,8 +2,9 @@
AC_CANONICAL_SYSTEM
AC_PREFIX_DEFAULT()
-AM_INIT_AUTOMAKE(nss_ldap, 264)
+AM_INIT_AUTOMAKE(nss_ldap, 265)
AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
AC_PROG_CC
AC_PROG_CPP
@@ -167,6 +168,8 @@
AC_CHECK_HEADERS(net/route.h)
AC_CHECK_HEADERS(netinet/if_ether.h)
AC_CHECK_HEADERS(netinet/ether.h)
+AC_CHECK_HEADERS(arpa/nameser.h)
+AC_CHECK_HEADERS(arpa/nameser_compat.h)
AC_CHECK_HEADERS(ctype.h)
dnl AC_CHECK_HEADERS(db.h)
dnl AC_CHECK_HEADERS(db1/db.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/cvslib.pl new/nss_ldap-265/cvslib.pl
--- old/nss_ldap-264/cvslib.pl 1970-01-01 01:00:00.000000000 +0100
+++ new/nss_ldap-265/cvslib.pl 2009-11-06 11:28:08.000000000 +0100
@@ -0,0 +1,77 @@
+#ident $Id: cvslib.pl,v 2.1 2009/11/06 10:26:22 lukeh Exp $
+
+$CVSVERSIONDIR = $ENV{'CVSVERSIONDIR'};
+
+$INFOFILE = $CVSVERSIONDIR ne "" ? $CVSVERSIONDIR."/CVSVersionInfo.txt" : "CVSVersionInfo.txt";
+
+$DISTDIR = $ENV{'HOME'} . "/dist";
+
+sub getSGSFile
+{
+ if (-f "version.h") { return "version.h"; }
+ elsif (-f "vers.c") { return "vers.c"; }
+ else { return; }
+}
+
+sub nameToTag
+{
+ local($tag) = shift;
+ $tag =~ s/\./\~/g;
+ return ($tag);
+}
+
+sub getCVSRepository
+{
+ if (!(-d "CVS"))
+ {
+ return;
+ }
+
+ open(ROOT, "CVS/Root") || return;
+ open(REPOSITORY, "CVS/Repository") || return;
+ local ($CVSROOT) = <ROOT>;
+ chop ($CVSROOT);
+ if ($CVSROOT =~ '^:') {
+ local(@C) = split(/:/, $CVSROOT);
+ $CVSROOT = $C[3];
+ }
+ local ($CVSREPOSITORY) = <REPOSITORY>;
+ chop ($CVSREPOSITORY);
+ close(ROOT);
+ close(REPOSITORY);
+
+ if ($CVSREPOSITORY =~ /^\//)
+ {
+ $CVSREPOSITORY =~ s/^$CVSROOT\///g;
+ }
+ return($CVSREPOSITORY);
+}
+
+sub getCVSVersionInfo
+{
+ local ($VERSION, $PROJECT);
+
+ if (-f $INFOFILE)
+ {
+ open(INFOFILE, $INFOFILE) || return;
+ while(<INFOFILE>)
+ {
+ if (/^#/) { next; }
+
+ local ($key, $value) = split(/:\s+/);
+ chop($value);
+
+ if ($key eq "ProjectVersion")
+ {
+ $VERSION = $value;
+ }
+ elsif ($key eq "ProjectName")
+ {
+ $PROJECT = $value;
+ }
+ }
+ }
+ close(INFOFILE);
+ return "$PROJECT-$VERSION";
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/CVSVersionInfo.txt new/nss_ldap-265/CVSVersionInfo.txt
--- old/nss_ldap-264/CVSVersionInfo.txt 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/CVSVersionInfo.txt 2009-11-06 11:28:08.000000000 +0100
@@ -1,8 +1,8 @@
# Created and modified by checkpoint; do not edit
-# $Id: CVSVersionInfo.txt,v 2.308 2008/10/30 20:50:13 lukeh Exp $
-# $Name: nss_ldap-264 $
+# $Id: CVSVersionInfo.txt,v 2.309 2009/11/06 10:28:05 lukeh Exp $
+# $Name: nss_ldap-265 $
ProjectName: nss_ldap
-ProjectVersion: 264
+ProjectVersion: 265
ProjectMaintainer: lukeh
#
# run this before building in RC. @@@PLATFORM@@@ is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/irs-netgrp.c new/nss_ldap-265/irs-netgrp.c
--- old/nss_ldap-264/irs-netgrp.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/irs-netgrp.c 2009-11-06 11:28:08.000000000 +0100
@@ -23,7 +23,7 @@
#include
#include "irs-nss.h"
-/* $Id: irs-netgrp.c,v 2.6 2004/09/16 10:14:46 lukeh Exp $ */
+/* $Id: irs-netgrp.c,v 2.7 2009/11/06 10:15:26 lukeh Exp $ */
#ifdef HAVE_USERSEC_H
void *ng_pvtinit (void);
@@ -94,7 +94,7 @@
_nss_ldap_namelist_push (&ngbe->known_groups, group);
if (stat != NSS_SUCCESS)
- _nss_ldap_ent_context_release (ngbe->state);
+ _nss_ldap_ent_context_release (&(ngbe->state));
_nss_ldap_leave ();
}
@@ -141,8 +141,7 @@
if (ngbe->state != NULL)
{
_nss_ldap_enter ();
- _nss_ldap_ent_context_release (ngbe->state);
- free (ngbe->state);
+ _nss_ldap_ent_context_release (&(ngbe->state));
_nss_ldap_leave ();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ldap-automount.c new/nss_ldap-265/ldap-automount.c
--- old/nss_ldap-264/ldap-automount.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ldap-automount.c 2009-11-06 11:28:08.000000000 +0100
@@ -17,11 +17,11 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
- $Id: ldap-automount.c,v 2.9 2006/01/13 16:15:33 lukeh Exp $
+ $Id: ldap-automount.c,v 2.10 2009/11/06 10:15:26 lukeh Exp $
*/
-static char rcsId[] = "$Id: ldap-automount.c,v 2.9 2006/01/13 16:15:33 lukeh Exp $";
+static char rcsId[] = "$Id: ldap-automount.c,v 2.10 2009/11/06 10:15:26 lukeh Exp $";
#include "config.h"
@@ -146,8 +146,7 @@
if (context->lac_state != NULL)
{
- _nss_ldap_ent_context_release (context->lac_state);
- free (context->lac_state);
+ _nss_ldap_ent_context_release (&(context->lac_state));
}
memset (context, 0, sizeof (*context));
@@ -231,8 +230,7 @@
if (key != NULL)
{
- _nss_ldap_ent_context_release (key);
- free (key);
+ _nss_ldap_ent_context_release (&key);
}
if (context->lac_dn_count == 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ldap.conf new/nss_ldap-265/ldap.conf
--- old/nss_ldap-264/ldap.conf 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ldap.conf 2009-11-06 11:28:08.000000000 +0100
@@ -1,4 +1,4 @@
-# @(#)$Id: ldap.conf,v 2.48 2008/07/03 02:30:29 lukeh Exp $
+# @(#)$Id: ldap.conf,v 2.49 2009/04/25 01:53:15 lukeh Exp $
#
# This is the configuration file for the LDAP nameservice
# switch library and the LDAP PAM module.
@@ -51,10 +51,10 @@
#scope one
#scope base
-# Search timelimit
-#timelimit 30
+# Search timelimit in seconds (0 for indefinite; default 0)
+#timelimit 0
-# Bind/connect timelimit
+# Bind/connect timelimit (0 for indefinite; default 30)
#bind_timelimit 30
# Reconnect policy:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ldap-ethers.c new/nss_ldap-265/ldap-ethers.c
--- old/nss_ldap-264/ldap-ethers.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ldap-ethers.c 2009-11-06 11:28:08.000000000 +0100
@@ -17,12 +17,12 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
- $Id: ldap-ethers.c,v 2.36 2006/01/11 18:03:48 lukeh Exp $
+ $Id: ldap-ethers.c,v 2.37 2009/02/03 22:59:34 lukeh Exp $
*/
static char rcsId[] =
- "$Id: ldap-ethers.c,v 2.36 2006/01/11 18:03:48 lukeh Exp $";
+ "$Id: ldap-ethers.c,v 2.37 2009/02/03 22:59:34 lukeh Exp $";
#include "config.h"
@@ -207,12 +207,28 @@
_nss_ldap_getntohost_r (struct ether_addr * addr, struct ether * result,
char *buffer, size_t buflen, int *errnop)
{
-/* The correct ether_ntoa call would have a struct ether instead of whatever
- result->e_addr is */
+ ldap_args_t a;
+ char fullmac[18];
+
+ if (buflen < LDAP_NSS_BUFLEN_DEFAULT)
+ {
+ *errnop = ERANGE;
+ return NSS_TRYAGAIN;
+ }
- LOOKUP_NAME (ether_ntoa ((struct ether_addr *) (&result->e_addr)), result,
- buffer, buflen, errnop, _nss_ldap_filt_getntohost, LM_ETHERS,
- _nss_ldap_parse_ether, LDAP_NSS_BUFLEN_DEFAULT);
+ snprintf(fullmac, sizeof(fullmac), "%02x:%02x:%02x:%02x:%02x:%02x",
+ addr->ether_addr_octet[0], addr->ether_addr_octet[1],
+ addr->ether_addr_octet[2], addr->ether_addr_octet[3],
+ addr->ether_addr_octet[4], addr->ether_addr_octet[5]);
+
+ LA_INIT(a);
+ LA_STRING(a) = ether_ntoa(addr);
+ LA_TYPE(a) = LA_TYPE_STRING_AND_STRING;
+ LA_STRING2(a) = fullmac;
+
+ return _nss_ldap_getbyname(&a, result, buffer, buflen, errnop,
+ _nss_ldap_filt_getntohost, LM_ETHERS,
+ _nss_ldap_parse_ether);
}
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ldap-grp.c new/nss_ldap-265/ldap-grp.c
--- old/nss_ldap-264/ldap-grp.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ldap-grp.c 2009-11-06 11:28:08.000000000 +0100
@@ -19,7 +19,7 @@
*/
static char rcsId[] =
- "$Id: ldap-grp.c,v 2.109 2007/06/19 15:08:25 lukeh Exp $";
+ "$Id: ldap-grp.c,v 2.110 2009/11/06 10:15:26 lukeh Exp $";
#include "config.h"
@@ -288,7 +288,8 @@
int *pGroupMembersBufferIsMalloced,
char **buffer, size_t * buflen,
int *depth,
- struct name_list **pKnownGroups) /* traversed groups */
+ struct name_list **pKnownGroups,
+ int itemsLeft) /* traversed groups */
{
NSS_STATUS stat = NSS_SUCCESS;
char **dnValues = NULL;
@@ -425,6 +426,7 @@
{
/* just a normal user which we have flattened */
i++;
+ itemsLeft--;
continue;
}
@@ -435,7 +437,7 @@
pGroupMembersBufferSize,
pGroupMembersBufferIsMalloced,
buffer, buflen, depth,
- pKnownGroups);
+ pKnownGroups, itemsLeft);
(*depth)--;
if (parseStat == NSS_TRYAGAIN)
@@ -614,7 +616,7 @@
&groupMembersCount,
&groupMembersBufferSize,
&groupMembersBufferIsMalloced, &buffer,
- &buflen, &depth, &knownGroups);
+ &buflen, &depth, &knownGroups, 0);
if (stat != NSS_SUCCESS)
{
if (groupMembersBufferIsMalloced)
@@ -872,8 +874,7 @@
stat = _nss_ldap_namelist_push (&lia->known_groups, dn);
}
- _nss_ldap_ent_context_release (ctx);
- free (ctx);
+ _nss_ldap_ent_context_release (&ctx);
return stat;
}
@@ -958,8 +959,7 @@
free (filteredMembersOf);
- _nss_ldap_ent_context_release (ctx);
- free (ctx);
+ _nss_ldap_ent_context_release (&ctx);
return stat;
}
@@ -1151,8 +1151,7 @@
}
_nss_ldap_namelist_destroy (&lia.known_groups);
- _nss_ldap_ent_context_release (ctx);
- free (ctx);
+ _nss_ldap_ent_context_release (&ctx);
_nss_ldap_leave ();
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ldap-hosts.c new/nss_ldap-265/ldap-hosts.c
--- old/nss_ldap-264/ldap-hosts.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ldap-hosts.c 2009-11-06 11:28:08.000000000 +0100
@@ -17,11 +17,11 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
- $Id: ldap-hosts.c,v 2.36 2006/12/18 08:12:36 lukeh Exp $
+ $Id: ldap-hosts.c,v 2.37 2009/05/26 07:25:12 lukeh Exp $
*/
static char rcsId[] =
- "$Id: ldap-hosts.c,v 2.36 2006/12/18 08:12:36 lukeh Exp $";
+ "$Id: ldap-hosts.c,v 2.37 2009/05/26 07:25:12 lukeh Exp $";
#include "config.h"
@@ -43,6 +43,9 @@
#include
#include
#include
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include
+#endif
#include
#ifdef HAVE_LBER_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ldap-netgrp.c new/nss_ldap-265/ldap-netgrp.c
--- old/nss_ldap-264/ldap-netgrp.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ldap-netgrp.c 2009-11-06 11:28:08.000000000 +0100
@@ -18,11 +18,11 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
- $Id: ldap-netgrp.c,v 2.46 2008/10/15 01:25:56 lukeh Exp $
+ $Id: ldap-netgrp.c,v 2.48 2009/11/06 10:15:26 lukeh Exp $
*/
static char rcsId[] =
- "$Id: ldap-netgrp.c,v 2.46 2008/10/15 01:25:56 lukeh Exp $";
+ "$Id: ldap-netgrp.c,v 2.48 2009/11/06 10:15:26 lukeh Exp $";
#include "config.h"
@@ -498,7 +498,7 @@
char **vals, **p;
ldap_state_t *state = &ctx->ec_state;
struct __netgrent __netgrent;
- LDAPMessage *e;
+ LDAPMessage *e = NULL;
if (state->ls_retry == 0 && state->ls_info.ls_index == -1)
{
@@ -705,8 +705,7 @@
li_args->lia_depth--;
- _nss_ldap_ent_context_release (ctx);
- free (ctx);
+ _nss_ldap_ent_context_release (&ctx);
debug ("<== do_innetgr_nested status=%d netgr_status=%d",
stat, li_args->lia_netgr_status);
@@ -746,8 +745,7 @@
&li_args->lia_erange, NULL, LM_NETGROUP,
NULL, do_parse_innetgr);
- _nss_ldap_ent_context_release (ctx);
- free (ctx);
+ _nss_ldap_ent_context_release (&ctx);
debug ("<== do_innetgr status=%d netgr_status=%d",
stat, li_args->lia_netgr_status);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ldap-network.c new/nss_ldap-265/ldap-network.c
--- old/nss_ldap-264/ldap-network.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ldap-network.c 2009-11-06 11:28:08.000000000 +0100
@@ -17,13 +17,13 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
- $Id: ldap-network.c,v 2.34 2006/10/02 04:50:55 lukeh Exp $
+ $Id: ldap-network.c,v 2.35 2009/05/26 07:25:12 lukeh Exp $
*/
/* parts based on nss_nis */
static char rcsId[] =
- "$Id: ldap-network.c,v 2.34 2006/10/02 04:50:55 lukeh Exp $";
+ "$Id: ldap-network.c,v 2.35 2009/05/26 07:25:12 lukeh Exp $";
#include "config.h"
@@ -44,6 +44,9 @@
#include
#include
#include
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include
+#endif
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ldap-nss.c new/nss_ldap-265/ldap-nss.c
--- old/nss_ldap-264/ldap-nss.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ldap-nss.c 2009-11-06 11:28:08.000000000 +0100
@@ -19,7 +19,7 @@
*/
static char rcsId[] =
- "$Id: ldap-nss.c,v 2.300 2008/10/30 20:49:47 lukeh Exp $";
+ "$Id: ldap-nss.c,v 2.302 2009/11/06 10:15:26 lukeh Exp $";
#include "config.h"
@@ -481,9 +481,7 @@
if ((((nss_ldap_backend_t *) be)->state) != NULL)
{
_nss_ldap_enter ();
- _nss_ldap_ent_context_release ((((nss_ldap_backend_t *) be)->state));
- free ((((nss_ldap_backend_t *) be)->state));
- ((nss_ldap_backend_t *) be)->state = NULL;
+ _nss_ldap_ent_context_release (&(((nss_ldap_backend_t *) be)->state));
_nss_ldap_leave ();
}
@@ -2036,21 +2034,9 @@
return ctx;
}
-/*
- * Clears a given context; we require the caller
- * to acquire the lock.
- */
-void
-_nss_ldap_ent_context_release (ent_context_t * ctx)
+static void
+do_context_release (ent_context_t * ctx, int free_context)
{
- debug ("==> _nss_ldap_ent_context_release");
-
- if (ctx == NULL)
- {
- debug ("<== _nss_ldap_ent_context_release");
- return;
- }
-
/*
* Abandon the search if there were more results to fetch.
*/
@@ -2082,6 +2068,28 @@
do_close ();
}
+ if (free_context)
+ free (ctx);
+}
+
+/*
+ * Clears a given context; we require the caller
+ * to acquire the lock.
+ */
+void
+_nss_ldap_ent_context_release (ent_context_t ** ctx)
+{
+ debug ("==> _nss_ldap_ent_context_release");
+
+ if (ctx == NULL || *ctx == NULL)
+ {
+ debug ("<== _nss_ldap_ent_context_release");
+ return;
+ }
+
+ do_context_release (*ctx, 1);
+ *ctx = NULL;
+
debug ("<== _nss_ldap_ent_context_release");
return;
@@ -2475,6 +2483,7 @@
#endif /* LDAP_OPT_ERROR_NUMBER */
syslog (LOG_ERR, "nss_ldap: could not get LDAP result - %s",
ldap_err2string (rc));
+ do_close();
stat = NSS_UNAVAIL;
break;
case LDAP_RES_SEARCH_ENTRY:
@@ -2505,11 +2514,12 @@
if (parserc != LDAP_SUCCESS
&& parserc != LDAP_MORE_RESULTS_TO_RETURN)
{
- stat = NSS_UNAVAIL;
ldap_abandon (__session.ls_conn, ctx->ec_msgid);
syslog (LOG_ERR,
"nss_ldap: could not get LDAP result - %s",
ldap_err2string (rc));
+ do_close();
+ stat = NSS_UNAVAIL;
}
else if (resultControls != NULL)
{
@@ -3501,7 +3511,7 @@
stat = do_parse_s (&ctx, result, buffer, buflen, errnop, parser);
- _nss_ldap_ent_context_release (&ctx);
+ do_context_release (&ctx, 0);
/* moved unlock here to avoid race condition bug #49 */
_nss_ldap_leave ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ldap-nss.h new/nss_ldap-265/ldap-nss.h
--- old/nss_ldap-264/ldap-nss.h 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ldap-nss.h 2009-11-06 11:28:08.000000000 +0100
@@ -17,7 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
- $Id: ldap-nss.h,v 2.139 2008/10/30 20:49:47 lukeh Exp $
+ $Id: ldap-nss.h,v 2.141 2009/11/06 10:15:26 lukeh Exp $
*/
#ifndef _LDAP_NSS_LDAP_LDAP_NSS_H
@@ -67,11 +67,11 @@
#include "ldap-schema.h"
#ifndef NSS_BUFSIZ
-#define NSS_BUFSIZ 1024
+#define NSS_BUFSIZ 1024
#endif
#ifndef NSS_BUFLEN_GROUP
-#define NSS_BUFLEN_GROUP LDAP_NSS_BUFLEN_GROUP
+#define NSS_BUFLEN_GROUP LDAP_NSS_BUFLEN_GROUP
#endif
#ifndef NSS_BUFLEN_PASSWD
@@ -79,11 +79,11 @@
#endif
#ifndef HAVE_NSSWITCH_H
-#define NSS_BUFLEN_HOSTS (NSS_BUFSIZ + (MAXALIASES + MAXALIASES + 2) * sizeof (char *))
+#define NSS_BUFLEN_HOSTS (NSS_BUFSIZ + (MAXALIASES + MAXALIASES + 2) * sizeof (char *))
#define NSS_BUFLEN_NETGROUP (MAXHOSTNAMELEN * 2 + LOGNAME_MAX + 3)
#define NSS_BUFLEN_NETWORKS NSS_BUFSIZ
#define NSS_BUFLEN_PROTOCOLS NSS_BUFSIZ
-#define NSS_BUFLEN_RPC NSS_BUFSIZ
+#define NSS_BUFLEN_RPC NSS_BUFSIZ
#define NSS_BUFLEN_SERVICES NSS_BUFSIZ
#define NSS_BUFLEN_SHADOW NSS_BUFSIZ
#define NSS_BUFLEN_ETHERS NSS_BUFSIZ
@@ -96,7 +96,7 @@
* unacceptable, in which case you may wish to adjust
* the constants below.
*/
-#define LDAP_NSS_TRIES 5 /* number of sleeping reconnect attempts */
+#define LDAP_NSS_TRIES 5 /* number of sleeping reconnect attempts */
#define LDAP_NSS_SLEEPTIME 4 /* seconds to sleep; doubled until max */
#define LDAP_NSS_MAXSLEEPTIME 64 /* maximum seconds to sleep */
#define LDAP_NSS_MAXCONNTRIES 2 /* reconnect attempts before sleeping */
@@ -185,7 +185,7 @@
#define INLINE
#endif /* __GNUC__ */
-#define align(ptr, blen, TYPE) do { \
+#define align(ptr, blen, TYPE) do { \
char *qtr = ptr; \
ptr += alignof(TYPE) - 1; \
ptr -= ((ptr - (char *)NULL) % alignof(TYPE)); \
@@ -194,7 +194,7 @@
/* worst case */
#define bytesleft(ptr, blen, TYPE) ( (blen < alignof(TYPE)) ? \
- 0 : (blen - alignof(TYPE) + 1))
+ 0 : (blen - alignof(TYPE) + 1))
/* selectors for different maps */
enum ldap_map_selector
@@ -666,7 +666,7 @@
/*
* Portable locking macro.
*/
-#if defined(HAVE_THREAD_H) && !defined(_AIX)
+#if defined(HAVE_THREAD_H) && !defined(_AIX) && !defined(__FreeBSD__)
#define NSS_LDAP_LOCK(m) mutex_lock(&m)
#define NSS_LDAP_UNLOCK(m) mutex_unlock(&m)
#define NSS_LDAP_DEFINE_LOCK(m) static mutex_t m = DEFAULTMUTEX
@@ -689,6 +689,16 @@
pthread_mutex_unlock(&m); \
} while (0)
# define NSS_LDAP_DEFINE_LOCK(m) static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER
+#elif defined(__FreeBSD__)
+# define NSS_LDAP_LOCK(m) do { \
+ if (__isthreaded) \
+ pthread_mutex_lock(&m); \
+ } while (0)
+# define NSS_LDAP_UNLOCK(m) do { \
+ if (__isthreaded) \
+ pthread_mutex_unlock(&m); \
+ } while (0)
+# define NSS_LDAP_DEFINE_LOCK(m) static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER
#else
# define NSS_LDAP_LOCK(m) pthread_mutex_lock(&m)
# define NSS_LDAP_UNLOCK(m) pthread_mutex_unlock(&m)
@@ -758,7 +768,7 @@
/*
* _nss_ldap_ent_context_release() is used to manually free a context
*/
-void _nss_ldap_ent_context_release (ent_context_t *);
+void _nss_ldap_ent_context_release (ent_context_t **);
/*
* these are helper functions for ldap-grp.c only on Solaris
@@ -811,7 +821,7 @@
int *errnop, /* OUT */
const char *filterprot, /* IN */
ldap_map_selector_t sel, /* IN */
- const char **user_attrs, /* IN */
+ const char **user_attrs, /* IN */
parser_t parser /* IN */ );
/*
@@ -874,13 +884,13 @@
#endif /* HAVE_SHADOW_H */
NSS_STATUS _nss_ldap_map_put (ldap_config_t * config,
- ldap_map_selector_t sel,
- ldap_map_type_t map,
+ ldap_map_selector_t sel,
+ ldap_map_type_t map,
const char *key, const char *value);
NSS_STATUS _nss_ldap_map_get (ldap_config_t * config,
- ldap_map_selector_t sel,
- ldap_map_type_t map,
+ ldap_map_selector_t sel,
+ ldap_map_type_t map,
const char *key, const char **value);
const char *_nss_ldap_map_at (ldap_map_selector_t sel, const char *pChar2);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ldap-parse.h new/nss_ldap-265/ldap-parse.h
--- old/nss_ldap-264/ldap-parse.h 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ldap-parse.h 2009-11-06 11:28:08.000000000 +0100
@@ -17,7 +17,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
- $Id: ldap-parse.h,v 2.21 2005/05/20 05:30:41 lukeh Exp $
+ $Id: ldap-parse.h,v 2.22 2009/11/06 10:15:26 lukeh Exp $
*/
@@ -170,7 +170,7 @@
return NSS_SUCCESS
#define LOOKUP_ENDENT(key) \
_nss_ldap_enter(); \
- _nss_ldap_ent_context_release(((nss_ldap_backend_t *)key)->state); \
+ _nss_ldap_ent_context_release(&(((nss_ldap_backend_t *)key)->state)); \
_nss_ldap_leave(); \
return NSS_SUCCESS
@@ -182,7 +182,7 @@
return NSS_SUCCESS
#define LOOKUP_ENDENT(key) \
_nss_ldap_enter(); \
- _nss_ldap_ent_context_release(key); \
+ _nss_ldap_ent_context_release(&key); \
_nss_ldap_leave(); \
return NSS_SUCCESS
@@ -194,7 +194,7 @@
#define LOOKUP_ENDENT(this) \
struct pvt *pvt = (struct pvt *)this->private; \
_nss_ldap_enter(); \
- _nss_ldap_ent_context_release(pvt->state); \
+ _nss_ldap_ent_context_release(&(pvt->state)); \
_nss_ldap_leave();
#endif /* HAVE_NSSWITCH_H */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ldap-schema.c new/nss_ldap-265/ldap-schema.c
--- old/nss_ldap-264/ldap-schema.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ldap-schema.c 2009-11-06 11:28:08.000000000 +0100
@@ -17,11 +17,11 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
- $Id: ldap-schema.c,v 2.34 2007/10/01 00:25:33 lukeh Exp $
+ $Id: ldap-schema.c,v 2.35 2009/02/03 22:59:34 lukeh Exp $
*/
static char rcsId[] =
- "$Id: ldap-schema.c,v 2.34 2007/10/01 00:25:33 lukeh Exp $";
+ "$Id: ldap-schema.c,v 2.35 2009/02/03 22:59:34 lukeh Exp $";
#include "config.h"
@@ -154,8 +154,8 @@
"(&(%s=%s)(%s=%s))", AT (objectClass), OC (ieee802Device),
ATM (LM_ETHERS, cn), "%s");
snprintf (_nss_ldap_filt_getntohost, LDAP_FILT_MAXSIZ,
- "(&(%s=%s)(%s=%s))", AT (objectClass), OC (ieee802Device), AT (macAddress),
- "%s");
+ "(&(%s=%s)(|(%s=%s)(%s=%s)))", AT (objectClass), OC (ieee802Device),
+ AT (macAddress), "%s", AT (macAddress), "%s");
snprintf (_nss_ldap_filt_getetherent, LDAP_FILT_MAXSIZ, "(%s=%s)",
AT (objectClass), OC (ieee802Device));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/ldap-sldap.c new/nss_ldap-265/ldap-sldap.c
--- old/nss_ldap-264/ldap-sldap.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/ldap-sldap.c 2009-11-06 11:28:08.000000000 +0100
@@ -17,12 +17,12 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
- $Id: ldap-sldap.c,v 2.13 2008/08/23 00:51:01 lukeh Exp $
+ $Id: ldap-sldap.c,v 2.14 2009/11/06 10:15:26 lukeh Exp $
*/
static char rcsId[] =
- "$Id: ldap-sldap.c,v 2.13 2008/08/23 00:51:01 lukeh Exp $";
+ "$Id: ldap-sldap.c,v 2.14 2009/11/06 10:15:26 lukeh Exp $";
#include "config.h"
@@ -887,8 +887,7 @@
ldap_value_free (cookie->attribute);
if (cookie->state != NULL)
{
- _nss_ldap_ent_context_release (cookie->state);
- free (cookie->state);
+ _nss_ldap_ent_context_release (&(cookie->state));
}
if (cookie->mapped_filter != NULL)
free (cookie->mapped_filter);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/Makefile.am new/nss_ldap-265/Makefile.am
--- old/nss_ldap-264/Makefile.am 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/Makefile.am 2009-11-06 11:28:08.000000000 +0100
@@ -22,7 +22,8 @@
ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c \
ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c \
ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c \
- dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c
+ dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c \
+ vers.c
nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@
@@ -31,7 +32,7 @@
NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c ldap-pwd.c ldap-netgrp.c ldap-schema.c \
util.c ltf.c snprintf.c resolve.c dnsconfig.c \
- irs-nss.c pagectrl.c aix_authmeth.c ldap-init-krb5-cache.c
+ irs-nss.c pagectrl.c aix_authmeth.c ldap-init-krb5-cache.c vers.c
NSS_LDAP_LDFLAGS = @NSS_LDAP_LDFLAGS@
DEFS = @DEFS@
@@ -107,3 +108,6 @@
uninstall-local:
@$(NORMAL_UNINSTALL)
+vers.c: $(top_srcdir)/CVSVersionInfo.txt
+ CVSVERSIONDIR=$(top_srcdir) vers_string -v
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/Makefile.in new/nss_ldap-265/Makefile.in
--- old/nss_ldap-264/Makefile.in 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/Makefile.in 2009-11-06 11:28:08.000000000 +0100
@@ -60,7 +60,7 @@
util.$(OBJEXT) ltf.$(OBJEXT) snprintf.$(OBJEXT) \
resolve.$(OBJEXT) dnsconfig.$(OBJEXT) irs-nss.$(OBJEXT) \
pagectrl.$(OBJEXT) aix_authmeth.$(OBJEXT) \
- ldap-init-krb5-cache.$(OBJEXT)
+ ldap-init-krb5-cache.$(OBJEXT) vers.$(OBJEXT)
NSS_LDAP_OBJECTS = $(am_NSS_LDAP_OBJECTS)
NSS_LDAP_LDADD = $(LDADD)
am_nss_ldap_so_OBJECTS = ldap-nss.$(OBJEXT) ldap-pwd.$(OBJEXT) \
@@ -72,7 +72,7 @@
ldap-automount.$(OBJEXT) util.$(OBJEXT) ltf.$(OBJEXT) \
snprintf.$(OBJEXT) resolve.$(OBJEXT) dnsconfig.$(OBJEXT) \
irs-nss.$(OBJEXT) pagectrl.$(OBJEXT) ldap-sldap.$(OBJEXT) \
- ldap-init-krb5-cache.$(OBJEXT)
+ ldap-init-krb5-cache.$(OBJEXT) vers.$(OBJEXT)
nss_ldap_so_OBJECTS = $(am_nss_ldap_so_OBJECTS)
nss_ldap_so_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
@@ -137,6 +137,9 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
NSS_LDAP_LDFLAGS = @NSS_LDAP_LDFLAGS@
NSS_LDAP_PATH_CONF = @NSS_LDAP_PATH_CONF@
@@ -212,11 +215,12 @@
ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c \
ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c \
ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c \
- dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c
+ dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c \
+ vers.c
NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c ldap-pwd.c ldap-netgrp.c ldap-schema.c \
util.c ltf.c snprintf.c resolve.c dnsconfig.c \
- irs-nss.c pagectrl.c aix_authmeth.c ldap-init-krb5-cache.c
+ irs-nss.c pagectrl.c aix_authmeth.c ldap-init-krb5-cache.c vers.c
@GCC_FALSE@MULTI_OS_DIRECTORY = .
#INCLUDES = -I$(top_builddir) -I$(srcdir)
@@ -238,7 +242,7 @@
.SUFFIXES: .c .o .obj
am--refresh:
@:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -265,9 +269,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
@@ -279,7 +283,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(am__configure_deps) $(top_srcdir)/acconfig.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
@@ -327,6 +331,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vers.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -696,6 +701,9 @@
uninstall-local:
@$(NORMAL_UNINSTALL)
+
+vers.c: $(top_srcdir)/CVSVersionInfo.txt
+ CVSVERSIONDIR=$(top_srcdir) vers_string -v
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/nss_ldap.spec new/nss_ldap-265/nss_ldap.spec
--- old/nss_ldap-264/nss_ldap.spec 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/nss_ldap.spec 2009-11-06 11:28:08.000000000 +0100
@@ -1,6 +1,6 @@
Summary: NSS library for LDAP.
Name: nss_ldap
-Version: 264
+Version: 265
Release: 1
Source0: ftp://ftp.padl.com/pub/%{name}-%{version}.tar.gz
Source1: ldap.conf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/resolve.c new/nss_ldap-265/resolve.c
--- old/nss_ldap-264/resolve.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/resolve.c 2009-11-06 11:28:08.000000000 +0100
@@ -43,6 +43,9 @@
#include
#include
#include
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include
+#endif
#include
#ifdef HAVE_STRINGS_H
#include
@@ -52,7 +55,7 @@
#include "resolve.h"
-static char rcsId[] = "$Id: resolve.c,v 2.10 2004/06/29 16:09:57 lukeh Exp $";
+static char rcsId[] = "$Id: resolve.c,v 2.11 2009/05/26 07:25:12 lukeh Exp $";
#if defined(HAVE_RES_SEARCH) && defined(HAVE_DN_EXPAND)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/resolve.h new/nss_ldap-265/resolve.h
--- old/nss_ldap-264/resolve.h 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/resolve.h 2009-11-06 11:28:08.000000000 +0100
@@ -1,5 +1,3 @@
-
-
/*
* Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Hvgskolan
* (Royal Institute of Technology, Stockholm, Sweden).
@@ -38,7 +36,7 @@
* SUCH DAMAGE.
*/
-/* $Id: resolve.h,v 2.5 2001/08/17 05:30:13 lukeh Exp $ */
+/* $Id: resolve.h,v 2.6 2009/05/26 07:25:12 lukeh Exp $ */
/* THIS IS NOT (yet) A PUBLIC INTERFACE */
@@ -46,7 +44,12 @@
#define __RESOLVE_H__
/* when would this *not* be defined? */
-#define HAVE_ARPA_NAMESER_H
+#include "config.h"
+
+#include
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include
+#endif
/* We use these, but they are not always present in */
@@ -101,11 +104,6 @@
struct resource_record *next;
};
-
-#ifndef HAVE_ARPA_NAMESER_H /* XXX */
-typedef int HEADER; /* will never be used */
-#endif
-
struct dns_reply
{
HEADER h;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/util.c new/nss_ldap-265/util.c
--- old/nss_ldap-264/util.c 2008-10-30 21:50:15.000000000 +0100
+++ new/nss_ldap-265/util.c 2009-11-06 11:28:08.000000000 +0100
@@ -58,7 +58,7 @@
#include "ldap-nss.h"
#include "util.h"
-static char rcsId[] = "$Id: util.c,v 2.137 2008/10/30 20:49:47 lukeh Exp $";
+static char rcsId[] = "$Id: util.c,v 2.138 2009/11/06 10:16:04 lukeh Exp $";
static NSS_STATUS do_getrdnvalue (const char *dn,
const char *rdntype,
@@ -793,6 +793,7 @@
if (bytesleft (*buffer, *buflen, ldap_config_t *) < sizeof (ldap_config_t))
{
+ fclose (fp);
return NSS_TRYAGAIN;
}
align (*buffer, *buflen, ldap_config_t *);
@@ -803,6 +804,7 @@
stat = _nss_ldap_init_config (result);
if (stat != NSS_SUCCESS)
{
+ fclose (fp);
return NSS_SUCCESS;
}
@@ -1253,6 +1255,7 @@
if (*buflen < (size_t) (len + 1))
{
+ fclose (fp);
return NSS_UNAVAIL;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nss_ldap-264/vers_string new/nss_ldap-265/vers_string
--- old/nss_ldap-264/vers_string 1970-01-01 01:00:00.000000000 +0100
+++ new/nss_ldap-265/vers_string 2009-11-06 11:28:08.000000000 +0100
@@ -0,0 +1,83 @@
+#!/usr/bin/perl
+#
+#ident $Id: vers_string,v 2.1 2009/11/06 10:26:22 lukeh Exp $
+#
+# Implementation of SGS vers_string which uses CVSVersionInfo.txt.
+
+require "cvslib.pl";
+
+$OUTFILE = (-f "version.h") ? "version.h" : "vers.c";
+$AUTHOR = `whoami`;
+$HEADER = '$Id: vers_string,v 2.1 2009/11/06 10:26:22 lukeh Exp $';
+
+if ($ENV{'PROGRAM'}) { $PROGRAM = $ENV{'PROGRAM'}; }
+
+chop($AUTHOR);
+chop($DATE=`date -u`);
+chop($CWD=`pwd`);
+
+($PROJECT, $VERSION) = split(/\-/, &getCVSVersionInfo());
+
+if (!defined($PROJECT)) {
+ $PROJECT = "Unknown";
+ $PROGRAM = "Unknown";
+} else {
+ $SEP = "-";
+ if (!defined($PROGRAM)) {
+ chop($PROGRAM=`basename $CWD`);
+ }
+}
+
+if ($ARGV[0] eq "-f") {
+ print $PROJECT, $SEP, $VERSION, "\n";
+} elsif ($ARGV[0] eq "-l") {
+ print "static const char SGS_VERS[160] = \"";
+ print '@(#)LIBRARY:', $PROGRAM, ' PROJECT:', $PROJECT, $SEP, $VERSION, ' DEVELOPER:', $AUTHOR, ' BUILT:', $DATE;
+ print "\";\n";
+} elsif ($ARGV[0] eq "-c") {
+ print "const char SGS_VERS[160] = \"";
+ print '@(#)PROGRAM:', $PROGRAM, ' PROJECT:', $PROJECT, $SEP, $VERSION, ' DEVELOPER:', $AUTHOR, ' BUILT:', $DATE;
+ print "\";\n";
+ print "const char VERS_NUM[10] = \"$VERSION\";\n";
+} elsif ($ARGV[0] eq "-n") {
+ print "$VERSION\n";
+} elsif ($ARGV[0] eq "-B") {
+ print 'PROGRAM:', $PROGRAM, ' PROJECT:', $PROJECT, $SEP, $VERSION, ' DEVELOPER:', $AUTHOR, ' BUILT:NO DATE SET (-B used)',"\n";
+} elsif ($ARGV[0] eq "-v") {
+ unlink($OUTFILE);
+ open(OUTFILE,">$OUTFILE");
+ print OUTFILE "/* $OUTFILE built by $HEADER */\n";
+ print OUTFILE "\n";
+ if ($OUTFILE eq "version.h") {
+ print OUTFILE "#define USE_SGS_VERS\n\n";
+ }
+ print OUTFILE "const char SGS_VERS[160] = \"";
+ print OUTFILE '@(#)PROGRAM:', $PROGRAM, ' PROJECT:', $PROJECT, $SEP, $VERSION, ' DEVELOPER:', $AUTHOR, ' BUILT:', $DATE;
+ print OUTFILE "\";\n\n";
+ print OUTFILE "const char VERS_NUM[10] = \"$VERSION\";\n\n";
+ close(OUTFILE);
+} elsif ($ARGV[0] ne "") {
+ print STDERR "$HEADER\n";
+ print STDERR "Copyright (C) 1997-1998 Luke Howard ";
+ print STDERR "\n\n";
+ print STDERR "Unknown command line option $ARGV[0].\n";
+ print STDERR "Usage: vers_string [-f|-l|-c|-n|-B|-v]\n";
+ print STDERR "\t-f: echo project-n to stdout\n";
+ print STDERR "\t-l: echo static const char SGS_VERS to stdout\n";
+ print STDERR "\t-c: echo const char VERS_NUM and SGS_VERS to stdout\n";
+ print STDERR "\t-n: echo version number to stdout\n";
+ print STDERR "\t-B: emulate vers_string -B (why?)\n";
+ print STDERR "\t-v: generate $OUTFILE\n";
+ print STDERR "\tother options same as vers_string\n";
+ print STDERR "\n";
+ print STDERR "\tTo attach a project name and version number to a CVS\n";
+ print STDERR "\tmodule, use checkpoint\n";
+ print STDERR "\tTo find out the current project version, type cvsver\n";
+ print STDERR "\tTo create a new project, type cvsnew [project]\n";
+ print STDERR "\tTo sync with an existing project, type cvssync\n";
+ print STDERR "\tTo create a project distribution, type tarup\n";
+ print STDERR "\tTo commit a project, type commit [message]\n";
+} else {
+ print 'PROGRAM:', $PROGRAM, ' PROJECT:', $PROJECT, $SEP, $VERSION, ' DEVELOPER:', $AUTHOR, ' BUILT:', $DATE;
+ print "\n";
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org