libcli/ldap: move ldap_errors.h to the toplevel and install it

metze

diff --git a/libcli/ldap/config.mk b/libcli/ldap/config.mk
index 067b6778b7f43156d5704acf4e29e3d0e4c68a17..02397cb43af40d848db1a1223c1572ae2ee398d8 100644 (file)
--- a/libcli/ldap/config.mk
+++ b/libcli/ldap/config.mk
@@ -4,4 +4,4 @@ PRIVATE_DEPENDENCIES = ASN1_UTIL
 
 LIBCLI_LDAP_MESSAGE_OBJ_FILES = $(addprefix ../libcli/ldap/, \
                                                ldap_message.o)
-PUBLIC_HEADERS += ../libcli/ldap/ldap_message.h
+PUBLIC_HEADERS += ../libcli/ldap/ldap_message.h ../libcli/ldap/ldap_errors.h

diff --git a/source4/libcli/ldap/ldap_errors.h b/libcli/ldap/ldap_errors.h
similarity index 98%
rename from source4/libcli/ldap/ldap_errors.h
rename to libcli/ldap/ldap_errors.h
index 17ac43814c30d18bd0e4e7a2b77ed87a07baef41..fa929c69364e80b95a2b4a864d1a10f2b4cdec8d 100644 (file)
--- a/source4/libcli/ldap/ldap_errors.h
+++ b/libcli/ldap/ldap_errors.h
@@ -21,6 +21,7 @@
 #ifndef _SMB_LDAP_ERRORS_H_
 #define _SMB_LDAP_ERRORS_H_
 
+#ifndef LDAP_SUCCESS
 enum ldap_result_code {
        LDAP_SUCCESS                            = 0,
        LDAP_OPERATIONS_ERROR                   = 1,
@@ -62,5 +63,6 @@ enum ldap_result_code {
        LDAP_AFFECTS_MULTIPLE_DSAS              = 71,
        LDAP_OTHER                              = 80
 };
+#endif
 
 #endif /* _SMB_LDAP_ERRORS_H_ */

diff --git a/libcli/ldap/ldap_message.h b/libcli/ldap/ldap_message.h
index 47ee724e97f7fac7963fe3a478954b2cd84247f4..672de0d9258500e6840efe8de3256cd238352d2a 100644 (file)
--- a/libcli/ldap/ldap_message.h
+++ b/libcli/ldap/ldap_message.h
@@ -21,7 +21,7 @@
 #ifndef _LIBCLI_LDAP_MESSAGE_H_
 #define _LIBCLI_LDAP_MESSAGE_H_
 
-#include "libcli/ldap/ldap_errors.h"
+#include "../libcli/ldap/ldap_errors.h"
 #include "lib/ldb/include/ldb.h"
 
 enum ldap_request_tag {

diff --git a/source4/headermap.txt b/source4/headermap.txt
index 9d8e698f5cfbe11d6ddf9085e9050942660eae5f..6417603d1d5daa0c65d5ec2639e637a6b6ab1626 100644 (file)
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -50,6 +50,7 @@ param/share.h: share.h
 ../lib/util/util_ldb.h: util_ldb.h
 ../lib/util/wrap_xattr.h: wrap_xattr.h
 ../libcli/ldap/ldap_message.h: ldap_message.h
+../libcli/ldap/ldap_errors.h: ldap_errors.h
 libcli/ldap/ldap_ndr.h: ldap_ndr.h
 ../lib/tevent/tevent.h: tevent.h
 ../lib/tevent/tevent_internal.h: tevent_internal.h

diff --git a/source4/libcli/util/nterr.c b/source4/libcli/util/nterr.c
index 8371837dcb574d682f5282996053e5c201dae3a1..4e7cdf5c3aa61e07536aaf59cb8c725734dac7a3 100644 (file)
--- a/source4/libcli/util/nterr.c
+++ b/source4/libcli/util/nterr.c
@@ -20,7 +20,7 @@
 /* NT error codes.  please read nterr.h */
 
 #include "includes.h"
-#include "libcli/ldap/ldap_errors.h"
+#include "../libcli/ldap/ldap_errors.h"
 #undef strcasecmp
 
 typedef struct