[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  4d41a5e s3-ldap Only prototype ldap_init_fd() when we have found it in the libraries
      from  f967931 build: put doserr.c into it's own subsystem, so it's no longer a duplicate

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4d41a5effdc9a13921367be3412b53a39f75d73a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Apr 29 18:43:30 2011 +1000

    s3-ldap Only prototype ldap_init_fd() when we have found it in the libraries
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Fri Apr 29 11:47:07 CEST 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/include/smb_ldap.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/smb_ldap.h b/source3/include/smb_ldap.h
index 613f6dc..389a734 100644
--- a/source3/include/smb_ldap.h
+++ b/source3/include/smb_ldap.h
@@ -26,7 +26,10 @@ typedef int ber_int_t;
 #ifdef HAVE_LDAP_PVT_H
 #include <ldap_pvt.h>
 #endif /* HAVE_LDAP_PVT_H */
+
+#ifdef HAVE_LDAP_INIT_FD
 int ldap_init_fd(ber_socket_t fd, int proto, char *uri, LDAP **ldp);
+#endif
 
 /* function declarations not included in proto.h */
 LDAP *ldap_open_with_timeout(const char *server,


-- 
Samba Shared Repository