s4:dns_server: Merge similar code paths

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dns_server/dns_update.c b/source4/dns_server/dns_update.c
index 19eaaaf2d88ba832a8093de2587e93579fea90c6..13f16f244f87bf281dd248e71394290da94ef57c 100644 (file)
--- a/source4/dns_server/dns_update.c
+++ b/source4/dns_server/dns_update.c
@@ -751,20 +751,12 @@ static WERROR handle_updates(struct dns_server *dns,
                W_ERROR_NOT_OK_GOTO(werror, failed);
        }
 
-       ldb_transaction_commit(dns->samdb);
-       TALLOC_FREE(tmp_ctx);
-
-       if (tkey != NULL) {
-               ldb_set_opaque(
-                       dns->samdb,
-                       DSDB_SESSION_INFO,
-                       system_session(dns->task->lp_ctx));
-       }
-
-       return WERR_OK;
-
 failed:
-       ldb_transaction_cancel(dns->samdb);
+       if (W_ERROR_IS_OK(werror)) {
+               ldb_transaction_commit(dns->samdb);
+       } else {
+               ldb_transaction_cancel(dns->samdb);
+       }
 
        if (tkey != NULL) {
                ldb_set_opaque(