diff options
| -rw-r--r-- | source4/auth/credentials/credentials.h | 1 | ||||
| -rw-r--r-- | source4/headermap.txt | 1 | ||||
| -rw-r--r-- | source4/lib/registry/hive.h | 1 | ||||
| -rw-r--r-- | source4/lib/registry/interface.c | 8 | ||||
| -rw-r--r-- | source4/lib/registry/local.c | 8 | ||||
| -rw-r--r-- | source4/lib/registry/registry.h | 1 | ||||
| -rw-r--r-- | source4/lib/registry/util.c | 2 | ||||
| -rw-r--r-- | source4/lib/util/data_blob.h | 1 | ||||
| -rw-r--r-- | source4/lib/util/time.h | 4 |
9 files changed, 16 insertions, 11 deletions
diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h index 1cecb97055..0fd9ce46be 100644 --- a/source4/auth/credentials/credentials.h +++ b/source4/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/source4/headermap.txt b/source4/headermap.txt index 30fef21ed2..63c0ec31b2 100644 --- a/source4/headermap.txt +++ b/source4/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/source4/lib/registry/hive.h b/source4/lib/registry/hive.h index 36491f149b..8214208870 100644 --- a/source4/lib/registry/hive.h +++ b/source4/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/source4/lib/registry/interface.c b/source4/lib/registry/interface.c index 4950e1dacd..98c72c7940 100644 --- a/source4/lib/registry/interface.c +++ b/source4/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/source4/lib/registry/local.c b/source4/lib/registry/local.c index 1a45c0a70a..a52feaaed5 100644 --- a/source4/lib/registry/local.c +++ b/source4/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/source4/lib/registry/registry.h b/source4/lib/registry/registry.h index 1d92a9edab..90dd094eb9 100644 --- a/source4/lib/registry/registry.h +++ b/source4/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/source4/lib/registry/util.c b/source4/lib/registry/util.c index 6afd1bc44c..78b578d2e5 100644 --- a/source4/lib/registry/util.c +++ b/source4/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/source4/lib/util/data_blob.h b/source4/lib/util/data_blob.h index e39b2eaf45..1442438dd7 100644 --- a/source4/lib/util/data_blob.h +++ b/source4/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/source4/lib/util/time.h b/source4/lib/util/time.h index a1b3facf24..557c5d4eab 100644 --- a/source4/lib/util/time.h +++ b/source4/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; |