diff options
| author | Michael Adam <obnox@samba.org> | 2009-02-26 01:22:03 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-03-27 14:15:47 +0100 |
| commit | 002383ab3e135437d013450f073848658d04aabd (patch) | |
| tree | a87a4599ee73d43c37d1a2c5fee797a22165e433 /source/registry | |
| parent | e93b41a2725e0322483ca712ffe19a944458a55f (diff) | |
| download | samba-002383ab3e135437d013450f073848658d04aabd.tar.gz samba-002383ab3e135437d013450f073848658d04aabd.tar.xz samba-002383ab3e135437d013450f073848658d04aabd.zip | |
s3:registry: streamline and cleanup regdb_set_secdesc() somewhat.
Michael
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 5446e47968f1c0ff2f6390e00b5483b6163be78f)
Diffstat (limited to 'source/registry')
| -rw-r--r-- | source/registry/reg_backend_db.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/source/registry/reg_backend_db.c b/source/registry/reg_backend_db.c index 972649df343..e66b510d8f2 100644 --- a/source/registry/reg_backend_db.c +++ b/source/registry/reg_backend_db.c @@ -1551,7 +1551,6 @@ static WERROR regdb_set_secdesc(const char *key, { TALLOC_CTX *mem_ctx = talloc_stackframe(); char *tdbkey; - NTSTATUS status; WERROR err = WERR_NOMEM; TDB_DATA tdbdata; @@ -1568,27 +1567,18 @@ static WERROR regdb_set_secdesc(const char *key, if (secdesc == NULL) { /* assuming a delete */ - status = dbwrap_trans_delete_bystring(regdb, tdbkey); - if (NT_STATUS_IS_OK(status)) { - err = WERR_OK; - } else { - err = ntstatus_to_werror(status); - } + err = ntstatus_to_werror(dbwrap_trans_delete_bystring(regdb, + tdbkey)); goto done; } err = ntstatus_to_werror(marshall_sec_desc(mem_ctx, secdesc, &tdbdata.dptr, &tdbdata.dsize)); - if (!W_ERROR_IS_OK(err)) { - goto done; - } + W_ERROR_NOT_OK_GOTO_DONE(err); - status = dbwrap_trans_store_bystring(regdb, tdbkey, tdbdata, 0); - if (!NT_STATUS_IS_OK(status)) { - err = ntstatus_to_werror(status); - goto done; - } + err = ntstatus_to_werror(dbwrap_trans_store_bystring(regdb, tdbkey, + tdbdata, 0)); done: TALLOC_FREE(mem_ctx); |