The branch, master has been updated
via 78d12e5 s4:torture/ndr/spoolss.c - add a "ULL" suffix for a 64 bit
unsigned integer literal
via da78e24 lib/replace/testsuite.c - fix test output
from e9dddc5 s3:libsmb: use 16 zero bytes as channel binding checksum in
the gssapi checksum (bug #7883)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 78d12e5629e6f5a1b4907eb03d5eef4e7eab4b9a
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Thu Dec 23 12:55:09 2010 +0100
s4:torture/ndr/spoolss.c - add a "ULL" suffix for a 64 bit unsigned integer
literal
To quiet a warning on Solaris
Autobuild-User: Matthias Dieter Wallnöfer <[email protected]>
Autobuild-Date: Thu Dec 23 13:43:57 CET 2010 on sn-devel-104
commit da78e24ca201dcdac8a498a5d0da8c30154d4d9a
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Thu Dec 23 12:42:37 2010 +0100
lib/replace/testsuite.c - fix test output
-----------------------------------------------------------------------
Summary of changes:
lib/replace/test/testsuite.c | 2 +-
source4/torture/ndr/spoolss.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/test/testsuite.c b/lib/replace/test/testsuite.c
index 1f242eb..0e455f2 100644
--- a/lib/replace/test/testsuite.c
+++ b/lib/replace/test/testsuite.c
@@ -771,7 +771,7 @@ static int test_FUNCTION(void)
{
printf("test: FUNCTION\n");
if (strcmp(__FUNCTION__, "test_FUNCTION") != 0) {
- printf("failure: FAILURE [\nFAILURE invalid\n]\n");
+ printf("failure: FUNCTION [\nFUNCTION invalid\n]\n");
return false;
}
printf("success: FUNCTION\n");
diff --git a/source4/torture/ndr/spoolss.c b/source4/torture/ndr/spoolss.c
index d028c90..2c525d9 100644
--- a/source4/torture/ndr/spoolss.c
+++ b/source4/torture/ndr/spoolss.c
@@ -688,7 +688,7 @@ static bool getprinterdriver2_out_check(struct
torture_context *tctx,
torture_assert(tctx, r->out.info->info6.default_datatype == NULL,
"default_datatype");
torture_assert(tctx, r->out.info->info6.previous_names == NULL,
"previous_names");
/* driver_date : Wed Jun 21 02:00:00 2006 CEST */
- torture_assert_u64_equal(tctx, r->out.info->info6.driver_version,
0x000600011db04001, "driver_version");
+ torture_assert_u64_equal(tctx, r->out.info->info6.driver_version,
0x000600011db04001ULL, "driver_version");
torture_assert_str_equal(tctx, r->out.info->info6.manufacturer_name,
"Ricoh", "manufacturer_name");
torture_assert_str_equal(tctx, r->out.info->info6.manufacturer_url,
"http://go.microsoft.com/fwlink/?LinkID=47&prd=10798&sbp=Printers";,
"manufacturer_url");
torture_assert_str_equal(tctx, r->out.info->info6.hardware_id,
"ricohricoh_aficio_mp5063", "hardware_id");
--
Samba Shared Repository
