summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-02 16:47:17 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-02 16:47:17 +0200
commit4e5e7a7c688d8a065994cb16fb1da7581bab081a (patch)
tree738ea8138cc5bac0207251886164c997b2b1a85d
parentb17484a70f50d3cc2b1031e86dfe080b9f48181d (diff)
downloadsamba-4e5e7a7c688d8a065994cb16fb1da7581bab081a.tar.gz
samba-4e5e7a7c688d8a065994cb16fb1da7581bab081a.tar.bz2
samba-4e5e7a7c688d8a065994cb16fb1da7581bab081a.zip
Reintroduce header previously autogenerated but ignored by git.
Also fixed extra include in regpatch. (This used to be commit 0e371cf169e9a607fcbb3e65437ab9413935dd52)
-rw-r--r--.gitignore3
-rw-r--r--source4/lib/registry/tools/regpatch.c1
-rw-r--r--source4/lib/util/util_ldb.h7
-rw-r--r--source4/libcli/ldap/ldap_ndr.h10
4 files changed, 14 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 3a2e5642e7..1ad2e2501f 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/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 71837d1807..98443e6456 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/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/source4/lib/util/util_ldb.h b/source4/lib/util/util_ldb.h
index 864ce7e8c6..030ba7ebee 100644
--- a/source4/lib/util/util_ldb.h
+++ b/source4/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/source4/libcli/ldap/ldap_ndr.h b/source4/libcli/ldap/ldap_ndr.h
new file mode 100644
index 0000000000..dfbb723c36
--- /dev/null
+++ b/source4/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__ */
+