[SCM] Samba Shared Repository - branch v3-5-test updated

[Jeremy Allison]

The branch, v3-5-test has been updated
       via  13ff1f6... s4-dsdb: fixed empty structure error on solaris8
       via  4f1a1bf... s4-idl: don't call a variable 'stat'
       via  e94c54f... lib-util: check for too many combinations in generate_unique_strs()
      from  7e75d3c... tdb: fixed the intermittent failure of tdbtorture in the build farm

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 13ff1f6c01f8f79b63bd62fb6e5edff0b34439bd
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 20 13:00:12 2009 +1100

    s4-dsdb: fixed empty structure error on solaris8
    
    Nadya, I'm guessing you plan on adding some real elements to this
    structure later. For now I've added _dummy so the build can continue
    with the Solaris C compiler.

commit 4f1a1bf8a4afe82e35d9a4d545255d63201f269a
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 20 12:13:15 2009 +1100

    s4-idl: don't call a variable 'stat'
    
    never call a structure member by the name of a standard C lib call. It
    breaks the build on some systems.

commit e94c54ff3c83d0d19e0157216632bc99d5f8d0e3
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 20 11:34:49 2009 +1100

    lib-util: check for too many combinations in generate_unique_strs()

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

Summary of changes:
 lib/util/genrand.c                          |   11 ++++++++++-
 source4/dsdb/samdb/ldb_modules/descriptor.c |    1 +
 source4/librpc/idl/winsif.idl               |    4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/genrand.c b/lib/util/genrand.c
index 6002c06..f054402 100644
--- a/lib/util/genrand.c
+++ b/lib/util/genrand.c
@@ -375,7 +375,6 @@ _PUBLIC_ char** generate_unique_strs(TALLOC_CTX *mem_ctx, size_t len,
 	const unsigned c_size = 42;
 	int i, j;
 	unsigned rem;
-	long long place;
 	char ** strs = NULL;
 
 	if (num == 0 || len == 0)
@@ -397,6 +396,16 @@ _PUBLIC_ char** generate_unique_strs(TALLOC_CTX *mem_ctx, size_t len,
 		}
 		retstr[j] = 0;
 		strs[i] = retstr;
+		if (rem != 0) {
+			/* we were not able to fit the number of
+			 * combinations asked for in the length
+			 * specified */
+			DEBUG(0,(__location__ ": Too many combinations %u for length %u\n",
+				 num, (unsigned)len));
+				 
+			talloc_free(strs);
+			return NULL;			 
+		}
 	}
 
 	return strs;
diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 544fb8c..82f0911 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -43,6 +43,7 @@
 #include "param/param.h"
 
 struct descriptor_data {
+	int _dummy;
 };
 
 struct descriptor_context {
diff --git a/source4/librpc/idl/winsif.idl b/source4/librpc/idl/winsif.idl
index 380f3cb..a9bf554 100644
--- a/source4/librpc/idl/winsif.idl
+++ b/source4/librpc/idl/winsif.idl
@@ -129,7 +129,7 @@ import "nbt.idl";
 		uint32 verify_interval;
 		winsif_PriorityClass prioritiy_class;
 		uint32 num_worker_threads;
-		winsif_Stat stat;
+		winsif_Stat wstat;
 	} winsif_Results;
 
 	typedef enum {
@@ -307,7 +307,7 @@ import "nbt.idl";
 		uint32 verify_interval;
 		winsif_PriorityClass prioritiy_class;
 		uint32 num_worker_threads;
-		winsif_Stat stat;
+		winsif_Stat wstat;
 	} winsif_ResultsNew;
 
 	WERROR winsif_WinsStatusNew(


-- 
Samba Shared Repository