[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-251-g471b1b0
Volker Lendecke
vlendec at samba.org
Sat Mar 15 21:31:13 GMT 2008
The branch, v3-2-test has been updated
via 471b1b0c58bc2def5d2fe9d98401def34724d447 (commit)
via 44122f06d02492a7a0a37413d6f975c3b1e3c283 (commit)
via e6787aa133a1b241987319486c3bc46ac6ad41af (commit)
via 9ea0078c3151984a901c9bba559ae2bd7959e077 (commit)
from dc3d5e16452bf30055638ba3cfe99097fb557156 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 471b1b0c58bc2def5d2fe9d98401def34724d447
Author: Volker Lendecke <vl at samba.org>
Date: Sat Mar 15 22:27:05 2008 +0100
Fix Coverity ID 554
commit 44122f06d02492a7a0a37413d6f975c3b1e3c283
Author: Volker Lendecke <vl at samba.org>
Date: Sat Mar 15 22:22:53 2008 +0100
Fix Coverity ID 555
commit e6787aa133a1b241987319486c3bc46ac6ad41af
Author: Volker Lendecke <vl at samba.org>
Date: Sat Mar 15 22:16:42 2008 +0100
Fix Coverity ID 563
dirmask is always set here, we've dereferenced it before anyway
commit 9ea0078c3151984a901c9bba559ae2bd7959e077
Author: Volker Lendecke <vl at samba.org>
Date: Sat Mar 15 22:07:44 2008 +0100
Fix Coverity ID 564
finfo1==NULL just does not happen in current code
-----------------------------------------------------------------------
Summary of changes:
source/client/client.c | 6 +-----
source/client/clitar.c | 10 ----------
source/lib/replace/getpass.c | 3 +++
source/libsmb/namequery.c | 1 +
4 files changed, 5 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/client.c b/source/client/client.c
index b0b3e8e..a285bcc 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -4102,11 +4102,7 @@ static void completion_remote_filter(const char *mnt,
TALLOC_CTX *ctx = talloc_stackframe();
char *tmp;
- if (info->dirmask && info->dirmask[0] != 0) {
- tmp = talloc_strdup(ctx,info->dirmask);
- } else {
- tmp = talloc_strdup(ctx,"");
- }
+ tmp = talloc_strdup(ctx,info->dirmask);
if (!tmp) {
TALLOC_FREE(ctx);
return;
diff --git a/source/client/clitar.c b/source/client/clitar.c
index 04cc987..f53c9b4 100644
--- a/source/client/clitar.c
+++ b/source/client/clitar.c
@@ -668,16 +668,6 @@ static void do_atar(const char *rname_in,char *lname,file_info *finfo1)
}
safe_strcpy(finfo.name,rname, strlen(rname));
- if (!finfo1) {
- time_t atime, mtime;
- if (!cli_getattrE(cli, fnum, &finfo.mode, &finfo.size, NULL, &atime, &mtime)) {
- DEBUG(0, ("getattrE: %s\n", cli_errstr(cli)));
- goto cleanup;
- }
- finfo.atime_ts = convert_time_t_to_timespec(atime);
- finfo.mtime_ts = convert_time_t_to_timespec(mtime);
- finfo.ctime_ts = finfo.mtime_ts;
- }
DEBUG(3,("file %s attrib 0x%X\n",finfo.name,finfo.mode));
diff --git a/source/lib/replace/getpass.c b/source/lib/replace/getpass.c
index 57e28eb..73333b9 100644
--- a/source/lib/replace/getpass.c
+++ b/source/lib/replace/getpass.c
@@ -187,6 +187,9 @@ char *rep_getpass(const char *prompt)
in_fd = fileno(in);
if (fgets(buf, bufsize, in) == NULL) {
buf[0] = 0;
+ if (in && in != stdin) {
+ fclose(in);
+ }
return buf;
}
}
diff --git a/source/libsmb/namequery.c b/source/libsmb/namequery.c
index ad16452..0191bf7 100644
--- a/source/libsmb/namequery.c
+++ b/source/libsmb/namequery.c
@@ -1051,6 +1051,7 @@ NTSTATUS resolve_wins(const char *name,
DEBUG(3,("resolve_wins: cannot receive WINS replies "
"on IPv6 address %s\n",
addr));
+ wins_srv_tags_free(wins_tags);
return NT_STATUS_INVALID_PARAMETER;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list