diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-05-21 17:39:15 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-05-21 17:39:15 +1000 |
| commit | c8a23147fe12c693fd7944af7bb09b88393789d9 (patch) | |
| tree | afc5acd86471cab57ecac447a8396545396c5aab /source4/ldap_server | |
| parent | 82c97e0ab840d8acfc81c3096bebc8c3d3e0bde3 (diff) | |
| download | samba-c8a23147fe12c693fd7944af7bb09b88393789d9.tar.gz samba-c8a23147fe12c693fd7944af7bb09b88393789d9.tar.bz2 samba-c8a23147fe12c693fd7944af7bb09b88393789d9.zip | |
s4:libcli/ldap Rename ldap.h to libcli_ldap.h
It is a problem if a samba header is called ldap.h if we also want
to use OpenLDAP's ldap.h
Andrew Bartlett
Diffstat (limited to 'source4/ldap_server')
| -rw-r--r-- | source4/ldap_server/ldap_backend.c | 1 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_bind.c | 1 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_extended.c | 1 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_server.c | 1 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_server.h | 2 |
5 files changed, 1 insertions, 5 deletions
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c index e6f6c66bcb..d9f15b8c80 100644 --- a/source4/ldap_server/ldap_backend.c +++ b/source4/ldap_server/ldap_backend.c @@ -21,7 +21,6 @@ #include "includes.h" #include "ldap_server/ldap_server.h" #include "../lib/util/dlinklist.h" -#include "libcli/ldap/ldap.h" #include "auth/credentials/credentials.h" #include "auth/gensec/gensec.h" #include "param/param.h" diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c index 9abc6115e6..1b235f2a1b 100644 --- a/source4/ldap_server/ldap_bind.c +++ b/source4/ldap_server/ldap_bind.c @@ -20,7 +20,6 @@ #include "includes.h" #include "ldap_server/ldap_server.h" #include "auth/auth.h" -#include "libcli/ldap/ldap.h" #include "smbd/service.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" diff --git a/source4/ldap_server/ldap_extended.c b/source4/ldap_server/ldap_extended.c index ac8f6c1496..78fd43caac 100644 --- a/source4/ldap_server/ldap_extended.c +++ b/source4/ldap_server/ldap_extended.c @@ -20,7 +20,6 @@ #include "includes.h" #include "ldap_server/ldap_server.h" #include "../lib/util/dlinklist.h" -#include "libcli/ldap/ldap.h" #include "lib/tls/tls.h" #include "smbd/service_stream.h" diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 92c549ecd2..00698eec46 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -37,7 +37,6 @@ #include "lib/messaging/irpc.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" -#include "libcli/ldap/ldap.h" #include "libcli/ldap/ldap_proto.h" #include "system/network.h" #include "lib/socket/netif.h" diff --git a/source4/ldap_server/ldap_server.h b/source4/ldap_server/ldap_server.h index efa802d173..8b45285463 100644 --- a/source4/ldap_server/ldap_server.h +++ b/source4/ldap_server/ldap_server.h @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/libcli_ldap.h" #include "lib/socket/socket.h" #include "lib/stream/packet.h" |