r14728: Install two more headers, fix warning

(This used to be commit 7a227457a4523e8b76d86022a38c8851c04b2e6b)

diff --git a/source4/headermap.txt b/source4/headermap.txt
index 5861c3a3c3efe52ecf1f94011b2dace0b4a1f3a5..83777120eedd459896fccfe55c7c25292238ce2c 100644 (file)
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -81,3 +81,5 @@ dsdb/samdb/samdb.h: samdb.h
 dsdb/samdb/samdb_proto.h: samdb/proto.h
 libcli/util/asn_1.h: samba/asn1.h
 libcli/util/asn1_proto.h: samba/asn1/proto.h
+libcli/util/error.h: core/error.h
+libcli/util/proto.h: core/error_proto.h

diff --git a/source4/torture/com/simple.c b/source4/torture/com/simple.c
index e4a18d7cbda231ce05277e71144809b7f8a77acc..aaae0f7ce63daaf530ef86eb4ad813edcce196e5 100644 (file)
--- a/source4/torture/com/simple.c
+++ b/source4/torture/com/simple.c
@@ -85,7 +85,7 @@ static BOOL test_readwrite(TALLOC_CTX *mem_ctx, const char *host)
        return True;
 }
 
-BOOL torture_com_simple(void)
+BOOL torture_com_simple(struct torture_context *torture)
 {
        BOOL ret = True;
        TALLOC_CTX *mem_ctx = talloc_init("torture_dcom_simple");