[SCM] Samba Shared Repository - branch master updated - 29838debb3d350aaee0bf9744f1a7371b8b06736

[Jelmer Vernooij]

The branch, master has been updated
       via  29838debb3d350aaee0bf9744f1a7371b8b06736 (commit)
       via  6fb7fa8cc6c53626434530c796e532e80618253b (commit)
      from  db90d9ad1693b3c8f388dbff63a79707ef4842cd (commit)

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


- Log -----------------------------------------------------------------
commit 29838debb3d350aaee0bf9744f1a7371b8b06736
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Oct 20 12:28:13 2008 +0200

    Fix names in winreg torture tests.

commit 6fb7fa8cc6c53626434530c796e532e80618253b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Oct 20 12:28:07 2008 +0200

    Also build all other Samba 4 binaries during merged build.

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

Summary of changes:
 source3/samba4-templates.mk  |    5 ++---
 source4/torture/ndr/winreg.c |    2 +-
 source4/torture/rpc/winreg.c |    4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/samba4-templates.mk b/source3/samba4-templates.mk
index 154c3aa..e691af5 100644
--- a/source3/samba4-templates.mk
+++ b/source3/samba4-templates.mk
@@ -25,8 +25,7 @@ $(1)4: $(2) $(LIBREPLACE_OBJ) ;
 clean::
 	@rm -f $(1)
 
-binaries:: $(1)
-
+everything:: $(1)4
 
 endef
 
@@ -40,7 +39,7 @@ $(1)4: $(2) $(LIBREPLACE_OBJ) ;
 clean::
 	rm -f $(1)
 
-binaries:: $(1)
+binaries:: $(1)4
 
 
 endef
diff --git a/source4/torture/ndr/winreg.c b/source4/torture/ndr/winreg.c
index 60a3230..de804b7 100644
--- a/source4/torture/ndr/winreg.c
+++ b/source4/torture/ndr/winreg.c
@@ -417,7 +417,7 @@ static bool queryinfokey_out_check(struct torture_context *tctx, struct winreg_Q
 	torture_assert_str_equal(tctx, r->out.classname->name, "", "class out name");
 	torture_assert_int_equal(tctx, *r->out.num_subkeys, 0, "num subkeys");
 	torture_assert_int_equal(tctx, *r->out.max_subkeylen, 0, "subkey length");
-	torture_assert_int_equal(tctx, *r->out.max_subkeysize, 140, "subkey size");
+	torture_assert_int_equal(tctx, *r->out.max_classlen, 140, "subkey size");
 	torture_assert_werr_ok(tctx, r->out.result, "return code");
 	return true;
 }
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index bd897f0..08ec8f5 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -1396,7 +1396,7 @@ static bool test_QueryInfoKey(struct dcerpc_pipe *p,
 			      struct policy_handle *handle, char *class)
 {
 	struct winreg_QueryInfoKey r;
-	uint32_t num_subkeys, max_subkeylen, max_subkeysize,
+	uint32_t num_subkeys, max_subkeylen, max_classlen,
 		num_values, max_valnamelen, max_valbufsize,
 		secdescsize;
 	NTTIME last_changed_time;
@@ -1405,7 +1405,7 @@ static bool test_QueryInfoKey(struct dcerpc_pipe *p,
 	r.in.handle = handle;
 	r.out.num_subkeys = &num_subkeys;
 	r.out.max_subkeylen = &max_subkeylen;
-	r.out.max_subkeysize = &max_subkeysize;
+	r.out.max_classlen = &max_classlen;
 	r.out.num_values = &num_values;
 	r.out.max_valnamelen = &max_valnamelen;
 	r.out.max_valbufsize = &max_valbufsize;


-- 
Samba Shared Repository