The branch, master has been updated via 4fe2b24 smbldap: Move ldapsam_privates to pdb_ldap.h via 91e9ff9 smbldap: pdb_ipa is gone via e5f2dfa build: correct package dependencies from 76b351e s3:smbd: Fix incorrect use of sys_getgroups()
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 4fe2b24b34192606e3a45f64a3e5e5449873bf3c Author: Volker Lendecke <v...@samba.org> Date: Mon Apr 17 17:12:27 2017 +0200 smbldap: Move ldapsam_privates to pdb_ldap.h Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Tue Apr 18 22:52:03 CEST 2017 on sn-devel-144 commit 91e9ff99752c42581db67d4e1e85556ea5c07fbf Author: Volker Lendecke <v...@samba.org> Date: Mon Apr 17 17:04:07 2017 +0200 smbldap: pdb_ipa is gone Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit e5f2dfacae9312165291ce0cef62dee094a164d1 Author: Jan Engelhardt <jeng...@inai.de> Date: Thu Sep 5 20:57:12 2013 +0200 build: correct package dependencies The wscript_build files convey what header files belong to which logical package. For example, # lib/util/wscript_build: bld.SAMBA_LIBRARY('samba-util', public_headers='... data_blob.h ...' # auth/credentials/wscript_build: bld.SAMBA_LIBRARY('samba-credentials', public_headers='credentials.h', Now, credentials.h #includes <util/data_blob.h> and therefore, samba-credentials.pc must have a Requires: samba-util. Similarly for other parts. Signed-off-by: Jan Engelhardt <jeng...@inai.de> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> ----------------------------------------------------------------------- Summary of changes: auth/credentials/samba-credentials.pc.in | 1 + librpc/ndr_krb5pac.pc.in | 2 +- source3/include/smbldap.h | 36 -------------------------------- source3/passdb/pdb_ldap.h | 30 ++++++++++++++++++++++++++ source4/librpc/dcerpc.pc.in | 2 +- source4/librpc/dcerpc_samr.pc.in | 2 +- 6 files changed, 34 insertions(+), 39 deletions(-) Changeset truncated at 500 lines: diff --git a/auth/credentials/samba-credentials.pc.in b/auth/credentials/samba-credentials.pc.in index 9a0db50..d25bf5e 100644 --- a/auth/credentials/samba-credentials.pc.in +++ b/auth/credentials/samba-credentials.pc.in @@ -6,6 +6,7 @@ modulesdir=${prefix}/modules/gensec Name: samba-credentials Description: Credentials management +Requires: samba-util ndr Version: @PACKAGE_VERSION@ Libs: @LIB_RPATH@ -L${libdir} -lsamba-credentials Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 diff --git a/librpc/ndr_krb5pac.pc.in b/librpc/ndr_krb5pac.pc.in index 597bbd1..581b7e5 100644 --- a/librpc/ndr_krb5pac.pc.in +++ b/librpc/ndr_krb5pac.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: ndr-krb5pac Description: NDR marshallers for the KRB5 PAC formats -Requires: ndr +Requires: ndr ndr_standard Version: @PACKAGE_VERSION@ Libs: @LIB_RPATH@ -L${libdir} -lndr-krb5pac Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1 diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h index ec5ff1c..b287d62 100644 --- a/source3/include/smbldap.h +++ b/source3/include/smbldap.h @@ -58,42 +58,6 @@ struct smbldap_state { struct timeval last_rebind; /* monotonic */ }; -/* struct used by both pdb_ldap.c and pdb_nds.c */ - -struct ipasam_privates; - -struct ldapsam_privates { - struct smbldap_state *smbldap_state; - - /* Former statics */ - LDAPMessage *result; - LDAPMessage *entry; - int index; - - const char *domain_name; - struct dom_sid domain_sid; - - /* configuration items */ - int schema_ver; - - char *domain_dn; - - /* Is this NDS ldap? */ - int is_nds_ldap; - - /* Is this IPA ldap? */ - int is_ipa_ldap; - struct ipasam_privates *ipasam_privates; - - /* ldap server location parameter */ - char *location; - - struct { - char *filter; - LDAPMessage *result; - } search_cache; -}; - /* The following definitions come from lib/smbldap.c */ NTSTATUS smbldap_init(TALLOC_CTX *mem_ctx, diff --git a/source3/passdb/pdb_ldap.h b/source3/passdb/pdb_ldap.h index 0420314..e55b0a4 100644 --- a/source3/passdb/pdb_ldap.h +++ b/source3/passdb/pdb_ldap.h @@ -26,6 +26,36 @@ #ifndef _PASSDB_PDB_LDAP_H_ #define _PASSDB_PDB_LDAP_H_ +/* struct used by both pdb_ldap.c and pdb_nds.c */ + +struct ldapsam_privates { + struct smbldap_state *smbldap_state; + + /* Former statics */ + LDAPMessage *result; + LDAPMessage *entry; + int index; + + const char *domain_name; + struct dom_sid domain_sid; + + /* configuration items */ + int schema_ver; + + char *domain_dn; + + /* Is this NDS ldap? */ + int is_nds_ldap; + + /* ldap server location parameter */ + char *location; + + struct { + char *filter; + LDAPMessage *result; + } search_cache; +}; + /* The following definitions come from passdb/pdb_ldap.c */ const char** get_userattr_list( TALLOC_CTX *mem_ctx, int schema_ver ); diff --git a/source4/librpc/dcerpc.pc.in b/source4/librpc/dcerpc.pc.in index 2235028..53e83d9 100644 --- a/source4/librpc/dcerpc.pc.in +++ b/source4/librpc/dcerpc.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: dcerpc Description: DCE/RPC client library -Requires: ndr +Requires: ndr samba-util Version: @PACKAGE_VERSION@ Libs: @LIB_RPATH@ -L${libdir} -ldcerpc -ldcerpc-binding Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 diff --git a/source4/librpc/dcerpc_samr.pc.in b/source4/librpc/dcerpc_samr.pc.in index 1c80aa9..cd2d74a 100644 --- a/source4/librpc/dcerpc_samr.pc.in +++ b/source4/librpc/dcerpc_samr.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: dcerpc_samr Description: DCE/RPC client library - SAMR -Requires.private: dcerpc ndr +Requires: dcerpc ndr ndr_standard Version: @PACKAGE_VERSION@ Libs: @LIB_RPATH@ -L${libdir} -ldcerpc-samr Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 -- Samba Shared Repository