diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-04-22 02:54:04 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-04-22 02:54:04 +0000 |
| commit | ac9e221c3e6bc892e0f73a403c89434ae13a8eec (patch) | |
| tree | c62bcd8deb969216b49b70d79973c8713ebe2701 /source3/libsmb/clisecdesc.c | |
| parent | a626bb3a239e80ad0ea55a00f721b2c0a5dfc8fa (diff) | |
| download | samba-ac9e221c3e6bc892e0f73a403c89434ae13a8eec.tar.gz samba-ac9e221c3e6bc892e0f73a403c89434ae13a8eec.tar.bz2 samba-ac9e221c3e6bc892e0f73a403c89434ae13a8eec.zip | |
merging from 2.2 to head
(This used to be commit bfcc6f88271025760732271f03933839b1cbe0de)
Diffstat (limited to 'source3/libsmb/clisecdesc.c')
| -rw-r--r-- | source3/libsmb/clisecdesc.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/source3/libsmb/clisecdesc.c b/source3/libsmb/clisecdesc.c index d34a23537a..0b52d62513 100644 --- a/source3/libsmb/clisecdesc.c +++ b/source3/libsmb/clisecdesc.c @@ -33,7 +33,7 @@ SEC_DESC *cli_query_secdesc(struct cli_state *cli,int fd) char param[8]; char *rparam=NULL, *rdata=NULL; int rparam_count=0, rdata_count=0; - TALLOC_CTX *mem_ctx = NULL; + TALLOC_CTX *mem_ctx; prs_struct pd; SEC_DESC *psd = NULL; @@ -74,13 +74,11 @@ SEC_DESC *cli_query_secdesc(struct cli_state *cli,int fd) cleanup: - if (mem_ctx) { - talloc_destroy(mem_ctx); - prs_mem_free(&pd); - } + talloc_destroy(mem_ctx); safe_free(rparam); safe_free(rdata); + prs_mem_free(&pd); return psd; } @@ -95,7 +93,7 @@ BOOL cli_set_secdesc(struct cli_state *cli,int fd, SEC_DESC *sd) char param[8]; char *rparam=NULL, *rdata=NULL; int rparam_count=0, rdata_count=0; - TALLOC_CTX *mem_ctx=NULL; + TALLOC_CTX *mem_ctx; prs_struct pd; BOOL ret = False; @@ -140,10 +138,9 @@ BOOL cli_set_secdesc(struct cli_state *cli,int fd, SEC_DESC *sd) safe_free(rparam); safe_free(rdata); - if (mem_ctx) { - talloc_destroy(mem_ctx); - prs_mem_free(&pd); - } + talloc_destroy(mem_ctx); + + prs_mem_free(&pd); return ret; } |