diff options
author | Tim Potter <tpot@samba.org> | 2002-12-20 01:35:21 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2002-12-20 01:35:21 +0000 |
commit | cd11f10e841fd53538164f283dc81232ff36638a (patch) | |
tree | c823869e744b430d27dfdc67aa92ec6ee7103219 | |
parent | 0f556b1c0258b2cafa00b9eb2b213bec0ff88d86 (diff) | |
download | samba-cd11f10e841fd53538164f283dc81232ff36638a.tar.gz samba-cd11f10e841fd53538164f283dc81232ff36638a.tar.xz samba-cd11f10e841fd53538164f283dc81232ff36638a.zip |
Merge from HEAD:
>Fix fnum leak under error condition in cacl_dump.
-rw-r--r-- | source/utils/smbcacls.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/source/utils/smbcacls.c b/source/utils/smbcacls.c index 1d681a07f7b..043aa689cc9 100644 --- a/source/utils/smbcacls.c +++ b/source/utils/smbcacls.c @@ -443,29 +443,36 @@ dump the acls for a file *******************************************************/ static int cacl_dump(struct cli_state *cli, char *filename) { - int fnum; + int result = EXIT_FAILED; + int fnum = -1; SEC_DESC *sd; - if (test_args) return EXIT_OK; + if (test_args) + return EXIT_OK; fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ); + if (fnum == -1) { printf("Failed to open %s: %s\n", filename, cli_errstr(cli)); - return EXIT_FAILED; + goto done; } sd = cli_query_secdesc(cli, fnum, ctx); if (!sd) { printf("ERROR: secdesc query failed: %s\n", cli_errstr(cli)); - return EXIT_FAILED; + goto done; } sec_desc_print(stdout, sd); - cli_close(cli, fnum); + result = EXIT_OK; - return EXIT_OK; +done: + if (fnum != -1) + cli_close(cli, fnum); + + return result; } /***************************************************** |