r24812: Fix headers for external users.

diff --git a/source/headermap.txt b/source/headermap.txt
index ff67a669353db5797079a11d9373d8e796dc6adb..30fef21ed243d59a4aa809acc6fbdb7640a11477 100644 (file)
--- a/source/headermap.txt
+++ b/source/headermap.txt
@@ -39,7 +39,6 @@ libcli/util/doserr.h: core/doserr.h
 libcli/util/nt_status.h: core/ntstatus.h
 libcli/cldap/cldap.h: cldap.h
 lib/samba3/samba3.h: samba3.h
-include/core.h: core.h
 librpc/gen_ndr/dcerpc.h: gen_ndr/dcerpc.h
 librpc/gen_ndr/netlogon.h: gen_ndr/netlogon.h
 librpc/gen_ndr/ndr_misc.h: gen_ndr/ndr_misc.h
@@ -90,7 +89,7 @@ librpc/gen_ndr/ndr_svcctl.h: dcerpc/ndr_svcctl.h
 librpc/gen_ndr/ndr_svcctl_c.h: dcerpc/ndr_svcctl_c.h
 lib/cmdline/popt_common.h: samba/popt.h
 lib/util/dlinklist.h: dlinklist.h
-lib/util/data_blob.h: data_blob.h
+lib/util/data_blob.h: util/data_blob.h
 lib/util/time.h: util/time.h
 version.h: samba/version.h
 param/proto.h: param/proto.h

diff --git a/source/include/core.h b/source/include/core.h
index 55e89e97614d9869fba4f3964fb790408c4ec47c..fc66e1028321a82502bb72101eaf85d38f505659 100644 (file)
--- a/source/include/core.h
+++ b/source/include/core.h
@@ -27,10 +27,6 @@
 
 #include <stdlib.h>
 
-/* by making struct ldb_val and DATA_BLOB the same, we can simplify
-   a fair bit of code */
-#define ldb_val datablob
-
 /*
   we use struct ipv4_addr to avoid having to include all the
   system networking headers everywhere

diff --git a/source/lib/util/data_blob.h b/source/lib/util/data_blob.h
index acecb8813249c9fb8832d653da20d4d0921051a6..e39b2eaf45acb2f16fa2d074fecccbfc5291ae98 100644 (file)
--- a/source/lib/util/data_blob.h
+++ b/source/lib/util/data_blob.h
@@ -19,6 +19,12 @@
 #ifndef _SAMBA_DATABLOB_H_
 #define _SAMBA_DATABLOB_H_
 
+#ifndef _PUBLIC_
+#define _PUBLIC_
+#endif
+
+#include <talloc.h>
+
 /* used to hold an arbitrary blob of data */
 typedef struct datablob {
        uint8_t *data;
@@ -30,6 +36,10 @@ struct data_blob_list_item {
        DATA_BLOB blob;
 };
 
+/* by making struct ldb_val and DATA_BLOB the same, we can simplify
+   a fair bit of code */
+#define ldb_val datablob
+
 #define data_blob(ptr, size) data_blob_named(ptr, size, "DATA_BLOB: "__location__)
 #define data_blob_talloc(ctx, ptr, size) data_blob_talloc_named(ctx, ptr, size, "DATA_BLOB: "__location__)
 #define data_blob_dup_talloc(ctx, blob) data_blob_talloc_named(ctx, (blob)->data, (blob)->length, "DATA_BLOB: "__location__)

diff --git a/source/librpc/rpc/dcerpc.h b/source/librpc/rpc/dcerpc.h
index f075075c02891d939cd93550c5011d0e41812080..b53f7866180bd7d1f1721651276ae0943030a077 100644 (file)
--- a/source/librpc/rpc/dcerpc.h
+++ b/source/librpc/rpc/dcerpc.h
@@ -23,7 +23,7 @@
 #ifndef __DCERPC_H__
 #define __DCERPC_H__
 
-#include "core.h"
+#include "lib/util/data_blob.h"
 #include "librpc/gen_ndr/dcerpc.h"
 #include "librpc/ndr/libndr.h"
 

diff --git a/source/main.mk b/source/main.mk
index 613d76e0b94869a16a1745cb43bddc0804df5a6e..a0fafec3a31269940ec13290c5b621463a9e5371 100644 (file)
--- a/source/main.mk
+++ b/source/main.mk
@@ -32,8 +32,7 @@ include scripting/ejs/config.mk
 include scripting/swig/config.mk
 include kdc/config.mk
 
-DEFAULT_HEADERS = $(srcdir)/include/core.h \
-                 $(srcdir)/lib/util/dlinklist.h \
+DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
                  $(srcdir)/version.h
 
 binaries: $(BINARIES)

diff --git a/source/pidl/lib/Parse/Pidl/Samba4/Header.pm b/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
index 7deb3ca331a893bdb77c68a76312ef396769447c..31145e9fb3ed71425446a4b653903caf73051a2a 100644 (file)
--- a/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
+++ b/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
@@ -382,7 +382,7 @@ sub Parse($)
        %headerstructs = ();
        pidl "/* header auto-generated by pidl */\n\n";
        if (!is_intree()) {
-               pidl "#include <core.h>\n";
+               pidl "#include <util/data_blob.h>\n";
        }
        pidl "#include <stdint.h>\n";
        pidl "\n";

diff --git a/source/pidl/tests/Util.pm b/source/pidl/tests/Util.pm
index dfd219186f09c5f2b4d0978930ed92984052d6fd..c7fca95aaa7a11ab02abf2334716f8bf6d464ec7 100644 (file)
--- a/source/pidl/tests/Util.pm
+++ b/source/pidl/tests/Util.pm
@@ -102,7 +102,7 @@ SKIP: {
        print CC "#include <stdio.h>\n";
        print CC "#include <stdbool.h>\n";
        print CC "#include <stdarg.h>\n";
-       print CC "#include <core.h>\n";
+       print CC "#include <util/data_blob.h>\n";
        print CC $header;
        print CC $ndrheader;
        print CC $extra if ($extra);