fix NOOP return code (ITS#4563; I'll check and confirm it later; NOOP support might...

diff --git a/servers/slapd/back-sql/add.c b/servers/slapd/back-sql/add.c
index 078df583a1728668eaee3de434789e9d52086921..eb24f67b928cd61e29a50932023c521973690df6 100644 (file)
--- a/servers/slapd/back-sql/add.c
+++ b/servers/slapd/back-sql/add.c
@@ -1461,6 +1461,7 @@ done:;
                SQLUSMALLINT    CompletionType = SQL_ROLLBACK;
 
                if ( rs->sr_err == LDAP_SUCCESS && !op->o_noop ) {
+                       assert( e == NULL );
                        CompletionType = SQL_COMMIT;
                }
 
@@ -1503,6 +1504,10 @@ done:;
                }
        }
 
+       if ( op->o_noop && rs->sr_err == LDAP_SUCCESS ) {
+               rs->sr_err = LDAP_X_NO_OPERATION;
+       }
+
        send_ldap_result( op, rs );
        slap_graduate_commit_csn( op );
 

diff --git a/servers/slapd/back-sql/delete.c b/servers/slapd/back-sql/delete.c
index a6656a89844014fcd3221e2b21f3ff0d736dcaac..7f010fb083af0efa8c44e7a5cca4cc1464a4b5a6 100644 (file)
--- a/servers/slapd/back-sql/delete.c
+++ b/servers/slapd/back-sql/delete.c
@@ -441,6 +441,7 @@ backsql_delete( Operation *op, SlapReply *rs )
                SQLUSMALLINT    CompletionType = SQL_ROLLBACK;
        
                if ( rs->sr_err == LDAP_SUCCESS && !op->o_noop ) {
+                       assert( e == NULL );
                        CompletionType = SQL_COMMIT;
                }
 
@@ -462,6 +463,10 @@ done:;
                }
        }
 
+       if ( op->o_noop && rs->sr_err == LDAP_SUCCESS ) {
+               rs->sr_err = LDAP_X_NO_OPERATION;
+       }
+
        send_ldap_result( op, rs );
 
        Debug( LDAP_DEBUG_TRACE, "<==backsql_delete()\n", 0, 0, 0 );

diff --git a/servers/slapd/back-sql/modify.c b/servers/slapd/back-sql/modify.c
index a3a93d983790d8751e76f84eac61a3048fa88dc7..df1c95341e5f8fc77cdfd148abaf5c5c081c62ac 100644 (file)
--- a/servers/slapd/back-sql/modify.c
+++ b/servers/slapd/back-sql/modify.c
@@ -168,6 +168,7 @@ do_transact:;
         * Commit only if all operations succeed
         */
        if ( rs->sr_err == LDAP_SUCCESS && !op->o_noop ) {
+               assert( e == NULL );
                CompletionType = SQL_COMMIT;
        }
 
@@ -188,6 +189,10 @@ done:;
                }
        }
 
+       if ( op->o_noop && rs->sr_err == LDAP_SUCCESS ) {
+               rs->sr_err = LDAP_X_NO_OPERATION;
+       }
+
        send_ldap_result( op, rs );
        slap_graduate_commit_csn( op );
 

diff --git a/servers/slapd/back-sql/modrdn.c b/servers/slapd/back-sql/modrdn.c
index 1c81cead296a9a68023a045965eb1983988313ed..67940a58ba881d3e649c0ffc6a2ca950bc595729 100644 (file)
--- a/servers/slapd/back-sql/modrdn.c
+++ b/servers/slapd/back-sql/modrdn.c
@@ -491,6 +491,10 @@ done:;
                SQLTransact( SQL_NULL_HENV, dbh, CompletionType );
        }
 
+       if ( op->o_noop && rs->sr_err == LDAP_SUCCESS ) {
+               rs->sr_err = LDAP_X_NO_OPERATION;
+       }
+
        send_ldap_result( op, rs );
        slap_graduate_commit_csn( op );