From 0e371cf169e9a607fcbb3e65437ab9413935dd52 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 2 Apr 2008 16:47:17 +0200
Subject: [PATCH] Reintroduce header previously autogenerated but ignored by
 git.

Also fixed extra include in regpatch.
---
 .gitignore                           |  3 ---
 source/lib/registry/tools/regpatch.c |  1 -
 source/lib/util/util_ldb.h           |  7 ++++---
 source/libcli/ldap/ldap_ndr.h        | 10 ++++++++++
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 source/libcli/ldap/ldap_ndr.h

diff --git a/.gitignore b/.gitignore
index 3a2e5642e7d..1ad2e2501f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,7 +66,6 @@ source/lib/tdr/tdr_proto.h
 source/lib/util/pidfile.h
 source/lib/util/unix_privs.h
 source/lib/util/util_proto.h
-source/lib/util/wrap_xattr.h
 source/lib/util/asn1_proto.h
 source/libcli/finddcs.h
 source/libcli/libcli_proto.h
@@ -190,8 +189,6 @@ source/dsdb/schema/proto.h
 source/lib/crypto/test_proto.h
 source/lib/registry/tests/proto.h
 source/lib/util/apidocs
-source/lib/util/util_ldb.h
-source/libcli/ldap/ldap_ndr.h
 source/libcli/resolve/lp_proto.h
 source/apidocs
 *.swp
diff --git a/source/lib/registry/tools/regpatch.c b/source/lib/registry/tools/regpatch.c
index 71837d18079..98443e64566 100644
--- a/source/lib/registry/tools/regpatch.c
+++ b/source/lib/registry/tools/regpatch.c
@@ -23,7 +23,6 @@
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/registry/tools/common.h"
-#include "lib/registry/patchfile.h"
 #include "param/param.h"
 
 int main(int argc, char **argv)
diff --git a/source/lib/util/util_ldb.h b/source/lib/util/util_ldb.h
index 864ce7e8c67..030ba7ebeef 100644
--- a/source/lib/util/util_ldb.h
+++ b/source/lib/util/util_ldb.h
@@ -1,19 +1,21 @@
 #ifndef __LIB_UTIL_UTIL_LDB_H__
 #define __LIB_UTIL_UTIL_LDB_H__
 
+/* The following definitions come from lib/util/util_ldb.c  */
+
 int gendb_search_v(struct ldb_context *ldb,
 		   TALLOC_CTX *mem_ctx,
 		   struct ldb_dn *basedn,
 		   struct ldb_message ***msgs,
 		   const char * const *attrs,
 		   const char *format,
-		   va_list ap)  _PRINTF_ATTRIBUTE(6,0);
+		   va_list ap)  PRINTF_ATTRIBUTE(6,0);
 int gendb_search(struct ldb_context *ldb,
 		 TALLOC_CTX *mem_ctx,
 		 struct ldb_dn *basedn,
 		 struct ldb_message ***res,
 		 const char * const *attrs,
-		 const char *format, ...) _PRINTF_ATTRIBUTE(6,7);
+		 const char *format, ...) PRINTF_ATTRIBUTE(6,7);
 int gendb_search_dn(struct ldb_context *ldb,
 		 TALLOC_CTX *mem_ctx,
 		 struct ldb_dn *dn,
@@ -23,4 +25,3 @@ int gendb_add_ldif(struct ldb_context *ldb, const char *ldif_string);
 char *wrap_casefold(void *context, void *mem_ctx, const char *s);
 
 #endif /* __LIB_UTIL_UTIL_LDB_H__ */
-
diff --git a/source/libcli/ldap/ldap_ndr.h b/source/libcli/ldap/ldap_ndr.h
new file mode 100644
index 00000000000..dfbb723c366
--- /dev/null
+++ b/source/libcli/ldap/ldap_ndr.h
@@ -0,0 +1,10 @@
+#ifndef __LIBCLI_LDAP_LDAP_NDR_H__
+#define __LIBCLI_LDAP_LDAP_NDR_H__
+
+char *ldap_encode_ndr_uint32(TALLOC_CTX *mem_ctx, uint32_t value);
+char *ldap_encode_ndr_dom_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid);
+char *ldap_encode_ndr_GUID(TALLOC_CTX *mem_ctx, struct GUID *guid);
+NTSTATUS ldap_decode_ndr_GUID(TALLOC_CTX *mem_ctx, struct ldb_val val, struct GUID *guid);
+
+#endif /* __LIBCLI_LDAP_LDAP_NDR_H__ */
+