openldap-bugs

openldap-bugs@openldap.org

1 participants
21001 discussions

Re: (ITS#5565) slapd crashes due to SIGPIPE
by bgmilne＠staff.telkomsa.net 09 Jul '08

09 Jul '08

--Boundary-00=_k1GdIEk7s64l4zW Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Saturday 21 June 2008 00:26:00 jwm(a)horde.net wrote: > On Fri, Jun 20, 2008 at 01:37:15PM -0700, Howard Chu wrote: > > > Program received signal SIGABRT, Aborted. > > > [Switching to Thread -1963996240 (LWP 22635)] > > > 0xb7bb1947 in raise () from /lib/tls/libc.so.6 > > > > This trace resembles ITS#5401, which was only fixed in RE24. You can look > > at the patch to syncprov.c there. There's no plan to make another 2.3 > > release at the moment. > > I don't mind patching for this locally, since slapd is crashing every few > days. I looked at the patch for ITS 5401 in RE24. I don't know enough about > slapd internals to easily backport it to RE23 since a fair bit of the > surrounding code differs between RE23 and RE24; would you be willing to do The patches I found for this in RE24 seem to apply without problems on RE23. See attached patch its5401-re23.patch. Howard, this includes syncprov.c 1.219->1.220 and 1.147.2.27->1.147.2.28 (see attached its5401.patch), was that all? Regards, Buchan --Boundary-00=_k1GdIEk7s64l4zW Content-Type: text/x-diff; charset="utf-8"; name="its5401-re23.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="its5401-re23.patch" Index: servers/slapd/overlays/syncprov.c =================================================================== RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/overlays/syncprov.c,v retrieving revision 1.56.2.50 diff -u -r1.56.2.50 syncprov.c --- servers/slapd/overlays/syncprov.c 14 May 2008 00:49:04 -0000 1.56.2.50 +++ servers/slapd/overlays/syncprov.c 9 Jul 2008 07:22:23 -0000 @@ -1840,12 +1840,10 @@ op2->o_do_not_cache = 1; /* Add op2 to conn so abandon will find us */ - ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); op->o_conn->c_n_ops_executing++; op->o_conn->c_n_ops_completed--; LDAP_STAILQ_INSERT_TAIL( &op->o_conn->c_ops, op2, o_next ); so->s_flags |= PS_IS_DETACHED; - ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); /* Prevent anyone else from trying to send a result for this op */ op->o_abandon = 1; @@ -1933,15 +1931,27 @@ /* Detach this Op from frontend control */ ldap_pvt_thread_mutex_lock( &ss->ss_so->s_mutex ); + ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); - /* Turn off the refreshing flag */ - ss->ss_so->s_flags ^= PS_IS_REFRESHING; + /* But not if this connection was closed along the way */ + if ( op->o_abandon ) { + ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); + ldap_pvt_thread_mutex_unlock( &ss->ss_so->s_mutex ); + /* syncprov_ab_cleanup will free this syncop */ + return SLAPD_ABANDON; - syncprov_detach_op( op, ss->ss_so, on ); + } else { + /* Turn off the refreshing flag */ + ss->ss_so->s_flags ^= PS_IS_REFRESHING; + + syncprov_detach_op( op, ss->ss_so, on ); - /* If there are queued responses, fire them off */ - if ( ss->ss_so->s_res ) - syncprov_qstart( ss->ss_so ); + ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); + + /* If there are queued responses, fire them off */ + if ( ss->ss_so->s_res ) + syncprov_qstart( ss->ss_so ); + } ldap_pvt_thread_mutex_unlock( &ss->ss_so->s_mutex ); return LDAP_SUCCESS; --Boundary-00=_k1GdIEk7s64l4zW Content-Type: text/x-diff; charset="utf-8"; name="its5401.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="its5401.patch" --- servers/slapd/overlays/syncprov.c 2008/03/12 21:31:28 1.219 +++ servers/slapd/overlays/syncprov.c 2008/03/13 09:49:32 1.220 @@ -1,4 +1,4 @@ -/* $OpenLDAP: servers/slapd/overlays/syncprov.c,v 1.219 2008/03/12 21:31:28 ando Exp $ */ +/* $OpenLDAP: servers/slapd/overlays/syncprov.c,v 1.220 2008/03/13 09:49:32 hyc Exp $ */ /* syncprov.c - syncrepl provider */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * @@ -1940,12 +1940,10 @@ op2->o_do_not_cache = 1; /* Add op2 to conn so abandon will find us */ - ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); op->o_conn->c_n_ops_executing++; op->o_conn->c_n_ops_completed--; LDAP_STAILQ_INSERT_TAIL( &op->o_conn->c_ops, op2, o_next ); so->s_flags |= PS_IS_DETACHED; - ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); /* Prevent anyone else from trying to send a result for this op */ op->o_abandon = 1; @@ -2055,15 +2053,27 @@ /* Detach this Op from frontend control */ ldap_pvt_thread_mutex_lock( &ss->ss_so->s_mutex ); + ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); - /* Turn off the refreshing flag */ - ss->ss_so->s_flags ^= PS_IS_REFRESHING; + /* But not if this connection was closed along the way */ + if ( op->o_abandon ) { + ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); + ldap_pvt_thread_mutex_unlock( &ss->ss_so->s_mutex ); + syncprov_free_syncop( ss->ss_so ); + return SLAPD_ABANDON; - syncprov_detach_op( op, ss->ss_so, on ); + } else { + /* Turn off the refreshing flag */ + ss->ss_so->s_flags ^= PS_IS_REFRESHING; + + syncprov_detach_op( op, ss->ss_so, on ); - /* If there are queued responses, fire them off */ - if ( ss->ss_so->s_res ) - syncprov_qstart( ss->ss_so ); + ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); + + /* If there are queued responses, fire them off */ + if ( ss->ss_so->s_res ) + syncprov_qstart( ss->ss_so ); + } ldap_pvt_thread_mutex_unlock( &ss->ss_so->s_mutex ); return LDAP_SUCCESS; diff -u -r1.147.2.27 -r1.147.2.28 --- servers/slapd/overlays/syncprov.c 2008/05/28 16:35:32 1.147.2.27 +++ servers/slapd/overlays/syncprov.c 2008/05/29 15:02:45 1.147.2.28 @@ -1,4 +1,4 @@ -/* $OpenLDAP: servers/slapd/overlays/syncprov.c,v 1.147.2.27 2008/05/28 16:35:32 quanah Exp $ */ +/* $OpenLDAP: servers/slapd/overlays/syncprov.c,v 1.147.2.28 2008/05/29 15:02:45 hyc Exp $ */ /* syncprov.c - syncrepl provider */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * @@ -2107,7 +2107,7 @@ if ( op->o_abandon ) { ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); ldap_pvt_thread_mutex_unlock( &ss->ss_so->s_mutex ); - syncprov_free_syncop( ss->ss_so ); + /* syncprov_ab_cleanup will free this syncop */ return SLAPD_ABANDON; } else { --Boundary-00=_k1GdIEk7s64l4zW--

1 0

Re: (ITS#5604) sbin executable names not recognised on Win32
by mail_ben_schmidt＠yahoo.com.au 09 Jul '08

09 Jul '08

Hallvard B Furuseth wrote: > Might be better to insert the following at the end of > libraries/liblutil/utils.c:lutil_progname(): > > #if <something> > { > size_t len = strlen( progname ); > if ( len > 4 && strcasecmp( progname + len - 4, ".exe" ) == 0 ) > progname[len - 4] = '\0'; > } > #endif > > I have no idea what the #if should be though. Does #ifdef _WIN32 still > work with cross-compilation? Yes, I think that's a neater solution. Having a runtime conditional avoids breaking Cygwin binaries that might not have .exe in progname, too. To be honest, I'm not sure whether the compiler/configure defines _WIN32 for cross compilation by default. I could easily find out, but to be honest, I don't think it's worth it: you pretty much have to ensure it's defined because there are many places in the source code it is used. Using it here as well seems smart. Cheers, Ben.

1 0

Re: (ITS#5604) sbin executable names not recognised on Win32
by hyc＠symas.com 09 Jul '08

09 Jul '08

h.b.furuseth(a)usit.uio.no wrote: > Might be better to insert the following at the end of > libraries/liblutil/utils.c:lutil_progname(): > > #if<something> > { > size_t len = strlen( progname ); > if ( len> 4&& strcasecmp( progname + len - 4, ".exe" ) == 0 ) > progname[len - 4] = '\0'; > } > #endif > > I have no idea what the #if should be though. Does #ifdef _WIN32 still > work with cross-compilation? > Yes. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#5604) sbin executable names not recognised on Win32
by h.b.furuseth＠usit.uio.no 09 Jul '08

09 Jul '08

Might be better to insert the following at the end of libraries/liblutil/utils.c:lutil_progname(): #if <something> { size_t len = strlen( progname ); if ( len > 4 && strcasecmp( progname + len - 4, ".exe" ) == 0 ) progname[len - 4] = '\0'; } #endif I have no idea what the #if should be though. Does #ifdef _WIN32 still work with cross-compilation? -- Hallvard

1 0

(ITS#5607) Double close problem for SQL handles in back-sql
by mail_ben_schmidt＠yahoo.com.au 08 Jul '08

08 Jul '08

Full_Name: Ben Schmidt Version: 2.4.10 OS: MinGW32, Mac OS X URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (124.168.9.190) I have recently cross-compiled OpenLDAP for MinGW32 on Mac OS X. I found two bugs in the source code relating to shutdown/freeing structures. This is the second. It relates to back-sql, which I realise is unsupported on this platform, but seems to work very nicely once this and another bugfix or two (my other posts) are made. Mind you, I have only done a small amount of testing, and don't really understand what I am doing, as I am a complete newbie to LDAP. After sending these patches I intend to embark on a reading of your Administrator's Guide to learn. >From the source code, though, I don't see why the problem would only apply to this platform anyway. It is this: When an SQL handle is opened, it is registered to be freed. When it is freed, however, it is not deregistered, so can easily be freed twice, particularly as to load the schemas the database connection is opened and closed. I suggest this patch to fix it (the patch looks larger than it really is as some code needed to be moved to ensure correct definition order): diff -ru --exclude=Makefile openldap-2.4.10/servers/slapd/back-sql/sql-wrap.c openldap/servers/slapd/back-sql/sql-wrap.c --- openldap-2.4.10/servers/slapd/back-sql/sql-wrap.c 2008-02-12 10:26:48.000000000 +1100 +++ openldap/servers/slapd/back-sql/sql-wrap.c 2008-06-28 22:29:25.000000000 +1000 @@ -462,28 +462,31 @@ return LDAP_SUCCESS; } +static void *backsql_db_conn_dummy; + +static void +backsql_db_conn_keyfree( + void *key, + void *data ) +{ + backsql_close_db_handle( (SQLHDBC)data ); +} + int backsql_free_db_conn( Operation *op, SQLHDBC dbh ) { Debug( LDAP_DEBUG_TRACE, "==>backsql_free_db_conn()\n", 0, 0, 0 ); (void)backsql_close_db_handle( dbh ); + ldap_pvt_thread_pool_setkey( op->o_threadctx, + &backsql_db_conn_dummy, (void *)SQL_NULL_HDBC, + backsql_db_conn_keyfree, NULL, NULL ); Debug( LDAP_DEBUG_TRACE, "<==backsql_free_db_conn()\n", 0, 0, 0 ); return LDAP_SUCCESS; } -static void *backsql_db_conn_dummy; - -static void -backsql_db_conn_keyfree( - void *key, - void *data ) -{ - backsql_close_db_handle( (SQLHDBC)data ); -} - int backsql_get_db_conn( Operation *op, SQLHDBC *dbhp ) { I could not find this issue already in your tracker.

1 0

(ITS#5606) Attempt to close unopened sockets when daemon doesn't run as a daemon
by mail_ben_schmidt＠yahoo.com.au 08 Jul '08

08 Jul '08

1 0

(ITS#5605) Inappropriate SLAP_SOCK_NOT_ACTIVE assertion failing
by mail_ben_schmidt＠yahoo.com.au 08 Jul '08

08 Jul '08

Full_Name: Ben Schmidt Version: 2.4.10 OS: MinGW32, Mac OS X URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (124.168.9.190) I have recently cross-compiled OpenLDAP for MinGW32 on Mac OS X. While debugging to find and fix two crashes which I will detail in other posts, I discovered that an assertion is always failing because it seems it is inappropriately included when it shouldn't be. I suggest this patch. diff -ru --exclude=Makefile openldap-2.4.10/servers/slapd/daemon.c openldap/servers/slapd/daemon.c --- openldap-2.4.10/servers/slapd/daemon.c 2008-05-28 06:12:44.000000000 +1000 +++ openldap/servers/slapd/daemon.c 2008-06-28 21:54:38.000000000 +1000 @@ -829,7 +829,9 @@ { ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex ); +#if defined(HAVE_EPOLL) assert( SLAP_SOCK_NOT_ACTIVE(s) ); +#endif if ( isactive ) slap_daemon.sd_nactives++; If you search for where the relevant parts of the macros involved in SLAP_SOCK_NOT_ACTIVE, and particularly the marking of active and inactive, I believe you will find they apply only in the HAVE_EPOLL case, and thus the assertion should only hold in that case. I did find a closed issue in your tracker related to the same assertion failing, but it didn't detail the fix, and was very old, so I assume was not relevant to this particular problem.

1 0

(ITS#5604) sbin executable names not recognised on Win32
by mail_ben_schmidt＠yahoo.com.au 08 Jul '08

08 Jul '08

Full_Name: Ben Schmidt Version: 2.4.10 OS: MinGW32, Mac OS X URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (124.168.9.190) I have recently cross-compiled OpenLDAP for MinGW32 on Mac OS X. In so doing, I discovered the following platform-specific issue. The executables on Win32 have a .exe extension, so slapd does not detect the tool names and act accordingly. Consequently, slapadd, slaptest, etc. all act the same as slapd! I solved the problem by patching main.c as follows: diff -ru --exclude=Makefile openldap-2.4.10/servers/slapd/main.c openldap/servers/slapd/main.c --- openldap-2.4.10/servers/slapd/main.c 2008-05-20 10:10:40.000000000 +1000 +++ openldap/servers/slapd/main.c 2008-06-28 21:56:09.000000000 +1000 @@ -71,14 +71,14 @@ char *name; MainFunc *func; } tools[] = { - {"slapadd", slapadd}, - {"slapcat", slapcat}, - {"slapdn", slapdn}, - {"slapindex", slapindex}, - {"slappasswd", slappasswd}, - {"slaptest", slaptest}, - {"slapauth", slapauth}, - {"slapacl", slapacl}, + {"slapadd.exe", slapadd}, + {"slapcat.exe", slapcat}, + {"slapdn.exe", slapdn}, + {"slapindex.exe", slapindex}, + {"slappasswd.exe", slappasswd}, + {"slaptest.exe", slaptest}, + {"slapauth.exe", slapauth}, + {"slapacl.exe", slapacl}, /* NOTE: new tools must be added in chronological order, * not in alphabetical order, because for backwards * compatibility name[4] is used to identify the Obviously this exact fix is not appropriate, because it will break every other platform, but I am not sure of the appropriate preprocessor directive to use to address this, as I guess it would also break a cygwin build, and should only be done for a MinGW32 build. However, it would be helpful to fix with an appropriate conditional! I couldn't find a mention of this in your tracker so reporting it now.

1 0

(ITS#5603) Linking OpenSSL on Windows requires libgdi32 and libws2_32 after libcrypto
by mail_ben_schmidt＠yahoo.com.au 08 Jul '08

08 Jul '08

1 0

(ITS#5602) Windows ODBC library libodbc32 not found by configure
by mail_ben_schmidt＠yahoo.com.au 08 Jul '08

08 Jul '08

Full_Name: Ben Schmidt Version: 2.4.10 OS: MinGW32, Mac OS X URL: ftp://ftp.openldap.org/incoming/ Submission from: (NULL) (124.168.9.190) My precise situation is, I am sure, a very uncommon scenario. However, it may affect other building methods as well, and an appropriate fix I am sure could help a few users. Here's what I have been doing (please try not to laugh!): I have been cross-compiling OpenLDAP on Mac OS X for MinGW32, including the SQL backend. I have found two issues related to the configuration/build process. I am afraid I really have no knowledge of GNU autoconf, so I will describe the problem and my fixes, but with no pretense that they are appropriate for applying to the code. I will suggest an appropriate way to fix it, but will have to leave that work to another developer. This is the first. On Windows/MinGW, the ODBC library is not libodbc.a, but libodbc32.a. Furthermore, it seems the way function names are mangled on that platform includes their stack frame size: the symbol for SQLDriverConnect which configure tests for is _SQLDriverConnect@32. I got around this by manually changing -lodbc to -lodbc32 in configure and then further patching it as follows: diff -ru --exclude=Makefile openldap-2.4.10/configure openldap/configure --- openldap-2.4.10/configure 2008-02-12 10:36:45.000000000 +1100 +++ openldap/configure 2008-06-28 19:36:36.000000000 +1000 @@ -32018,11 +32018,14 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char SQLDriverConnect (); +/*char SQLDriverConnect ();*/ +#include <windows.h> +#include <sqlext.h> int main () { -SQLDriverConnect (); +/*SQLDriverConnect ();*/ +SQLDriverConnect (0,0,0,0,0,0,0,0); ; return 0; } This pulls in the appropriate headers for configure to find and use _SQLDriverConect@32 in libodbc32. I got part of the idea from another user's post I found on the Net, but a quick search of your issue tracker didn't show it up, so I am reporting it now. A more appropriate fix would be to change configure.in so that there are three checks for ODBC: one in libiodbc, one in libodbc and one in libodbc32, which is Windows specific, pulling in windows.h and sqlext.h before looking for the symbol with 8 arguments. I guess this would probably involve a more customised macro in configure.in. If that is too much trouble, perhaps the value for the ODBC library could just be assumed if configure can detect a Windows build.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openldap-bugs