libcli/ldap: move ldap_errors.h to the toplevel and install it
authorStefan Metzmacher <metze@samba.org>
Tue, 24 Feb 2009 15:52:37 +0000 (16:52 +0100)
committerStefan Metzmacher <metze@samba.org>
Tue, 24 Feb 2009 16:55:39 +0000 (17:55 +0100)
metze

libcli/ldap/config.mk
libcli/ldap/ldap_errors.h [moved from source4/libcli/ldap/ldap_errors.h with 98% similarity]
libcli/ldap/ldap_message.h
source4/headermap.txt
source4/libcli/util/nterr.c

index 067b677..02397cb 100644 (file)
@@ -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
similarity index 98%
rename from source4/libcli/ldap/ldap_errors.h
rename to libcli/ldap/ldap_errors.h
index 17ac438..fa929c6 100644 (file)
@@ -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_ */
index 47ee724..672de0d 100644 (file)
@@ -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 {
index 9d8e698..6417603 100644 (file)
@@ -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
index 8371837..4e7cdf5 100644 (file)
@@ -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