s3-build: move priv2ld proto to smbldap.h (in order to fix non-ldap builds).

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Feb 16 15:20:14 CET 2011 on sn-devel-104

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3a964c3c52cbe8829f23b11ab1ea81da49f82254..07852527a8564e8b85d69674461703ca540108ad 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3886,9 +3886,6 @@ NTSTATUS make_pdb_method( struct pdb_methods **methods ) ;
 
 /* The following definitions come from passdb/pdb_ldap.c  */
 
-struct ldapsam_privates;
-
-LDAP *priv2ld(struct ldapsam_privates *priv);
 const char** get_userattr_list( TALLOC_CTX *mem_ctx, int schema_ver );
 NTSTATUS pdb_init_ldapsam_compat(struct pdb_methods **pdb_method, const char *location);
 NTSTATUS pdb_init_ldapsam(struct pdb_methods **pdb_method, const char *location);

diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
index 14fe76faa321c6829616f8129574dce4345f7186..2c69d5ef8aad500a16f7bbe77378ad9967990ea0 100644 (file)
--- a/source3/include/smbldap.h
+++ b/source3/include/smbldap.h
@@ -238,7 +238,7 @@ void talloc_autofree_ldapmsg(TALLOC_CTX *mem_ctx, LDAPMessage *result);
 void talloc_autofree_ldapmod(TALLOC_CTX *mem_ctx, LDAPMod **mod);
 char *smbldap_talloc_dn(TALLOC_CTX *mem_ctx, LDAP *ld,
                              LDAPMessage *entry);
-
+LDAP *priv2ld(struct ldapsam_privates *priv);
 
 /* The following definitions come from lib/smbldap.c  */