[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2031-g46e2bbd

[Günther Deschner]

The branch, master has been updated
       via  46e2bbd141b9fb88019462f90886b39cd3eac80b (commit)
       via  abbcd574db6ac7a94856801f83b2ade971a6a396 (commit)
      from  9f94c408851505a5eb2d5fbf4b0ac37ff0b0e037 (commit)

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


- Log -----------------------------------------------------------------
commit 46e2bbd141b9fb88019462f90886b39cd3eac80b
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jun 4 21:15:41 2009 +0200

    gitignore: remove traces of source4/libcli/auth.
    
    This makes it possible clean up a master checkout with git clean -x -f -d and
    build samba4 afterwards.
    
    Guenther

commit abbcd574db6ac7a94856801f83b2ade971a6a396
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jun 4 21:14:25 2009 +0200

    s4-smbtorture: fix comment in RPC-SAMR-LARGE-DC test.
    
    Andrew, I think you wanted to print this instead.
    
    Guenther

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

Summary of changes:
 .gitignore                 |    1 -
 source4/torture/rpc/samr.c |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 168c9bf..e8e1dfa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -180,7 +180,6 @@ source4/include/config_tmp.h.in
 source4/kdc/pac_glue.h
 source4/ldap_server/proto.h
 source4/lib/charset/charset_proto.h
-source4/libcli/auth/proto.h
 source4/libcli/composite/proto.h
 source4/libcli/finddcs.h
 source4/libcli/ldap/ldap_proto.h
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 2e78c65..f9eb294 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -6297,9 +6297,9 @@ static bool test_ManyObjects(struct dcerpc_pipe *p,
 		"unexpected number of results returned in dispinfo call");
 #endif
 	if (which_ops == TORTURE_SAMR_MANY_ACCOUNTS && num_enum != num_anounced + num_created) {
-		torture_comment(tctx, 
-				"unexpected number of results (%u) returned in enum call, expected %u", 
-				num_enum != num_anounced + num_created);
+		torture_comment(tctx,
+				"unexpected number of results (%u) returned in enum call, expected %u\n",
+				num_enum, num_anounced + num_created);
 	}
 	return ret;
 }


-- 
Samba Shared Repository