[SCM] Samba Shared Repository - branch master updated - 44937c55ff69f29d44cf6ef34a7e4050816b30a4

[Tim Prouty]

The branch, master has been updated
       via  44937c55ff69f29d44cf6ef34a7e4050816b30a4 (commit)
      from  9872dbf439e94ffd56019f789145c4b5eb3e606c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 44937c55ff69f29d44cf6ef34a7e4050816b30a4
Author: Tim Prouty <tprouty at samba.org>
Date:   Sun Jan 11 23:16:37 2009 -0800

    s3: Fix uninitialized variable in OneFS streams

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/onefs_streams.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/onefs_streams.c b/source3/modules/onefs_streams.c
index 55ce11e..184fe4f 100644
--- a/source3/modules/onefs_streams.c
+++ b/source3/modules/onefs_streams.c
@@ -132,7 +132,8 @@ int onefs_rename(vfs_handle_struct *handle, const char *oldname,
 {
 	TALLOC_CTX *frame = NULL;
 	int ret = -1;
-	int dir_fd, saved_errno;
+	int dir_fd = -1;
+	int saved_errno;
 	bool old_is_stream;
 	bool new_is_stream;
 	char *obase = NULL;
@@ -182,7 +183,9 @@ int onefs_rename(vfs_handle_struct *handle, const char *oldname,
 
  done:
 	saved_errno = errno;
-	close(dir_fd);
+	if (dir_fd >= 0) {
+		close(dir_fd);
+	}
 	errno = saved_errno;
 	TALLOC_FREE(frame);
 	return ret;


-- 
Samba Shared Repository