[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  09d3f57 lib: Fix CID 241650 Sizeof not portable
       via  7027c6a pthreadpool: Fix CID 710828 Sizeof not portable
       via  8b3d4ef dbwrap: Fix CID 1002092 Uninitialized scalar variable
      from  3b3b5b0 docs: smb.conf: fix max read/write/trans default values (bug #9871)

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


- Log -----------------------------------------------------------------
commit 09d3f577c803dc22531eb9d74d08b16eedbe84f0
Author: Volker Lendecke <vl at samba.org>
Date:   Sun May 12 12:47:39 2013 +0200

    lib: Fix CID 241650 Sizeof not portable
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ira Cooper <ira at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Sun May 12 17:44:55 CEST 2013 on sn-devel-104

commit 7027c6aca96ce4eb4b6a4207f206d7b85eae7c56
Author: Volker Lendecke <vl at samba.org>
Date:   Sun May 12 12:44:41 2013 +0200

    pthreadpool: Fix CID 710828 Sizeof not portable
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ira Cooper <ira at samba.org>

commit 8b3d4eff9342de812d0d27759beeff5e4e7532d1
Author: Volker Lendecke <vl at samba.org>
Date:   Sun May 12 12:33:49 2013 +0200

    dbwrap: Fix CID 1002092 Uninitialized scalar variable
    
    We don't set saved_errno in the ret==0 case.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ira Cooper <ira at samba.org>

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

Summary of changes:
 lib/dbwrap/dbwrap_ntdb.c              |    4 +++-
 source3/lib/pthreadpool/pthreadpool.c |    2 +-
 source3/lib/util_str.c                |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/dbwrap/dbwrap_ntdb.c b/lib/dbwrap/dbwrap_ntdb.c
index 5be7b84..658c487 100644
--- a/lib/dbwrap/dbwrap_ntdb.c
+++ b/lib/dbwrap/dbwrap_ntdb.c
@@ -326,7 +326,9 @@ static int timeout_lock(int fd, int rw, off_t off, off_t len, bool waitflag,
 	}
 
 	alarm(0);
-	errno = saved_errno;
+	if (ret != 0) {
+		errno = saved_errno;
+	}
 	return ret;
 }
 
diff --git a/source3/lib/pthreadpool/pthreadpool.c b/source3/lib/pthreadpool/pthreadpool.c
index 0430377..c5c9367 100644
--- a/source3/lib/pthreadpool/pthreadpool.c
+++ b/source3/lib/pthreadpool/pthreadpool.c
@@ -407,7 +407,7 @@ static void pthreadpool_server_exit(struct pthreadpool *pool)
 	pool->num_threads -= 1;
 
 	exited = (pthread_t *)realloc(
-		pool->exited, sizeof(pthread_t *) * (pool->num_exited + 1));
+		pool->exited, sizeof(pthread_t) * (pool->num_exited + 1));
 
 	if (exited == NULL) {
 		/* lost a thread status */
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 314c7ea..967beda 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -1282,7 +1282,7 @@ char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
 			list = tmp;
 
 			memset (&list[num], 0,
-				((sizeof(char**)) * (S_LIST_ABS +1)));
+				((sizeof(char*)) * (S_LIST_ABS +1)));
 		}
 
 		list[num] = tok;


-- 
Samba Shared Repository