Sync with HEAD

diff --git a/doc/devel/todo b/doc/devel/todo
index 261daeb59f0e00de3f73dc16831684dbd71c7e46..91f8e9f3182f61b303b6e0933039b687ab4aa32f 100644 (file)
--- a/doc/devel/todo
+++ b/doc/devel/todo
@@ -43,6 +43,7 @@ Implement authPassword (RFC 3112)
 Implement DIT Structure Rules and Name Forms
 Implement LDAP Transactions extension
 Implement native support for simple SASL mechanisms (e.g. EXTERNAL and PLAIN)
+Redesign slapd to use poll(2) instead of select(2)
 Redesign slapd memory allocation fault handling
 Localize tools
 

diff --git a/servers/slapd/back-sql/sql-wrap.c b/servers/slapd/back-sql/sql-wrap.c
index 91df43f3a50fbd1492b049b73491ae1886a084a9..86b46893163929f3c865a7ce598cf4e51f0a3b33 100644 (file)
--- a/servers/slapd/back-sql/sql-wrap.c
+++ b/servers/slapd/back-sql/sql-wrap.c
@@ -47,17 +47,13 @@ backsql_PrintErrors( SQLHENV henv, SQLHDBC hdbc, SQLHSTMT sth, int rc )
 
        Debug( LDAP_DEBUG_TRACE, "Return code: %d\n", rc, 0, 0 );
 
-
-       rc = SQLError( henv, hdbc, sth, state, &iSqlCode, msg,
-                       SQL_MAX_MESSAGE_LENGTH - 1, &len );
-       for ( ; BACKSQL_SUCCESS( rc ); ) {
-               Debug( LDAP_DEBUG_TRACE, "Native error code: %d\n", 
-                               (int)iSqlCode, 0, 0 );
-               Debug( LDAP_DEBUG_TRACE, "SQL engine state: %s\n", 
-                               state, 0, 0 );
-               Debug( LDAP_DEBUG_TRACE, "Message: %s\n", msg, 0, 0 );
-               rc = SQLError( henv, hdbc, sth, state, &iSqlCode, msg,
-                               SQL_MAX_MESSAGE_LENGTH - 1, &len );
+       for ( ; rc = SQLError( henv, hdbc, sth, state, &iSqlCode, msg,
+                       SQL_MAX_MESSAGE_LENGTH - 1, &len ), BACKSQL_SUCCESS( rc ); ) {
+               Debug( LDAP_DEBUG_TRACE,
+                               "   Native error code: %d\n"
+                               "   SQL engine state:  %s\n"
+                               "   Message:           %s\n", 
+                               (int)iSqlCode, state, msg );
        }
 }
 

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 244a7a5031093be57a6d401b331fc06f894123f1..b5c76c6de2b51f9be2c2f6e86c887f2a1b6b8c39 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1186,7 +1186,9 @@ syncrepl_entry(
                        if ( rc != LDAP_SUCCESS ) {
                                if ( rc == LDAP_ALREADY_EXISTS ) {
                                        Modifications *mod;
-                                       Modifications *modtail;
+                                       Modifications *modtail = modlist;
+
+                                       assert( modlist );
 
                                        for ( mod = modlist; mod != NULL; mod = mod->sml_next ) {
                                                modtail = mod;
@@ -1805,7 +1807,7 @@ syncrepl_isupdate_dn(
 
        if ( !LDAP_STAILQ_EMPTY( &be->be_syncinfo )) {
                LDAP_STAILQ_FOREACH( si, &be->be_syncinfo, si_next ) {
-                       if ( ret = dn_match( &si->si_updatedn, ndn )) {
+                       if ( ( ret = dn_match( &si->si_updatedn, ndn ) ) ) {
                                return ret;
                        }
                }