summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-28 15:49:21 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-29 16:38:11 +1000
commita3ec6052f90562a1e973ca7fc8a2acf9f41de7f0 (patch)
treec3a3732bbcde81415e57b17c02d0fe18232b2f01
parente050677c7f9986cbc6c15319482079014167f9b4 (diff)
downloadsamba-a3ec6052f90562a1e973ca7fc8a2acf9f41de7f0.tar.gz
samba-a3ec6052f90562a1e973ca7fc8a2acf9f41de7f0.tar.bz2
samba-a3ec6052f90562a1e973ca7fc8a2acf9f41de7f0.zip
s3-ldap Move ldap prototypes to inside #ifdef HAVE_LDAP_H
This fixes the build without LDAP development headers.
-rw-r--r--source3/include/smb_ldap.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/source3/include/smb_ldap.h b/source3/include/smb_ldap.h
index 7165de19bf..613f6dcac4 100644
--- a/source3/include/smb_ldap.h
+++ b/source3/include/smb_ldap.h
@@ -22,6 +22,17 @@ typedef int ber_int_t;
#ifndef LDAP_CONST
#define LDAP_CONST const
#endif
+
+#ifdef HAVE_LDAP_PVT_H
+#include <ldap_pvt.h>
+#endif /* HAVE_LDAP_PVT_H */
+int ldap_init_fd(ber_socket_t fd, int proto, char *uri, LDAP **ldp);
+
+/* function declarations not included in proto.h */
+LDAP *ldap_open_with_timeout(const char *server,
+ struct sockaddr_storage *ss,
+ int port, unsigned int to);
+
#ifndef LDAP_OPT_SUCCESS
#define LDAP_OPT_SUCCESS 0
#endif
@@ -36,16 +47,6 @@ typedef int ber_int_t;
#define LDAPS_PORT 636
#endif
-/* function declarations not included in proto.h */
-LDAP *ldap_open_with_timeout(const char *server,
- struct sockaddr_storage *ss,
- int port, unsigned int to);
-
-#ifdef HAVE_LDAP_PVT_H
-#include <ldap_pvt.h>
-#endif
-int ldap_init_fd(ber_socket_t fd, int proto, char *uri, LDAP **ldp);
-
#endif /* HAVE_LDAP_H */
#ifndef HAVE_LDAP