The branch, master has been updated via c66dfe4 s3-build: move priv2ld proto to smbldap.h (in order to fix non-ldap builds). from b03a171 s3:test: mark the net_registry_roundtrip test as knownfail
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c66dfe4df5dcd239e7e446abf4bcf5ca8a8bc1ed Author: Günther Deschner <g...@samba.org> Date: Wed Feb 16 14:31:30 2011 +0100 s3-build: move priv2ld proto to smbldap.h (in order to fix non-ldap builds). Guenther Autobuild-User: Günther Deschner <g...@samba.org> Autobuild-Date: Wed Feb 16 15:20:14 CET 2011 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/include/proto.h | 3 --- source3/include/smbldap.h | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index 3a964c3..0785252 100644 --- 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 14fe76f..2c69d5e 100644 --- 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 */ -- Samba Shared Repository