The branch, master has been updated
via 0b79ec2 s3/client/clitar.c: always close fd
from e70fef9 winbindd: prevent log spam when enumerating users
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0b79ec200dcc36ab0b8c190b5fba68fc2b5906d9
Author: Aurelien Aptel <aap...@suse.com>
Date: Tue May 31 15:46:47 2016 +0200
s3/client/clitar.c: always close fd
Signed-off-by: Aurelien Aptel <aap...@suse.com>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Thu Jun 2 12:47:26 CEST 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/client/clitar.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 188f65d..5af0924 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -1257,7 +1257,7 @@ static int tar_read_inclusion_file(struct tar *t, const
char* filename)
{
char *line;
int err = 0;
- int fd;
+ int fd = -1;
TALLOC_CTX *ctx = talloc_new(NULL);
if (ctx == NULL) {
return 1;
@@ -1281,9 +1281,10 @@ static int tar_read_inclusion_file(struct tar *t, const
char* filename)
}
}
- close(fd);
-
out:
+ if (fd != -1) {
+ close(fd);
+ }
talloc_free(ctx);
return err;
}
--
Samba Shared Repository
