s4:ldap_backend.c/"map_ldb_error" - handle errors similar to "PyErr_SetLdbError"

If the call was done using an error string ("add_err_string"), then use that one
without an additional "ldb_strerror()" for the definitive LDAP output.
Otherwise generate one using "ldb_strerror()".
This omits redundancies in the error string generation (twice the same
information by "ldb_strerror()").

Signed-off-by: Andrew Tridgell <tridge@samba.org>

diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index 57f81eaaaf04c8020e2a4b896815fe29cfe35dc6..afeb3500d0fe7e378f93556367f3cc385957f506 100644 (file)
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -169,12 +169,8 @@ static int map_ldb_error(TALLOC_CTX *mem_ctx, int ldb_err,
        }
 
        *errstring = talloc_asprintf(mem_ctx, "%08X: %s", W_ERROR_V(err),
-               ldb_strerror(ldb_err));
-       if (add_err_string != NULL) {
-               *errstring = talloc_asprintf(mem_ctx, "%s - %s", *errstring,
-                                            add_err_string);
-       }
-       
+               add_err_string != NULL ? add_err_string : ldb_strerror(ldb_err));
+
        /* result is 1:1 for now */
        return ldb_err;
 }