diff options
| author | Simo Sorce <idra@samba.org> | 2004-03-08 09:52:17 +0000 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2004-03-08 09:52:17 +0000 |
| commit | 9c15b5b0ec08bd13a7f3e888482165207926e7f9 (patch) | |
| tree | f1d4cf6d9869b52c6015e862adc42b28b0f5844e /source3 | |
| parent | cd1be774adc1a2509d93e65e48088b5351c99a13 (diff) | |
| download | samba-9c15b5b0ec08bd13a7f3e888482165207926e7f9.tar.gz samba-9c15b5b0ec08bd13a7f3e888482165207926e7f9.tar.bz2 samba-9c15b5b0ec08bd13a7f3e888482165207926e7f9.zip | |
2 fixes to enhance readability of source code and debug messages
1 fix for a memleak
(This used to be commit 9f3b0295fe7bd6c0c3a6061e5d00e7b88f702b21)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/privileges.c | 2 | ||||
| -rw-r--r-- | source3/passdb/passdb.c | 2 | ||||
| -rw-r--r-- | source3/smbd/sec_ctx.c | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c index 4bcf5e3b36..a3b85372c7 100644 --- a/source3/lib/privileges.c +++ b/source3/lib/privileges.c @@ -372,7 +372,7 @@ NTSTATUS dup_priv_set(PRIVILEGE_SET *new_priv_set, PRIVILEGE_SET *priv_set) LUID_ATTR *old_set; int i; - if (!new_priv_set || !priv_set) + if (new_priv_set == NULL || priv_set == NULL) return NT_STATUS_INVALID_PARAMETER; /* special case if there are no privileges in the list */ diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 7c9376e045..273428dacf 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -1892,6 +1892,8 @@ BOOL init_sam_from_buffer_v1(SAM_ACCOUNT *sampass, uint8 *buf, uint32 buflen) done: + SAFE_FREE(lm_pw_ptr); + SAFE_FREE(nt_pw_ptr); SAFE_FREE(username); SAFE_FREE(domain); SAFE_FREE(nt_username); diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c index 9244f34394..97fe2dfaee 100644 --- a/source3/smbd/sec_ctx.c +++ b/source3/smbd/sec_ctx.c @@ -258,7 +258,7 @@ BOOL push_sec_ctx(void) ctx_p->token = dup_nt_token(sec_ctx_stack[sec_ctx_stack_ndx-1].token); if (! ctx_p->token) { - DEBUG(0, ("Out of memory in push_sec_ctx()\n")); + DEBUG(0, ("Out of memory on dup_nt_token() in push_sec_ctx()\n")); return False; } @@ -266,7 +266,7 @@ BOOL push_sec_ctx(void) if (ctx_p->ngroups != 0) { if (!(ctx_p->groups = malloc(ctx_p->ngroups * sizeof(gid_t)))) { - DEBUG(0, ("Out of memory in push_sec_ctx()\n")); + DEBUG(0, ("Out of memory on malloc() in push_sec_ctx()\n")); delete_nt_token(&ctx_p->token); return False; } @@ -278,7 +278,7 @@ BOOL push_sec_ctx(void) init_privilege(&ctx_p->privs); if (! NT_STATUS_IS_OK(dup_priv_set(ctx_p->privs, sec_ctx_stack[sec_ctx_stack_ndx-1].privs))) { - DEBUG(0, ("Out of memory in push_sec_ctx()\n")); + DEBUG(0, ("Out of memory on dup_priv_set() in push_sec_ctx()\n")); delete_nt_token(&ctx_p->token); destroy_privilege(&ctx_p->privs); return False; |