diff options
| -rw-r--r-- | libcli/ldap/config.mk | 2 | ||||
| -rw-r--r-- | libcli/ldap/ldap_errors.h (renamed from source4/libcli/ldap/ldap_errors.h) | 2 | ||||
| -rw-r--r-- | libcli/ldap/ldap_message.h | 2 | ||||
| -rw-r--r-- | source4/headermap.txt | 1 | ||||
| -rw-r--r-- | source4/libcli/util/nterr.c | 2 |
5 files changed, 6 insertions, 3 deletions
diff --git a/libcli/ldap/config.mk b/libcli/ldap/config.mk index 067b6778b7..02397cb43a 100644 --- 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 index 17ac43814c..fa929c6936 100644 --- 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 47ee724e97..672de0d925 100644 --- 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 9d8e698f5c..6417603d1d 100644 --- 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 8371837dcb..4e7cdf5c3a 100644 --- 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 |