diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-13 17:51:11 +1300 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2014-03-05 16:33:21 +0100 |
| commit | 952bc3cad05467959ba5aa08682d754bd80d543b (patch) | |
| tree | ec59adb15fc07fbc6c50b9eeeeb17a7dada26905 /source4/libnet | |
| parent | 1f60aa8ec2e685517235aadbc11324d3b4a1a74d (diff) | |
| download | samba-952bc3cad05467959ba5aa08682d754bd80d543b.tar.gz | |
Remove a number of NT_STATUS_HAVE_NO_MEMORY_AND_FREE macros from the codebase.
Following the current coding guidelines, it is considered bad practice to return from
within a macro and change control flow as they look like normal function calls.
Change-Id: I133eb5a699757ae57b87d3bd3ebbcf5b556b0268
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4/libnet')
| -rw-r--r-- | source4/libnet/libnet_samsync_ldb.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c index 10e5a34da46..f3a45b86257 100644 --- a/source4/libnet/libnet_samsync_ldb.c +++ b/source4/libnet/libnet_samsync_ldb.c @@ -976,13 +976,22 @@ static NTSTATUS samsync_ldb_handle_account(TALLOC_CTX *mem_ctx, } sidstr = dom_sid_string(msg, sid); - NT_STATUS_HAVE_NO_MEMORY_AND_FREE(sidstr, msg); + if (sidstr == NULL) { + TALLOC_FREE(msg); + return NT_STATUS_NO_MEMORY; + } dnstr = talloc_asprintf(msg, "sid=%s", sidstr); - NT_STATUS_HAVE_NO_MEMORY_AND_FREE(dnstr, msg); + if (dnstr == NULL) { + TALLOC_FREE(msg); + return NT_STATUS_NO_MEMORY; + } msg->dn = ldb_dn_new(msg, state->pdb, dnstr); - NT_STATUS_HAVE_NO_MEMORY_AND_FREE(msg->dn, msg); + if (msg->dn == NULL) { + TALLOC_FREE(msg); + return NT_STATUS_NO_MEMORY; + } for (i=0; i< account->privilege_entries; i++) { ldb_msg_add_string(msg, "privilege", account->privilege_name[i].string); |