[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  56969ad s4:torture/smb2/acls.c - remove two unused variables
       via  96c1cd7 s4:introduce casts before outputs of "time_t" variables
       via  7128c15 replace:wscript - reintroduce the size check for "bool" due to a request of metze
       via  3c07250 replace:wscript - change the "bool" checks to be compatible with more platforms
      from  c254527 build: update gdb_backtrace to make it search for gdb66 as it work on freebsd

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


- Log -----------------------------------------------------------------
commit 56969adb3dad6dbaec2410e4e23242b3ce88b696
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Nov 28 16:07:26 2010 +0100

    s4:torture/smb2/acls.c - remove two unused variables
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Sun Nov 28 17:22:54 CET 2010 on sn-devel-104

commit 96c1cd762db100a11dd989f1505a265c69885bf9
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Nov 28 16:06:19 2010 +0100

    s4:introduce casts before outputs of "time_t" variables
    
    Otherwise we are getting warnings on "NetBSD".

commit 7128c15b65381da8e37be3cbd31d3b8310fd49aa
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Nov 28 14:55:28 2010 +0100

    replace:wscript - reintroduce the size check for "bool" due to a request of metze

commit 3c0725001eeb2e132d6484a171ce13b5117c0434
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Nov 28 12:28:03 2010 +0100

    replace:wscript - change the "bool" checks to be compatible with more platforms
    
    - If the type was found then we are fine and define "HAVE_BOOL"
    - Othewise we substitute it in "replace.h" as "_Bool" or if not possible as "int"
    - This prevents lot of warnings on platforms where we don't have a "bool" type as Tru64
    - The length check for "bool" is not really useful and therefore removed

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

Summary of changes:
 source4/nbt_server/wins/wins_hook.c |    2 +-
 source4/torture/rpc/samr.c          |    2 +-
 source4/torture/smb2/acls.c         |    2 --
 3 files changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/nbt_server/wins/wins_hook.c b/source4/nbt_server/wins/wins_hook.c
index 9753a86..1af471b 100644
--- a/source4/nbt_server/wins/wins_hook.c
+++ b/source4/nbt_server/wins/wins_hook.c
@@ -61,7 +61,7 @@ void wins_hook(struct winsdb_handle *h, const struct winsdb_record *rec,
 			      wins_hook_action_string(action),
 			      rec->name->name,
 			      rec->name->type,
-			      rec->expire_time);
+			      (long int) rec->expire_time);
 	if (!cmd) goto failed;
 
 	for (i=0; rec->addresses[i]; i++) {
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index a57cdb8..8ee1198 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -1171,7 +1171,7 @@ static bool test_SetUserPass_level_ex(struct dcerpc_pipe *p,
 	}
 
 	if (fields_present & SAMR_FIELD_COMMENT) {
-		comment = talloc_asprintf(tctx, "comment: %ld\n", time(NULL));
+		comment = talloc_asprintf(tctx, "comment: %ld\n", (long int) time(NULL));
 	}
 
 	ZERO_STRUCT(u);
diff --git a/source4/torture/smb2/acls.c b/source4/torture/smb2/acls.c
index a857f4d..d723ae4 100644
--- a/source4/torture/smb2/acls.c
+++ b/source4/torture/smb2/acls.c
@@ -666,8 +666,6 @@ static bool test_owner_bits(struct torture_context *tctx, struct smb2_tree *tree
 	union smb_setfileinfo set;
 	struct security_descriptor *sd, *sd_orig;
 	const char *owner_sid;
-	bool has_restore_privilege = false;
-	bool has_take_ownership_privilege = false;
 	uint32_t expected_bits;
 
 	if (!smb2_util_setup_dir(tctx, tree, BASEDIR))


-- 
Samba Shared Repository