r25193: Update headers to easy use by external apps.

diff --git a/source/auth/credentials/credentials.h b/source/auth/credentials/credentials.h
index 1cecb97055dd0d961f8963ebba5b64523920f1e9..0fd9ce46be107ca629cd112657714a4e0288fd21 100644 (file)
--- a/source/auth/credentials/credentials.h
+++ b/source/auth/credentials/credentials.h
@@ -22,6 +22,7 @@
 #ifndef __CREDENTIALS_H__
 #define __CREDENTIALS_H__
 
+#include "util/data_blob.h"
 #include "librpc/gen_ndr/misc.h"
 
 struct ccache_container;

diff --git a/source/headermap.txt b/source/headermap.txt
index 30fef21ed243d59a4aa809acc6fbdb7640a11477..63c0ec31b2375a93e6a7af2c7f404d5034afea3e 100644 (file)
--- a/source/headermap.txt
+++ b/source/headermap.txt
@@ -4,7 +4,6 @@ lib/talloc/talloc.h: talloc.h
 lib/util/util.h: util.h
 lib/util/debug.h: util/debug.h
 lib/util/mutex.h: util/mutex.h
-nt_status.h: core/nt_status.h
 lib/util/byteorder.h: util/byteorder.h
 lib/util/safe_string.h: util/safe_string.h
 lib/util/xfile.h: util/xfile.h

diff --git a/source/lib/registry/hive.h b/source/lib/registry/hive.h
index 36491f149b8c1339113b9822aa9b5877961a2319..821420887087777ca4d8489b3039276c66993f2c 100644 (file)
--- a/source/lib/registry/hive.h
+++ b/source/lib/registry/hive.h
@@ -23,6 +23,7 @@
 
 #include <talloc.h>
 #include "librpc/gen_ndr/security.h"
+#include "libcli/util/nt_status.h"
 
 /**
  * This file contains the hive API. This API is generally used for 

diff --git a/source/lib/registry/interface.c b/source/lib/registry/interface.c
index 4950e1dacda7f05520d499094544b341f0f5818a..98c72c79402a983e634a1f3e18428cbca16139af 100644 (file)
--- a/source/lib/registry/interface.c
+++ b/source/lib/registry/interface.c
@@ -104,11 +104,9 @@ _PUBLIC_ WERROR reg_open_key(TALLOC_CTX *mem_ctx, struct registry_key *parent,
  * Get value by index
  */
 _PUBLIC_ WERROR reg_key_get_value_by_index(TALLOC_CTX *mem_ctx, 
-                                                                                  const struct registry_key *key, 
-                                                                                  uint32_t idx,
-                                                                                  const char **name,
-                                                                                  uint32_t *type,
-                                                                                  DATA_BLOB *data)
+                                          const struct registry_key *key, 
+                                          uint32_t idx, const char **name,
+                                          uint32_t *type, DATA_BLOB *data)
 {
        if (key == NULL) 
                return WERR_INVALID_PARAM;

diff --git a/source/lib/registry/local.c b/source/lib/registry/local.c
index 1a45c0a70a67bbfa6ec2bf1c22e9c0a34f37c754..a52feaaed5f7a98638fe03f63c041430cfc4ed70 100644 (file)
--- a/source/lib/registry/local.c
+++ b/source/lib/registry/local.c
@@ -49,10 +49,10 @@ struct local_key {
 };
 
 
-struct registry_key *reg_import_hive_key(struct registry_context *ctx,
-                                                                            struct hive_key *hive, 
-                                                                                uint32_t predefined_key,
-                                                                                const char **elements)
+struct registry_key *reg_import_hive_key(struct registry_context *ctx, 
+                                        struct hive_key *hive, 
+                                        uint32_t predefined_key, 
+                                        const char **elements)
 {
        struct local_key *local_key;
        struct reg_key_path parent_path;

diff --git a/source/lib/registry/registry.h b/source/lib/registry/registry.h
index 1d92a9edab3ad631e8f5a99db65db392b7df6ca2..90dd094eb9611add95a4b1c7b7d1efbb0530d754 100644 (file)
--- a/source/lib/registry/registry.h
+++ b/source/lib/registry/registry.h
@@ -26,6 +26,7 @@ struct registry_context;
 #include <talloc.h>
 #include "librpc/gen_ndr/security.h"
 #include "lib/registry/hive.h"
+#include "libcli/util/nt_status.h"
 
 /* Handles for the predefined keys */
 #define HKEY_CLASSES_ROOT               0x80000000

diff --git a/source/lib/registry/util.c b/source/lib/registry/util.c
index 6afd1bc44cc53b504301659934c780ded976cc82..78b578d2e502ab5c51c3d463eb993bf8225c9523 100644 (file)
--- a/source/lib/registry/util.c
+++ b/source/lib/registry/util.c
@@ -51,7 +51,7 @@ _PUBLIC_ const char *str_regtype(int type)
 }
 
 _PUBLIC_ char *reg_val_data_string(TALLOC_CTX *mem_ctx, uint32_t type, 
-                                                                  const DATA_BLOB data)
+                                  const DATA_BLOB data)
 { 
   char *ret = NULL;
 

diff --git a/source/lib/util/data_blob.h b/source/lib/util/data_blob.h
index e39b2eaf45acb2f16fa2d074fecccbfc5291ae98..1442438dd7a5575b6bac81a35d50f32d8b61ac35 100644 (file)
--- a/source/lib/util/data_blob.h
+++ b/source/lib/util/data_blob.h
@@ -24,6 +24,7 @@
 #endif
 
 #include <talloc.h>
+#include <stdint.h>
 
 /* used to hold an arbitrary blob of data */
 typedef struct datablob {

diff --git a/source/lib/util/time.h b/source/lib/util/time.h
index a1b3facf24491081ddab3fd5c72a411e55522353..557c5d4eabb5594dd83a53b155fe3fb02d607988 100644 (file)
--- a/source/lib/util/time.h
+++ b/source/lib/util/time.h
@@ -19,6 +19,10 @@
 #ifndef _SAMBA_TIME_H_
 #define _SAMBA_TIME_H_
 
+#ifndef _PUBLIC_
+#define _PUBLIC_
+#endif
+
 /* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30, 4 byte aligned */
 typedef uint64_t NTTIME;