[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1245-g53d491c

[Andrew Bartlett]

The branch, master has been updated
       via  53d491c9a4011a7d9ad69db52fb91d163f3f990a (commit)
       via  af6298a84dffb400551861c6dc34591f1473830c (commit)
       via  0d4bd2c3971dcd69442a9f12598cf62187bc854f (commit)
      from  1722859abd169f2949b5822f97c810f2b8d162da (commit)

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


- Log -----------------------------------------------------------------
commit 53d491c9a4011a7d9ad69db52fb91d163f3f990a
Merge: af6298a84dffb400551861c6dc34591f1473830c 1722859abd169f2949b5822f97c810f2b8d162da
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 23 15:12:35 2009 +0200

    Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel

commit af6298a84dffb400551861c6dc34591f1473830c
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 23 15:11:04 2009 +0200

    s4:test Fix 'make lcov' in Samba4

commit 0d4bd2c3971dcd69442a9f12598cf62187bc854f
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Apr 23 12:19:10 2009 +0200

    s4:samr Use ldb_context * rather than void *

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

Summary of changes:
 source4/rpc_server/samr/dcesrv_samr.h |    2 +-
 source4/torture/config.mk             |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/samr/dcesrv_samr.h b/source4/rpc_server/samr/dcesrv_samr.h
index a28a4be..7d12d3c 100644
--- a/source4/rpc_server/samr/dcesrv_samr.h
+++ b/source4/rpc_server/samr/dcesrv_samr.h
@@ -37,7 +37,7 @@ enum samr_handle {
   state asscoiated with a samr_Connect*() operation
 */
 struct samr_connect_state {
-	void *sam_ctx;
+	struct ldb_context *sam_ctx;
 	uint32_t access_mask;
 };
 
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index bec2a06..12cf62f 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -352,8 +352,8 @@ gcov: test
 	done
 
 samba.info: test
-	-rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
-	lcov --base-directory `pwd` --directory . --capture --output-file samba.info
+	-rm heimdal/lib/*/{lex,parse,sel-lex}.{gcda,gcno}
+	lcov --base-directory `pwd` --directory ../nsswitch --directory ../libcli --directory ../librpc --directory ../lib --capture --output-file samba.info
 
 lcov: samba.info
 	genhtml -o coverage $<


-- 
Samba Shared Repository