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

diff --git a/source4/rpc_server/samr/dcesrv_samr.h b/source4/rpc_server/samr/dcesrv_samr.h
index a28a4bec437ea88108261e7b245dea2ca079e21e..7d12d3c4bde9bd9ee218c794776920f3af1ae513 100644 (file)
--- 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 bec2a064dc1227eb5fa107129f675f8f5a67bc7f..12cf62fcfef56547761fa78740d40c7a36d1c515 100644 (file)
--- 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 $<