Hello community,
here is the log from the commit of package nss_ldap
checked in at Sun Jul 8 22:48:02 CEST 2007.
--------
--- nss_ldap/nss_ldap.changes 2007-03-05 12:39:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/nss_ldap/nss_ldap.changes 2007-07-06 14:38:19.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Jul 6 14:36:15 CEST 2007 - rhafer@suse.de
+
+- Fix URI generation when looking up LDAP Server via SRV records
+- Update to nss_ldap-256
+ * patch from Tomas Janousek to check for
+ pthread_once(); __pthread_once does not imply __pthread_atfork
+ being non-NULL
+ * fix for BUG#315: memory corruption/crash in initgroups parsing
+-------------------------------------------------------------------
Old:
----
nss_ldap-255.tar.bz2
New:
----
dns_create_uri.dif
nss_ldap-256.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nss_ldap.spec ++++++
--- /var/tmp/diff_new_pack.P21799/_old 2007-07-08 22:47:39.000000000 +0200
+++ /var/tmp/diff_new_pack.P21799/_new 2007-07-08 22:47:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package nss_ldap (Version 255)
+# spec file for package nss_ldap (Version 256)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,11 +12,11 @@
Name: nss_ldap
BuildRequires: db-devel krb5-devel openldap2-devel
-License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: LGPL v2 or later
Group: Productivity/Networking/LDAP/Clients
PreReq: /usr/bin/grep /usr/bin/sed /bin/mktemp
Autoreqprov: on
-Version: 255
+Version: 256
Release: 1
Summary: NSS LDAP Module
URL: http://www.padl.com/OSS/nss_ldap.html
@@ -25,6 +25,7 @@
Patch: nss_ldap.dif
Patch1: sigset.dif
Patch2: group-utf8.dif
+Patch3: dns_create_uri.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -44,6 +45,7 @@
%patch -p1
%patch1
%patch2 -p1
+%patch3 -p1
cp -v %{S:1} .
%build
@@ -102,6 +104,13 @@
%doc %{_mandir}/man5/nss_ldap.5*
%changelog
+* Fri Jul 06 2007 - rhafer@suse.de
+- Fix URI generation when looking up LDAP Server via SRV records
+- Update to nss_ldap-256
+ * patch from Tomas Janousek to check for
+ pthread_once(); __pthread_once does not imply __pthread_atfork
+ being non-NULL
+ * fix for BUG#315: memory corruption/crash in initgroups parsing
* Mon Mar 05 2007 - rhafer@suse.de
- Update to nss_ldap-255
* fix for PADL-Bug#304: fd leak in do_close_no_unbind
++++++ dns_create_uri.dif ++++++
Index: nss_ldap-255/dnsconfig.c
===================================================================
--- nss_ldap-255.orig/dnsconfig.c
+++ nss_ldap-255/dnsconfig.c
@@ -165,7 +165,7 @@ _nss_ldap_mergeconfigfromdns (ldap_confi
{
if (rr->type == T_SRV)
{
- snprintf (uribuf, sizeof(uribuf), "ldap%s:%s:%d",
+ snprintf (uribuf, sizeof(uribuf), "ldap%s://%s:%d",
(rr->u.srv->port == LDAPS_PORT) ? "s" : "",
rr->u.srv->target,
rr->u.srv->port);
++++++ nss_ldap-255.tar.bz2 -> nss_ldap-256.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nss_ldap-255/AUTHORS new/nss_ldap-256/AUTHORS
--- old/nss_ldap-255/AUTHORS 2007-03-03 08:12:37.000000000 +0100
+++ new/nss_ldap-256/AUTHORS 2007-06-19 17:08:41.000000000 +0200
@@ -30,6 +30,7 @@
Daniel Hanks
Leif Hedstrom
Emile Heitor
+ Tomas Janousek
Geert Jansen <undisclosed>
Szymon Juraszczyk
Anselm Kruis
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nss_ldap-255/ChangeLog new/nss_ldap-256/ChangeLog
--- old/nss_ldap-255/ChangeLog 2007-03-03 08:12:37.000000000 +0100
+++ new/nss_ldap-256/ChangeLog 2007-06-19 17:08:41.000000000 +0200
@@ -1,6 +1,14 @@
-$Id: ChangeLog,v 2.384 2007/03/03 07:05:50 lukeh Exp $
+$Id: ChangeLog,v 2.387 2007/06/19 15:08:25 lukeh Exp $
===============================================================
+256 Luke Howard
+
+ * patch from Tomas Janousek
+ to check for pthread_once(); __pthread_once does
+ not imply __pthread_atfork being non-NULL
+ * fix for BUG#315: memory corruption/crash in
+ initgroups parsing
+
255 Luke Howard
* fix for BUG#303: SSL port behavior change since
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nss_ldap-255/config.h.in new/nss_ldap-256/config.h.in
--- old/nss_ldap-255/config.h.in 2007-03-03 08:12:37.000000000 +0100
+++ new/nss_ldap-256/config.h.in 2007-06-19 17:08:41.000000000 +0200
@@ -180,6 +180,10 @@
/* Define to 1 if you have the `pthread' library (-lpthread). */
#undef HAVE_LIBPTHREAD
+/* Define to 1 if you have the `pthread_nonshared' library
+ (-lpthread_nonshared). */
+#undef HAVE_LIBPTHREAD_NONSHARED
+
/* Define to 1 if you have the `resolv' library (-lresolv). */
#undef HAVE_LIBRESOLV
@@ -225,6 +229,9 @@
/* Define to 1 if you have the header file. */
#undef HAVE_PTHREAD_H
+/* Define to 1 if you have the `pthread_once' function. */
+#undef HAVE_PTHREAD_ONCE
+
/* Define to 1 if you have the `res_search' function. */
#undef HAVE_RES_SEARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nss_ldap-255/configure new/nss_ldap-256/configure
--- old/nss_ldap-255/configure 2007-03-03 08:12:37.000000000 +0100
+++ new/nss_ldap-256/configure 2007-06-19 17:08:41.000000000 +0200
@@ -816,7 +816,7 @@
PACKAGE=nss_ldap
-VERSION=255
+VERSION=256
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -3341,15 +3341,113 @@
fi
done
+echo $ac_n "checking for main in -lpthread_nonshared""... $ac_c" 1>&6
+echo "configure:3346: checking for main in -lpthread_nonshared" >&5
+ac_lib_var=`echo pthread_nonshared'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lpthread_nonshared $LIBS"
+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo pthread_nonshared | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <&6
+fi
+
for ac_func in pthread_atfork
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3348: checking for $ac_func" >&5
+echo "configure:3391: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <&6
+fi
+done
+
+for ac_func in pthread_once
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:3446: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3399,12 +3497,12 @@
for ac_func in ether_aton
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3403: checking for $ac_func" >&5
+echo "configure:3501: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3454,12 +3552,12 @@
for ac_func in ether_ntoa
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3458: checking for $ac_func" >&5
+echo "configure:3556: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3508,9 +3606,9 @@
echo $ac_n "checking for struct ether_addr""... $ac_c" 1>&6
-echo "configure:3512: checking for struct ether_addr" >&5
+echo "configure:3610: checking for struct ether_addr" >&5
cat > conftest.$ac_ext <
#include
@@ -3521,7 +3619,7 @@
struct ether_addr x;
; return 0; }
EOF
-if { (eval echo configure:3525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -3539,9 +3637,9 @@
rm -f conftest*
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:3543: checking for socklen_t" >&5
+echo "configure:3641: checking for socklen_t" >&5
cat > conftest.$ac_ext <
#include
@@ -3549,7 +3647,7 @@
socklen_t len;
; return 0; }
EOF
-if { (eval echo configure:3553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -3567,16 +3665,16 @@
rm -f conftest*
echo $ac_n "checking for pw_change in struct passwd""... $ac_c" 1>&6
-echo "configure:3571: checking for pw_change in struct passwd" >&5
+echo "configure:3669: checking for pw_change in struct passwd" >&5
cat > conftest.$ac_ext <
int main() {
struct passwd pwd; time_t t = pwd.pw_change
; return 0; }
EOF
-if { (eval echo configure:3580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -3593,16 +3691,16 @@
fi
rm -f conftest*
echo $ac_n "checking for pw_expire in struct passwd""... $ac_c" 1>&6
-echo "configure:3597: checking for pw_expire in struct passwd" >&5
+echo "configure:3695: checking for pw_expire in struct passwd" >&5
cat > conftest.$ac_ext <
int main() {
struct passwd pwd; time_t t = pwd.pw_expire
; return 0; }
EOF
-if { (eval echo configure:3606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
@@ -3624,7 +3722,7 @@
fi
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:3628: checking for dlopen in -ldl" >&5
+echo "configure:3726: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3632,7 +3730,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3665,7 +3763,7 @@
echo $ac_n "checking for gss_krb5_ccache_name in -lgssapi""... $ac_c" 1>&6
-echo "configure:3669: checking for gss_krb5_ccache_name in -lgssapi" >&5
+echo "configure:3767: checking for gss_krb5_ccache_name in -lgssapi" >&5
ac_lib_var=`echo gssapi'_'gss_krb5_ccache_name | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3673,7 +3771,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgssapi $LIBS $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3706,7 +3804,7 @@
if test -z "$found_gssapi_lib"; then
echo $ac_n "checking for gss_krb5_ccache_name in -lgssapi_krb5""... $ac_c" 1>&6
-echo "configure:3710: checking for gss_krb5_ccache_name in -lgssapi_krb5" >&5
+echo "configure:3808: checking for gss_krb5_ccache_name in -lgssapi_krb5" >&5
ac_lib_var=`echo gssapi_krb5'_'gss_krb5_ccache_name | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3714,7 +3812,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgssapi_krb5 $LIBS $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3750,7 +3848,7 @@
if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = umich -o $with_ldap_lib = openldap \); then
echo $ac_n "checking for main in -llber""... $ac_c" 1>&6
-echo "configure:3754: checking for main in -llber" >&5
+echo "configure:3852: checking for main in -llber" >&5
ac_lib_var=`echo lber'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3758,14 +3856,14 @@
ac_save_LIBS="$LIBS"
LIBS="-llber $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3793,7 +3891,7 @@
fi
echo $ac_n "checking for main in -lldap""... $ac_c" 1>&6
-echo "configure:3797: checking for main in -lldap" >&5
+echo "configure:3895: checking for main in -lldap" >&5
ac_lib_var=`echo ldap'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3801,14 +3899,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lldap $LIBS $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3831,7 +3929,7 @@
fi
if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape5 \); then
echo $ac_n "checking for main in -lldap50""... $ac_c" 1>&6
-echo "configure:3835: checking for main in -lldap50" >&5
+echo "configure:3933: checking for main in -lldap50" >&5
ac_lib_var=`echo ldap50'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3839,14 +3937,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lldap50 -lpthread $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3869,7 +3967,7 @@
fi
if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape4 \); then
echo $ac_n "checking for main in -lldapssl41""... $ac_c" 1>&6
-echo "configure:3873: checking for main in -lldapssl41" >&5
+echo "configure:3971: checking for main in -lldapssl41" >&5
ac_lib_var=`echo ldapssl41'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3877,14 +3975,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lldapssl41 -lpthread $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3906,7 +4004,7 @@
if test -z "$found_ldap_lib"; then
echo $ac_n "checking for main in -lldapssl40""... $ac_c" 1>&6
-echo "configure:3910: checking for main in -lldapssl40" >&5
+echo "configure:4008: checking for main in -lldapssl40" >&5
ac_lib_var=`echo ldapssl40'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3914,14 +4012,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lldapssl40 -lpthread $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3944,7 +4042,7 @@
fi
if test -z "$found_ldap_lib"; then
echo $ac_n "checking for main in -lldap41""... $ac_c" 1>&6
-echo "configure:3948: checking for main in -lldap41" >&5
+echo "configure:4046: checking for main in -lldap41" >&5
ac_lib_var=`echo ldap41'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3952,14 +4050,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lldap41 $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3982,7 +4080,7 @@
fi
if test -z "$found_ldap_lib"; then
echo $ac_n "checking for main in -lldap40""... $ac_c" 1>&6
-echo "configure:3986: checking for main in -lldap40" >&5
+echo "configure:4084: checking for main in -lldap40" >&5
ac_lib_var=`echo ldap40'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3990,14 +4088,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lldap40 $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4021,7 +4119,7 @@
fi
if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape3 \); then
echo $ac_n "checking for main in -lldapssl30""... $ac_c" 1>&6
-echo "configure:4025: checking for main in -lldapssl30" >&5
+echo "configure:4123: checking for main in -lldapssl30" >&5
ac_lib_var=`echo ldapssl30'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4029,14 +4127,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lldapssl30 -lpthread $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4064,7 +4162,7 @@
if test "$need_pthread" = "yes"; then
echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
-echo "configure:4068: checking for main in -lpthread" >&5
+echo "configure:4166: checking for main in -lpthread" >&5
ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4072,14 +4170,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4109,7 +4207,7 @@
fi
echo $ac_n "checking for ldap_gss_bind in -lgssldap""... $ac_c" 1>&6
-echo "configure:4113: checking for ldap_gss_bind in -lgssldap" >&5
+echo "configure:4211: checking for ldap_gss_bind in -lgssldap" >&5
ac_lib_var=`echo gssldap'_'ldap_gss_bind | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -4117,7 +4215,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lgssldap $LIBS $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -4152,12 +4250,12 @@
for ac_func in sasl_auxprop_request
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4156: checking for $ac_func" >&5
+echo "configure:4254: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4207,12 +4305,12 @@
for ac_func in ldap_init ldap_get_lderrno ldap_parse_result ldap_memfree ldap_controls_free
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4211: checking for $ac_func" >&5
+echo "configure:4309: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4262,12 +4360,12 @@
for ac_func in ldap_ld_free ldap_explode_rdn ldap_set_option ldap_get_option
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4266: checking for $ac_func" >&5
+echo "configure:4364: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4317,12 +4415,12 @@
for ac_func in ldap_sasl_interactive_bind_s ldap_initialize ldap_search_ext
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4321: checking for $ac_func" >&5
+echo "configure:4419: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4372,12 +4470,12 @@
for ac_func in ldap_create_control ldap_create_page_control ldap_parse_page_control
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4376: checking for $ac_func" >&5
+echo "configure:4474: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4428,12 +4526,12 @@
for ac_func in ldapssl_client_init ldap_start_tls_s ldap_pvt_tls_set_option ldap_start_tls
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4432: checking for $ac_func" >&5
+echo "configure:4530: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4484,12 +4582,12 @@
for ac_func in gethostbyname_r
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4488: checking for $ac_func" >&5
+echo "configure:4586: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4539,13 +4637,13 @@
if test "$ac_cv_func_gethostbyname_r" = "yes"; then
echo $ac_n "checking whether gethostbyname_r takes 6 arguments""... $ac_c" 1>&6
-echo "configure:4543: checking whether gethostbyname_r takes 6 arguments" >&5
+echo "configure:4641: checking whether gethostbyname_r takes 6 arguments" >&5
if eval "test \"`echo '$''{'nss_ldap_cv_gethostbyname_r_args'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
@@ -4553,7 +4651,7 @@
gethostbyname_r(0, 0, 0, 0, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:4557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
nss_ldap_cv_gethostbyname_r_args=6
else
@@ -4575,12 +4673,12 @@
for ac_func in ldap_set_rebind_proc
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4579: checking for $ac_func" >&5
+echo "configure:4677: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4628,13 +4726,13 @@
done
echo $ac_n "checking whether ldap_set_rebind_proc takes 3 arguments""... $ac_c" 1>&6
-echo "configure:4632: checking whether ldap_set_rebind_proc takes 3 arguments" >&5
+echo "configure:4730: checking whether ldap_set_rebind_proc takes 3 arguments" >&5
if eval "test \"`echo '$''{'nss_ldap_cv_ldap_set_rebind_proc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
@@ -4643,7 +4741,7 @@
ldap_set_rebind_proc(0, 0, 0);
; return 0; }
EOF
-if { (eval echo configure:4647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
nss_ldap_cv_ldap_set_rebind_proc=3
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nss_ldap-255/configure.in new/nss_ldap-256/configure.in
--- old/nss_ldap-255/configure.in 2007-03-03 08:12:37.000000000 +0100
+++ new/nss_ldap-256/configure.in 2007-06-19 17:08:41.000000000 +0200
@@ -2,7 +2,7 @@
AC_CANONICAL_SYSTEM
AC_PREFIX_DEFAULT()
-AM_INIT_AUTOMAKE(nss_ldap, 255)
+AM_INIT_AUTOMAKE(nss_ldap, 256)
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
@@ -194,7 +194,9 @@
AC_CHECK_FUNCS(snprintf)
AC_CHECK_FUNCS(gethostbyname)
AC_CHECK_FUNCS(nsdispatch)
+AC_CHECK_LIB(pthread_nonshared, main)
AC_CHECK_FUNCS(pthread_atfork)
+AC_CHECK_FUNCS(pthread_once)
AC_CHECK_FUNCS(ether_aton)
AC_CHECK_FUNCS(ether_ntoa)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nss_ldap-255/CVSVersionInfo.txt new/nss_ldap-256/CVSVersionInfo.txt
--- old/nss_ldap-255/CVSVersionInfo.txt 2007-03-03 08:12:37.000000000 +0100
+++ new/nss_ldap-256/CVSVersionInfo.txt 2007-06-19 17:08:41.000000000 +0200
@@ -1,8 +1,8 @@
# Created and modified by checkpoint; do not edit
-# $Id: CVSVersionInfo.txt,v 2.297 2007/03/03 07:12:34 lukeh Exp $
-# $Name: nss_ldap-255 $
+# $Id: CVSVersionInfo.txt,v 2.298 2007/06/19 15:08:38 lukeh Exp $
+# $Name: nss_ldap-256 $
ProjectName: nss_ldap
-ProjectVersion: 255
+ProjectVersion: 256
ProjectMaintainer: lukeh
#
# run this before building in RC. @@@PLATFORM@@@ is
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nss_ldap-255/ldap-grp.c new/nss_ldap-256/ldap-grp.c
--- old/nss_ldap-255/ldap-grp.c 2007-03-03 08:12:37.000000000 +0100
+++ new/nss_ldap-256/ldap-grp.c 2007-06-19 17:08:41.000000000 +0200
@@ -19,7 +19,7 @@
*/
static char rcsId[] =
- "$Id: ldap-grp.c,v 2.108 2006/12/18 08:10:55 lukeh Exp $";
+ "$Id: ldap-grp.c,v 2.109 2007/06/19 15:08:25 lukeh Exp $";
#include "config.h"
@@ -736,7 +736,7 @@
}
*(lia->size) = LDAP_NSS_NGROUPS;
}
- else if (*(lia->start) == *(lia->size))
+ if (*(lia->start) == *(lia->size))
{
/* Need a bigger buffer */
*(lia->groups) = (gid_t *) realloc (*(lia->groups),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nss_ldap-255/ldap-nss.c new/nss_ldap-256/ldap-nss.c
--- old/nss_ldap-255/ldap-nss.c 2007-03-03 08:12:37.000000000 +0100
+++ new/nss_ldap-256/ldap-nss.c 2007-06-19 17:08:41.000000000 +0200
@@ -19,7 +19,7 @@
*/
static char rcsId[] =
- "$Id: ldap-nss.c,v 2.285 2007/03/03 07:05:50 lukeh Exp $";
+ "$Id: ldap-nss.c,v 2.288 2007/05/09 06:43:17 lukeh Exp $";
#include "config.h"
@@ -1120,6 +1120,11 @@
* threading library, and we need to compare the current
* process ID against the saved one to figure out
* whether we've forked.
+ *
+ * --
+ * __pthread_once does not imply __pthread_atfork being non-NULL!
+ *
+ * --
*
* Once we know whether we have forked or not,
* courtesy of pthread_atfork() or us checking
@@ -1131,7 +1136,7 @@
* will wreak all sorts of havoc or inefficiencies,
* respectively.
*/
- if (__pthread_once == NULL)
+ if (__pthread_once == NULL || __pthread_atfork == NULL)
pid = getpid ();
else
pid = -1; /* linked against libpthreads, don't care */
@@ -1150,11 +1155,11 @@
#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
syslog (LOG_DEBUG,
"nss_ldap: libpthreads=%s, __session.ls_state=%d, __session.ls_conn=%p, __pid=%i, pid=%i, __euid=%i, euid=%i",
- (__pthread_once == NULL ? "FALSE" : "TRUE"),
+ ((__pthread_once == NULL || __pthread_atfork == NULL) ? "FALSE" : "TRUE"),
__session.ls_state,
__session.ls_conn,
- (__pthread_once == NULL ? __pid : -1),
- (__pthread_once == NULL ? pid : -1), __euid, euid);
+ ((__pthread_once == NULL || __pthread_atfork == NULL) ? __pid : -1),
+ ((__pthread_once == NULL || __pthread_atfork == NULL) ? pid : -1), __euid, euid);
#else
syslog (LOG_DEBUG,
"nss_ldap: __session.ls_state=%d, __session.ls_conn=%p, __pid=%i, pid=%i, __euid=%i, euid=%i",
@@ -1172,7 +1177,7 @@
else
#ifndef HAVE_PTHREAD_ATFORK
#if defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
- if (__pthread_once == NULL && __pid != pid)
+ if ((__pthread_once == NULL || __pthread_atfork == NULL) && __pid != pid)
#else
if (__pid != pid)
#endif /* HAVE_LIBC_LOCK_H || HAVE_BITS_LIBC_LOCK_H */
@@ -1230,19 +1235,21 @@
__session.ls_timestamp = 0;
__session.ls_state = LS_UNINITIALIZED;
-#ifdef HAVE_PTHREAD_ATFORK
+#if defined(HAVE_PTHREAD_ONCE) && defined(HAVE_PTHREAD_ATFORK)
if (pthread_once (&__once, do_atfork_setup) != 0)
{
debug ("<== do_init (pthread_once failed)");
return NSS_UNAVAIL;
}
+#elif defined(HAVE_PTHREAD_ATFORK) && ( defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) )
+ __libc_once (__once, do_atfork_setup);
#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H)
/*
* Only install the pthread_atfork() handlers i
* we are linked against libpthreads. Otherwise,
* do close the session when the PID changes.
*/
- if (__pthread_once == NULL)
+ if (__pthread_once == NULL || __pthread_atfork == NULL)
__pid = pid;
else
__libc_once (__once, do_atfork_setup);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/nss_ldap-255/nss_ldap.spec new/nss_ldap-256/nss_ldap.spec
--- old/nss_ldap-255/nss_ldap.spec 2007-03-03 08:12:37.000000000 +0100
+++ new/nss_ldap-256/nss_ldap.spec 2007-06-19 17:08:41.000000000 +0200
@@ -1,6 +1,6 @@
Summary: NSS library for LDAP.
Name: nss_ldap
-Version: 255
+Version: 256
Release: 1
Source0: ftp://ftp.padl.com/pub/%{name}-%{version}.tar.gz
Source1: ldap.conf
++++++ nss_ldap.dif ++++++
--- /var/tmp/diff_new_pack.P21799/_old 2007-07-08 22:47:40.000000000 +0200
+++ /var/tmp/diff_new_pack.P21799/_new 2007-07-08 22:47:40.000000000 +0200
@@ -2,16 +2,6 @@
===================================================================
--- nss_ldap-246.orig/ldap-nss.c
+++ nss_ldap-246/ldap-nss.c
-@@ -90,6 +90,9 @@ static char rcsId[] =
- #include "dnsconfig.h"
- #include "pagectrl.h"
-
-+#undef HAVE_LIBC_LOCK_H
-+#undef HAVE_BITS_LIBC_LOCK_H
-+
- #if defined(HAVE_THREAD_H) && !defined(_AIX)
- #ifdef HAVE_PTHREAD_ATFORK
- #undef HAVE_PTHREAD_ATFORK
@@ -2422,7 +2425,8 @@ do_with_reconnect (const char *base, int
* If a soft reconnect policy is specified, then do not
* try to reconnect to the LDAP server if it is down.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org